From: Fredrik Wendt <fredrik@wendt.se>
Date: Fri, 30 Jul 2010 06:37:15 +0000 (+0100)
Subject: fixed UI appearance of list of networks, minor fixes to www
X-Git-Url: http://vcs.maemo.org/git/?p=wifi-assistant;a=commitdiff_plain;h=a40844ed1b44a398a8f3b7454e63f88791c9ed26

fixed UI appearance of list of networks, minor fixes to www
---

diff --git a/package/src/wifi_assistant/config-gui.py b/package/src/wifi_assistant/config-gui.py
index 1bc0307..49622db 100644
--- a/package/src/wifi_assistant/config-gui.py
+++ b/package/src/wifi_assistant/config-gui.py
@@ -18,7 +18,10 @@ class ConfigGui():
 
     def main(self):
         self._win.set_title(_("Wifi Jail Breakout Assistant"))
-        self._win.add(self._create_ssid_view(self._settings.getLaunchSettings()))
+        ssid_list = self._create_ssid_view(self._settings.getLaunchSettings())
+        pannable_area= hildon.PannableArea()
+        pannable_area.add(ssid_list)
+        self._win.add(pannable_area)
         self._win.set_app_menu(self._create_menu())
         self._win.connect("destroy", gtk.main_quit, None)
         self._win.show_all()
@@ -117,9 +120,15 @@ class ConfigGui():
         result = dialog.run()
         dialog.hide()
         
-        launchBrowser = (result == gtk.RESPONSE_YES)
-        self._settings.setLaunchSetting(ssid, launchBrowser)
-        model.set(iter, 1, launchBrowser)
+        launchBrowser = None
+        if result == gtk.RESPONSE_YES:
+            launchBrowser = True
+        elif result == gtk.RESPONSE_NO:
+            launchBrowser = False
+        
+        if launchBrowser is not None:
+            self._settings.setLaunchSetting(ssid, launchBrowser)
+            model.set(iter, 1, launchBrowser)
     
     
     def _create_ssid_view(self, model):
@@ -132,19 +141,24 @@ class ConfigGui():
         view = gtk.TreeView(model)
         view.set_border_width(5)
         
-        tvcolumn = gtk.TreeViewColumn(_('SSID'), gtk.CellRendererText(), text = 0)
-        tvcolumn.set_expand(True)
-        view.append_column(tvcolumn)
-    
         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)
-            
-        view.insert_column_with_data_func(1, _('Launch'), gtk.CellRendererPixbuf(), boolean_func)
         
+        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._row_activated)
         view.set_search_column(0)
         tvcolumn.set_sort_column_id(0)
diff --git a/www/gfx/screenshot-launch-list.png b/www/gfx/screenshot-launch-list.png
index 9d3b9fe..8a36290 100644
Binary files a/www/gfx/screenshot-launch-list.png and b/www/gfx/screenshot-launch-list.png differ
diff --git a/www/index.html b/www/index.html
index c3fa145..b3f1eba 100644
--- a/www/index.html
+++ b/www/index.html
@@ -12,8 +12,8 @@
 <h2>About</h2>
 <h3>What?</h3>
 <p>
-This application aims to help to make life easier when connecting your Nokia N900 to wifi networks (wlan) that
- requires you to visit a captive portal page before you can access the Internet.
+This application aims to help make life easier when connecting your Nokia N900 to wifi networks (WLAN) that
+requires you to visit a captive portal (login) page before you can access the Internet.
 </p>
 
 <h3>Why?</h3>