Logoj0ke.net Open Build Service > Projects > virtualization > virt-manager > virtman-vif.diff
Sign Up | Log In

File virtman-vif.diff of Package virt-manager (Revision 15eed10d37c97d9e6cc2a13b4e488b33)

Currently displaying revision 15eed10d37c97d9e6cc2a13b4e488b33, show latest

x
 
1
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/addhardware.py virt-manager-0.5.3/src/virtManager/addhardware.py
2
--- virt-manager-0.5.3.orig/src/virtManager/addhardware.py  2008-04-04 15:52:00.000000000 -0600
3
+++ virt-manager-0.5.3/src/virtManager/addhardware.py   2008-04-04 15:53:17.000000000 -0600
4
@@ -122,7 +122,7 @@
5
         network_list.add_attribute(text, 'text', 1)
6
 
7
         device_list = self.window.get_widget("net-device")
8
-        device_model = gtk.ListStore(str, bool)
9
+        device_model = gtk.ListStore(str, bool, str)
10
         device_list.set_model(device_model)
11
         text = gtk.CellRendererText()
12
         device_list.pack_start(text, True)
13
@@ -313,7 +313,7 @@
14
         else:
15
             dev = self.window.get_widget("net-device")
16
             model = dev.get_model()
17
-            return ["bridge", model.get_value(dev.get_active_iter(), 0)]
18
+            return ["bridge", model.get_value(dev.get_active_iter(), 2)]
19
 
20
     def get_config_macaddr(self):
21
         macaddr = None
22
@@ -348,7 +348,10 @@
23
                 net = self.get_config_network()
24
                 if net[0] == "bridge":
25
                     self.window.get_widget("summary-net-type").set_text(_("Shared physical device"))
26
-                    self.window.get_widget("summary-net-target").set_text(net[1])
27
+                    if net[1] != None:
28
+                        self.window.get_widget("summary-net-target").set_text(net[1])
29
+                    else:
30
+                        self.window.get_widget("summary-net-target").set_text(_("Default"))
31
                 elif net[0] == "network":
32
                     self.window.get_widget("summary-net-type").set_text(_("Virtual network"))
33
                     self.window.get_widget("summary-net-target").set_text(net[1])
34
@@ -816,13 +819,14 @@
35
     def populate_device_model(self, model):
36
         model.clear()
37
         hasShared = False
38
+        model.append([_("(Default)"), True, None])
39
         for name in self.vm.get_connection().list_net_device_paths():
40
             net = self.vm.get_connection().get_net_device(name)
41
             if net.is_shared():
42
                 hasShared = True
43
-                model.append(["%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True])
44
+                model.append(["%s (%s %s)" % (net.get_name(), _("Bridge"), net.get_bridge()), True, net.get_bridge()])
45
             else:
46
-                model.append(["%s (%s)" % (net.get_name(), _("Not bridged")), False])
47
+                model.append(["%s (%s)" % (net.get_name(), _("Not bridged")), False, net.get_name()])
48
         return hasShared
49
 
50
     def populate_target_device_model(self, model):
51
diff -Nuar virt-manager-0.5.3.orig/src/virtManager/host.py virt-manager-0.5.3/src/virtManager/host.py
52
--- virt-manager-0.5.3.orig/src/virtManager/host.py 2008-01-10 18:17:51.000000000 -0700
53
+++ virt-manager-0.5.3/src/virtManager/host.py  2008-04-04 15:54:26.000000000 -0600
54
@@ -75,6 +75,9 @@
55
         self.window.get_widget("performance-table").attach(self.memory_usage_graph, 1, 2, 1, 2)
56
 
57
         self.add = None
58
+        # turn off "Virtual Networks" tab, until it is implemented...
59
+        self.window.get_widget("details-tabs").get_nth_page(1).hide()
60
+
61
         self.window.get_widget("details-tabs").get_nth_page(2).hide()
62
 
63
         self.conn.connect("net-added", self.repopulate_networks)
64