Move user interface definition to a separate module

git-svn-id: file:///svnroot/wifihood/trunk@34 c51dfc6a-5949-4919-9c8e-f207a149c383

diff --git a/wifiscanner/wifimap/ui.py b/wifiscanner/wifimap/ui.py
new file mode 100755 (executable)
index 0000000..7f7903a
--- /dev/null
+++ b/wifiscanner/wifimap/ui.py
@@ -0,0 +1,118 @@
+
+import wifimap
+
+import gtk , pango
+import hildon
+
+import gobject
+
+def hello(widget, data):
+    data.do_start()
+    if widget.handler_id :
+        widget.disconnect( widget.handler_id )
+        widget.handler_id = widget.connect("clicked", bye, data)
+        widget.set_label("Switch Off!")
+
+def bye(widget, data):
+    data.do_stop()
+    if widget.handler_id :
+        widget.disconnect( widget.handler_id )
+        widget.handler_id = widget.connect("clicked", hello, data)
+        widget.set_label("Switch On!")
+
+def enable_agps(widget):
+    if widget.get_active() :
+        print "%s state is active" % widget
+
+def scana(widget, data):
+    if not data._timer :
+        data._timer = gobject.timeout_add( 5000 , data.scan )
+    else :
+        hildon.hildon_banner_show_information( widget , "icon_path" , "Scanning was already active" )
+    if widget.handler_id :
+        widget.disconnect( widget.handler_id )
+        widget.handler_id = widget.connect("clicked", scano, data)
+        widget.set_label("Stop scanning now !!")
+
+def scano(widget, data):
+    if data._timer :
+        hildon.hildon_banner_show_information( widget , "icon_path" , "Timer was running, stopping it" )
+        gobject.source_remove( data._timer )
+        data._timer = None
+        data.stop()
+    else :
+        hildon.hildon_banner_show_information( widget , "icon_path" , "Scanning is not active" )
+    if widget.handler_id :
+        widget.disconnect( widget.handler_id )
+        widget.handler_id = widget.connect("clicked", scana, data)
+        widget.set_label("Start scanning now !!")
+
+class Wifiscanner ( hildon.Window ) :
+
+    def __init__ ( self ) :
+
+        hildon.Window.__init__( self )
+        program = hildon.Program.get_instance()
+        program.add_window(self)
+
+        self.gpsdev = wifimap.Scanner( self )
+
+        self.connect("delete_event", gtk.main_quit, None)
+
+        vbox = gtk.VBox(homogeneous=False, spacing=0)
+        self.add(vbox)
+
+        # Top frame creation
+        top_frame = gtk.Frame()
+        vbox.pack_start(top_frame)
+
+        hbox = gtk.HBox(homogeneous=False, spacing=0)
+        top_frame.add(hbox)
+
+        # Bottom frame creation
+        bottom_frame = gtk.Frame()
+        vbox.pack_end(bottom_frame, expand=False)
+
+        bottom_box = gtk.HBox(homogeneous=False, spacing=0)
+        bottom_frame.add( bottom_box )
+
+        # Top frame population
+        scrollview = gtk.ScrolledWindow()
+        hbox.pack_start( scrollview )
+
+        buttons = gtk.VBox(homogeneous=False, spacing=0)
+        hbox.pack_end(buttons, expand=False)
+
+        textview = hildon.TextView()
+        textview.set_placeholder( "Scan results ..." )
+        textview.set_editable( False )
+        textview.set_cursor_visible( False )
+        textview.modify_font( pango.FontDescription("Courier 12") )
+ 
+        scrollview.add( textview )
+        scrollview.set_policy( gtk.POLICY_NEVER , gtk.POLICY_AUTOMATIC )
+
+        # Buttons creation
+        button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Switch On!")
+        button.handler_id = button.connect("clicked", hello, self.gpsdev)
+        buttons.pack_start(button, expand=False)
+
+        button_scan = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Start scanning now !!")
+        button_scan.handler_id = button_scan.connect("clicked", scana, self.gpsdev)
+        buttons.pack_start(button_scan, expand=False)
+
+        toggle_button = hildon.CheckButton( gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT )
+        toggle_button.set_label( "Use Assisted GPS" )
+        toggle_button.connect("toggled", enable_agps)
+        buttons.pack_start(toggle_button, expand=False)
+
+        # Bottom frame population
+        status = gtk.Label( "status bar ..." )
+        self.gpsdev.set_infowin( status , textview.get_buffer() )
+        bottom_box.pack_start( status , expand=False , padding=20 )
+
+    def run ( self ) :
+        self.show_all()
+        self.gpsdev.start()
+        gtk.main()
+

