Changeset 652

Timestamp:

05/12/07 16:51:16 (6 years ago)

Author:

boltrix

Message:

Added Guilherme's higframe to higwidgets trunk. Also, some fixes to prepare a new and stable release of umit.

Files:

• branch/hildon/umitGUI/MainWindow.py (modified) (5 diffs)
• branch/hildon/umitGUI/ScanNotebook.py (modified) (2 diffs)
• branch/hildon/umitGUI/ScanToolbar.py (modified) (1 diff)
• branch/hildon/umitGUI/SearchWindow.py (modified) (1 diff)
• trunk/higwidgets/higframe.py (copied) (copied from branch/ggpolo/higwidgets/higframe.py)

branch/hildon/umitGUI/MainWindow.py

@@ -53 +53 @@
 try:
     if sys.platform == 'win32': root = True
+    elif is_maemo(): root = True
     elif os.getuid() == 0: root = True
 except: pass
@@ -66 +67 @@
             hildon.Window.__init__(self)
             self.set_resizable(False)
-            self.set_border_width(5)
+            self.set_border_width(0)
+            self.vbox = gtk.VBox()
+            self.vbox.set_border_width(0)
+            self.vbox.set_spacing(0)
 
 else:
@@ -72 +76 @@
         def __init__(self):
             HIGMainWindow.__init__(self)
+            self.vbox = gtk.VBox()
 
 
@@ -84 +89 @@
         self.add_accel_group(self.main_accel_group)
         
-        self.vbox = gtk.VBox()
         self.add(self.vbox)
         
@@ -550 +554 @@
         self.scan_notebook = ScanNotebook()
         self.scan_notebook.show_all()
-        self.vbox.pack_start(self.scan_notebook, True, True, 4)
+        if is_maemo():
+            # No padding. We need space!
+            self.vbox.pack_start(self.scan_notebook, True, True, 0)
+        else:
+            self.vbox.pack_start(self.scan_notebook, True, True, 4)
 
     def _create_statusbar(self):

branch/hildon/umitGUI/ScanNotebook.py

@@ -37 +37 @@
 from umitCore.NmapCommand import NmapCommand
 from umitCore.NmapCommand import CommandConstructor
-from umitCore.UmitConf import CommandProfile, ProfileNotFound
+from umitCore.UmitConf import CommandProfile, ProfileNotFound, is_maemo
 from umitCore.NmapParser import NmapParser
 from umitCore.Paths import Path
@@ -262 +262 @@
     def __init__(self):
         HIGVBox.__init__(self)
+
+        # The borders are consuming too much space on Maemo. Setting it to
+        # 0 pixels while on Maemo
+        if is_maemo():
+            self.set_border_width(0)
+        
         self.set_spacing(0)
         self.status = PageStatus()

branch/hildon/umitGUI/ScanToolbar.py

@@ -56 +56 @@
         self._create_profile()
         
-        self.scan_button = gtk.Button(_("Start Scan"))
+        self.scan_button = gtk.Button(_("Scan"))
 
         self._pack_noexpand_nofill(self.target_label)

branch/hildon/umitGUI/SearchWindow.py

@@ -22 +22 @@
 
 from umitCore.I18N import _
+from umitCore.UmitConf import is_maemo
 
 from higwidgets.higboxes import HIGVBox
 from higwidgets.higbuttons import HIGButton
 
-class SearchWindow(gtk.Window, object):
+BaseSearchWindow = None
+hildon = None
+
+if is_maemo():
+    import hildon
+    class BaseSearchWindow(hildon.Window):
+        def __init__(self):
+            hildon.Window.__init__(self)
+else:
+    class BaseSearchWindow(gtk.Window):
+        def __init__(self):
+            gtk.Window.__init__(self)
+            self.set_title(_("Search Window"))
+            self.set_position(gtk.WIN_POS_CENTER)
+
+class SearchWindow(BaseSearchWindow, object):
     def __init__(self, load_method):
-        gtk.Window.__init__(self)
-        self.set_title(_("Search Window"))
-        self.set_position(gtk.WIN_POS_CENTER)
+        BaseSearchWindow.__init__(self)
 
         self.load_method = load_method