Changeset 3393

Timestamp:

08/10/08 13:13:43 (5 years ago)

Author:

nopper

Message:

Preference improvement (style) and saving implemented

Location:

branch/PacketManipulator

Files:

• Dialogs/Preferences.py (modified) (7 diffs)
• Manager/PreferenceManager.py (modified) (2 diffs)
• pm-prefs.xml (modified) (1 diff)

branch/PacketManipulator/Dialogs/Preferences.py

@@ -32 +32 @@
 
 def set_active_text(combo, text):
-    print "implement me"
+    model = combo.get_model()
+
+    for idx in xrange(len(model)):
+        value = model.get_value(model.get_iter((idx, )), 0)
+
+        if value.lower() == text.lower():
+            combo.set_active(idx)
+            return
 
 TYPES = (
@@ -64 +71 @@
 
         self.set_border_width(4)
+        self.set_row_spacings(4)
+
         self.create_ui()
         self.show_all()
@@ -70 +79 @@
         pass
 
+    def __create_option_widgets(self, name, lbl, widget):
+        label = None
+
+        if lbl:
+            label = gtk.Label(lbl)
+            label.set_use_markup(True)
+            label.set_alignment(0, 0.5)
+
+        for typo, func in CONSTRUCTORS:
+            if isinstance(widget, typo):
+
+                value = Prefs()[name].value
+                func(widget, value)
+
+                break
+
+        return label, widget
+
     def create_ui(self):
-        idx = 0
-
-        for (name, lbl, widget) in self.widgets:
-
-            if lbl:
-                label = gtk.Label("<b>%s</b>" % lbl)
+        gidx = 0
+
+        for options in self.widgets:
+
+            if isinstance(options[1], tuple):
+                frame = gtk.Frame()
+                table = gtk.Table(len(options[1]), 2)
+
+                label = gtk.Label("<b>%s</b>" % options[0])
                 label.set_use_markup(True)
-                label.set_alignment(0, 0.5)
-
-                self.attach(label, 0, 1, idx, idx + 1, yoptions=gtk.SHRINK)
-                self.attach(widget, 1, 2, idx, idx + 1, yoptions=gtk.SHRINK)
+
+                frame.set_label_widget(label)
+                frame.add(table)
+
+                table.set_border_width(4)
+                table.set_row_spacings(4)
+
+                idx = 0
+                for name, lbl, widget in options[1]:
+                    lbl, widget = self.__create_option_widgets(name, lbl, widget)
+
+                    if lbl:
+                        table.attach(lbl, 0, 1, idx, idx + 1, yoptions=gtk.SHRINK)
+                        table.attach(widget, 1, 2, idx, idx + 1, yoptions=gtk.SHRINK)
+                    else:
+                        table.attach(widget, 0, 2, idx, idx + 1, yoptions=gtk.SHRINK)
+
+                    idx += 1
+
+                self.attach(frame, 0, 2, gidx, gidx + 1, yoptions=gtk.SHRINK)
             else:
-                self.attach(widget, 0, 2, idx, idx + 1, yoptions=gtk.SHRINK)
-
-            for typo, func in CONSTRUCTORS:
-                if isinstance(widget, typo):
-
-                    print func, widget, name
-                    value = Prefs()[name].value
-                    func(widget, value)
-
-                    break
-
-            idx += 1
+                lbl, widget = self.__create_option_widgets(options[0], options[1], options[2])
+
+                if lbl:
+                    self.attach(lbl, 0, 1, gidx, gidx + 1, yoptions=gtk.SHRINK)
+                    self.attach(widget, 1, 2, gidx, gidx + 1, yoptions=gtk.SHRINK)
+                else:
+                    self.attach(widget, 0, 2, gidx, gidx + 1, yoptions=gtk.SHRINK)
+
+            gidx += 1
 
 class GUIPage(Page):
@@ -103 +146 @@
         self.widgets = [
         ('gui.docking', None, gtk.CheckButton('Use docking windows')),
-        ('gui.maintab.sniffview.font', 'Sniff view font:', gtk.FontButton()),
-        ('gui.maintab.sniffview.usecolors', None, gtk.CheckButton('Colorize rows')),
-        ('gui.maintab.hexview.font', 'HexView font:', gtk.FontButton()),
-        ('gui.maintab.hexview.bpl', 'Bytes per line:', gtk.SpinButton(gtk.Adjustment(8, 1, 16, 1, 1)))
+        
+        ('Sniff perspective',
+          (('gui.maintab.sniffview.font', 'Sniff view font:', gtk.FontButton()),
+           ('gui.maintab.sniffview.usecolors', None, gtk.CheckButton('Colorize rows')))),
+
+        ('Hex view window',
+          (('gui.maintab.hexview.font', 'HexView font:', gtk.FontButton()),
+           ('gui.maintab.hexview.bpl', 'Bytes per line:', gtk.SpinButton(gtk.Adjustment(8, 1, 16, 1, 1)))))
         ]
 
@@ -159 +206 @@
         self.vbox.pack_start(hbox)
         self.vbox.set_border_width(4)
-        self.vbox.set_spacing(4)
+        self.vbox.set_spacing(6)
+
+        self.set_size_request(600, 400)
 
         self.tree.get_selection().connect('changed', self.__on_switch_page)
@@ -183 +232 @@
             page = self.notebook.get_nth_page(idx)
 
-            for option, lbl, widget in page.widgets:
-
-                for typo, func in TYPES:
-                    if isinstance(widget, typo):
-
-                        # We should call the functions
-                        new_value = func(widget)
-
-                        print "Setting", option, new_value
-                        Prefs()[option].value = new_value
-
-                        break
+            for options in page.widgets:
+
+                if isinstance(options[1], tuple):
+                    for option, lbl, widget in options[1]:
+                        self.__apply(widget, option)
+                else:
+                    self.__apply(options[2], options[0])
+
+    def __apply(self, widget, option):
+        for typo, func in TYPES:
+            if isinstance(widget, typo):
+
+                # We should call the functions
+                new_value = func(widget)
+
+                Prefs()[option].value = new_value
+
+                break
+
+    def save_changes(self):
+        Prefs().write_options()
 
     def __on_response(self, dialog, id):
@@ -203 +261 @@
         elif id == gtk.RESPONSE_OK:
             self.apply_changes()
+            self.save_changes()
             self.close()
 

branch/PacketManipulator/Manager/PreferenceManager.py

@@ -113 +113 @@
             attr_vals = {
                 (None, u'id') : key,
-                (None, u'value') : option.value
+                (None, u'value') : str(option.value)
             }
 
@@ -136 +136 @@
         'gui.maintab.hexview.bpl' : 16,
 
-        'backend.system' : 'umpa',
+        'backend.system' : 'scapy',
     }
 

branch/PacketManipulator/pm-prefs.xml

@@ -1 @@
-<str id='backend.system' value='scapy'/>
+<?xml version="1.0" encoding="utf-8"?>
+<int value="16" id="gui.maintab.hexview.bpl"></int><bool value="False" id="gui.maintab.sniffview.usecolors"></bool><str value="Monospace 10" id="gui.maintab.hexview.font"></str><str value="Scapy" id="backend.system"></str><bool value="True" id="gui.docking"></bool><str value="Monospace 10" id="gui.maintab.sniffview.font"></str>