[PATCH 3/5] Bonding support: GUI - add device dialog (#906263)

Radek Vykydal rvykydal at redhat.com
Thu Mar 7 13:47:08 UTC 2013


---
 pyanaconda/ui/gui/spokes/network.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index 1a9042c..f1133cf 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -413,7 +413,7 @@ class NetworkControlBox(object):
                                                     None, None)
 
     def on_device_added(self, client, device, *args):
-        self.add_device(device)
+        self.add_device_to_list(device)
 
     def on_device_removed(self, client, device, *args):
         self.remove_device(device)
@@ -492,8 +492,16 @@ class NetworkControlBox(object):
         elif dev_type == NetworkManager.DeviceType.WIFI:
             self.client.wireless_set_enabled(active)
 
+
     def on_add_device_clicked(self, *args):
-        self.add_device("bond")
+        dialog = self.builder.get_object("add_device_dialog")
+        rc = dialog.run()
+        dialog.hide()
+        if rc == 1:
+            ai = self.builder.get_object("combobox_add_device").get_active_iter()
+            model = self.builder.get_object("liststore_add_device")
+            dev_type = model.get(ai, 1)[0]
+            self.add_device(dev_type)
 
     def add_device(self, type):
         log.info("network: adding device of type %s" % type)
@@ -1009,7 +1017,7 @@ class NetworkControlBox(object):
         self.entry_hostname.set_text(value)
 
 class NetworkSpoke(NormalSpoke):
-    builderObjects = ["networkWindow", "liststore_wireless_network", "liststore_devices"]
+    builderObjects = ["networkWindow", "liststore_wireless_network", "liststore_devices", "add_device_dialog", "liststore_add_device"]
     mainWidgetName = "networkWindow"
     uiFile = "spokes/network.glade"
 
@@ -1131,7 +1139,7 @@ class NetworkSpoke(NormalSpoke):
             NormalSpoke.on_back_clicked(self, button)
 
 class NetworkStandaloneSpoke(StandaloneSpoke):
-    builderObjects = ["networkStandaloneWindow", "networkControlBox_vbox", "liststore_wireless_network", "liststore_devices"]
+    builderObjects = ["networkStandaloneWindow", "networkControlBox_vbox", "liststore_wireless_network", "liststore_devices", "add_device_dialog", "liststore_add_device"]
     mainWidgetName = "networkStandaloneWindow"
     uiFile = "spokes/network.glade"
 
-- 
1.7.11.7



More information about the anaconda-patches mailing list