diff --git a/wifiscanner/wifiscanner b/wifiscanner/wifiscanner
deleted file mode 100755 (executable)
index 0d99756..0000000
--- a/wifiscanner/wifiscanner
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/python
-
-import wifimap
-
-import gtk , pango
-import hildon
-
-import gobject
-
-def hello(widget, data):
-    data.do_start()
-    if widget.handler_id :
-        widget.disconnect( widget.handler_id )
-        widget.handler_id = widget.connect("clicked", bye, data)
-        widget.set_label("Switch Off!")
-
-def bye(widget, data):
-    data.do_stop()
-    if widget.handler_id :
-        widget.disconnect( widget.handler_id )
-        widget.handler_id = widget.connect("clicked", hello, data)
-        widget.set_label("Switch On!")
-
-def enable_agps(widget):
-    if widget.get_active() :
-        print "%s state is active" % widget
-
-def scana(widget, data):
-    if not data._timer :
-        data._timer = gobject.timeout_add( 5000 , data.scan )
-    else :
-        hildon.hildon_banner_show_information( widget , "icon_path" , "Scanning was already active" )
-    if widget.handler_id :
-        widget.disconnect( widget.handler_id )
-        widget.handler_id = widget.connect("clicked", scano, data)
-        widget.set_label("Stop scanning now !!")
-
-def scano(widget, data):
-    if data._timer :
-        hildon.hildon_banner_show_information( widget , "icon_path" , "Timer was running, stopping it" )
-        gobject.source_remove( data._timer )
-        data._timer = None
-        data.stop()
-    else :
-        hildon.hildon_banner_show_information( widget , "icon_path" , "Scanning is not active" )
-    if widget.handler_id :
-        widget.disconnect( widget.handler_id )
-        widget.handler_id = widget.connect("clicked", scana, data)
-        widget.set_label("Start scanning now !!")
-
-def main():
-
-    window = hildon.Window()
-    program = hildon.Program.get_instance()
-    program.add_window(window)
-
-    gpsdev = wifimap.Scanner( window )
-
-    window.connect("delete_event", gtk.main_quit, None)
-
-    vbox = gtk.VBox(homogeneous=False, spacing=0)
-    top_frame = gtk.Frame()
-    bottom_frame = gtk.Frame()
-    bottom_box = gtk.HBox(homogeneous=False, spacing=0)
-
-    hbox = gtk.HBox(homogeneous=False, spacing=0)
-    top_frame.add(hbox)
-
-    textview = hildon.TextView()
-    textview.set_placeholder( "Scan results ..." )
-    textview.set_editable( False )
-    textview.set_cursor_visible( False )
-    textview.modify_font( pango.FontDescription("Courier 12") )
- 
-    scrollview = gtk.ScrolledWindow()
-    scrollview.set_policy( gtk.POLICY_NEVER , gtk.POLICY_AUTOMATIC )
-    scrollview.add( textview )
-    hbox.pack_start( scrollview )
-
-    buttons = gtk.VBox(homogeneous=False, spacing=0)
-    hbox.pack_end(buttons, expand=False)
-
-    button = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Switch On!")
-    button.handler_id = button.connect("clicked", hello, gpsdev)
-    buttons.pack_start(button, expand=False)
-
-    button_scan = hildon.Button(gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT, hildon.BUTTON_ARRANGEMENT_VERTICAL, "Start scanning now !!")
-    button_scan.handler_id = button_scan.connect("clicked", scana, gpsdev)
-    buttons.pack_start(button_scan, expand=False)
-
-    toggle_button = hildon.CheckButton( gtk.HILDON_SIZE_AUTO_WIDTH | gtk.HILDON_SIZE_FINGER_HEIGHT )
-    toggle_button.set_label( "Use Assisted GPS" )
-    toggle_button.connect("toggled", enable_agps)
-    buttons.pack_start(toggle_button, expand=False)
-
-    status = gtk.Label( "status bar ..." )
-    gpsdev.set_infowin( status , textview.get_buffer() )
-    bottom_box.pack_start( status , expand=False , padding=20 )
-
-    bottom_frame.add( bottom_box )
-
-    vbox.pack_start(top_frame)
-    vbox.pack_end(bottom_frame, expand=False)
-    window.add(vbox)
-
-    window.show_all()
-
-    gpsdev.start()
-
-    gtk.main()
-
-if __name__ == "__main__":
-    main()
-