64 lines
3.3 KiB
Diff
64 lines
3.3 KiB
Diff
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0.5.3/src/virtManager/addhardware.py
|
|
--- virt-manager-0.5.3.orig/src/virtManager/addhardware.py 2008-04-04 15:52:00.000000000 -0600
|
|
+++ virt-manager-0.5.3/src/virtManager/addhardware.py 2008-04-04 15:53:17.000000000 -0600
|
|
@@ -122,7 +122,7 @@
|
|
network_list.add_attribute(text, 'text', 1)
|
|
|
|
device_list = self.window.get_widget("net-device")
|
|
- device_model = gtk.ListStore(str, bool)
|
|
+ device_model = gtk.ListStore(str, bool, str)
|
|
device_list.set_model(device_model)
|
|
text = gtk.CellRendererText()
|
|
device_list.pack_start(text, True)
|
|
@@ -313,7 +313,7 @@
|
|
else:
|
|
dev = self.window.get_widget("net-device")
|
|
model = dev.get_model()
|
|
- return ["bridge", model.get_value(dev.get_active_iter(), 0)]
|
|
+ return ["bridge", model.get_value(dev.get_active_iter(), 2)]
|
|
|
|
def get_config_macaddr(self):
|
|
macaddr = None
|
|
@@ -348,7 +348,10 @@
|
|
net = self.get_config_network()
|
|
if net[0] == "bridge":
|
|
self.window.get_widget("summary-net-type").set_text(_("Shared physical device"))
|
|
- self.window.get_widget("summary-net-target").set_text(net[1])
|
|
+ if net[1] != None:
|
|
+ self.window.get_widget("summary-net-target").set_text(net[1])
|
|
+ else:
|
|
+ self.window.get_widget("summary-net-target").set_text(_("Default"))
|
|
elif net[0] == "network":
|
|
self.window.get_widget("summary-net-type").set_text(_("Virtual network"))
|
|
self.window.get_widget("summary-net-target").set_text(net[1])
|
|
@@ -816,13 +819,14 @@
|
|
def populate_device_model(self, model):
|
|
model.clear()
|
|
hasShared = False
|
|
+ model.append([_("(Default)"), True, None])
|
|
for name in self.vm.get_connection().list_net_device_paths():
|
|
net = self.vm.get_connection().get_net_device(name)
|
|
if net.is_shared():
|
|
hasShared = True
|
|
- model.append(["%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
|
|
+ model.append(["%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True, net.get_bridge()])
|
|
else:
|
|
- model.append(["%s (%s)" % (net.get_name(), _("Not bridged")), False])
|
|
+ model.append(["%s (%s)" % (net.get_name(), _("Not bridged")), False, net.get_name()])
|
|
return hasShared
|
|
|
|
def populate_target_device_model(self, model):
|
|
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/host.py virt-manager-0.5.3/src/virtManager/host.py
|
|
--- virt-manager-0.5.3.orig/src/virtManager/host.py 2008-01-10 18:17:51.000000000 -0700
|
|
+++ virt-manager-0.5.3/src/virtManager/host.py 2008-04-04 15:54:26.000000000 -0600
|
|
@@ -75,6 +75,9 @@
|
|
self.window.get_widget("performance-table").attach(self.memory_usage_graph, 1, 2, 1, 2)
|
|
|
|
self.add = None
|
|
+ # turn off "Virtual Networks" tab, until it is implemented...
|
|
+ self.window.get_widget("details-tabs").get_nth_page(1).hide()
|
|
+
|
|
self.window.get_widget("details-tabs").get_nth_page(2).hide()
|
|
|
|
self.conn.connect("net-added", self.repopulate_networks)
|