refactoring and fixes for Bug #11209

[wifi-assistant] / package / src / wifi_assistant / gui / config_gui.py

diff --git a/package/src/wifi_assistant/gui/config_gui.py b/package/src/wifi_assistant/gui/config_gui.py
index 8a4fa49..edc934f 100644 (file)
--- a/package/src/wifi_assistant/gui/config_gui.py
+++ b/package/src/wifi_assistant/gui/config_gui.py
@@ -12,17 +12,19 @@ class ConfigGui():
         self._network_settings = network_settings
         self._program = hildon_program
         self._win = hildon_window
-        self._model= list_store
+        self._model = list_store
 
 
     def main(self):
         self._win.set_title(_("Wifi Assistant"))
-        ssid_list = self._createNetworkSettingsView(self._model)
-        pannable_area= hildon.PannableArea()
-        pannable_area.add(ssid_list)
+        pannable_area = hildon.PannableArea()
+        from wifi_assistant.gui.network_settings_view import NetworkSettingsView
+        view = NetworkSettingsView(self._model, pannable_area, self._editNetworkSetting)
         self._win.add(pannable_area)
         self._win.set_app_menu(self._createMenu())
         self._win.connect("destroy", gtk.main_quit, None)
+
+        view.update()
         self._win.show_all()
 
     
@@ -36,7 +38,7 @@ class ConfigGui():
      
         settings = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
         settings.set_label(_("Settings"))
-        settings.connect("clicked",self._editApplicationSettings)
+        settings.connect("clicked", self._editApplicationSettings)
         menu.append(settings)
         
         add = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
@@ -112,45 +114,3 @@ class ConfigGui():
             settings = self._network_settings.get(ssid)
             self._network_settings.delete(settings)
             model.remove(iter)
-
-        
-    def _createNetworkSettingsView(self, model):
-#        view = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL, model)
-#        view = hildon.GtkTreeView(gtk.HILDON_UI_MODE_NORMAL, model)
-
-        if len(model) == 0:
-            return gtk.Label(_('There are no launch settings saved for any network'))
-
-        view = gtk.TreeView(model)
-        view.set_border_width(5)
-        
-        def boolean_func(column, cell, model, iter):
-            if model.get_value(iter, 1):
-                stock_id = 'gtk-yes'
-            else:
-                stock_id = 'gtk-no'
-            cell.set_property('stock-id', stock_id)
-        
-        launch_cell = gtk.CellRendererPixbuf()
-        launch_cell.set_fixed_size(100, 50)
-        view.insert_column_with_data_func(1, _('Launch'), launch_cell, boolean_func)
-#        toggle_cell = gtk.CellRendererToggle()
-#        toggle_cell.set_fixed_size(100, 50)
-#        view.append_column( gtk.TreeViewColumn( '', toggle_cell, active=1))
-         
-        tvcolumn = gtk.TreeViewColumn(_('SSID'), gtk.CellRendererText(), text = 0)
-        tvcolumn.set_expand(True)
-        view.append_column(tvcolumn)
-    
-        view.connect('row-activated', self._rowActivatedCallback)
-        view.set_search_column(0)
-        tvcolumn.set_sort_column_id(0)
-        
-        return view
-
-
-    def _rowActivatedCallback(self, treeview, path, view_column):
-        model = treeview.get_model()
-        iter = model.get_iter(path)
-        ssid = model.get_value(iter, 0)
-        self._editNetworkSetting(ssid, model, iter)