Changeset 3283

Timestamp:

08/01/08 18:36:34 (5 years ago)

Author:

nopper

Message:

Tab registering

Location:

branch/PacketManipulator

Files:

• MainWindow.py (modified) (7 diffs)
• Tabs/ConsoleTab.py (modified) (1 diff)
• Tabs/HackTab.py (modified) (1 diff)
• Tabs/MainTab.py (modified) (1 diff)
• Tabs/PropertyTab.py (modified) (2 diffs)
• Tabs/ProtocolSelectorTab.py (modified) (1 diff)
• Tabs/VteTab.py (modified) (1 diff)
• fallbackpaned.py (modified) (3 diffs)
• paned.py (modified) (1 diff)
• views.py (modified) (1 diff)
• widgets/Expander.py (modified) (2 diffs)

branch/PacketManipulator/MainWindow.py

@@ -22 +22 @@
 
 try:
-    from paned import *
+    from panedz import *
 except ImportError:
     print "moo not installed. Using fallback UmitPaned .."
@@ -47 +47 @@
         self.set_size_request(600, 400)
         
-        self.registered_tabs = []
+        self.registered_tabs = {}
 
         self.__create_widgets()
@@ -71 +71 @@
             ('Preferences', gtk.STOCK_PREFERENCES, _('_Preferences'), '<Control>p', None, self.__on_preferences),
 
+            ('Views', None, _('Views'), None),
+
             ('Help', None, _('Help'), None),
             ('About', gtk.STOCK_ABOUT, _('About'), None, None, self.__on_about),
@@ -89 +91 @@
                 <menuitem action='Preferences'/>
             </menu>
+            <menu action='Views'/>
             <menu action='Help'>
                 <menuitem action='About'/>
@@ -117 +120 @@
         # Central widgets
         self.main_paned = UmitPaned()
-        self.main_tab = MainTab()
-
-        # Tabs
-        self.vte_tab = VteTab()
-        self.hack_tab = HackTab()
-        self.protocols_tab = ProtocolSelectorTab()
-        self.property_tab = PropertyTab()
-        self.console_tab = ConsoleTab()
-
-        # This should be moved to UmitPaned btw...
-        self.registered_tabs.append(self.main_tab)
-        self.registered_tabs.append(self.vte_tab)
-        self.registered_tabs.append(self.hack_tab)
-        self.registered_tabs.append(self.protocols_tab)
-        self.registered_tabs.append(self.property_tab)
-        self.registered_tabs.append(self.console_tab)
 
         self.vbox = gtk.VBox(False, 2)
+
+    def get_tab(self, name):
+        return self.registered_tabs[name]
+
+    def register_tab(self, tab, show=True):
+        item = self.ui_manager.get_widget('/menubar/Views')
+        menu = item.get_submenu()
+
+        item.show()
+
+        if not menu:
+            menu = gtk.Menu()
+            item.set_submenu(menu)
+
+        if tab.label_text in self.registered_tabs:
+            raise Exception("Tab already present")
+
+        # Ok we should add a CheckMenuItem to this fucking menu
+        self.registered_tabs[tab.label_text] = tab
+
+        print "Tab %s registered" % tab.label_text
+
+        if not tab.tab_position:
+            # This is the central widget so it should be added
+            # with no MenuItem
+            self.main_paned.add_view(tab)
+            return
+
+        new_item = gtk.CheckMenuItem(tab.label_text)
+        new_item.connect('toggled', self.__on_toggle_tab_menu, tab)
+
+        if show:
+            new_item.set_active(True)
+
+        menu.append(new_item)
+        menu.show_all()
 
     def __pack_widgets(self):
@@ -147 +170 @@
         self.vbox.pack_start(self.main_paned)
 
-        self.main_paned.add_view(PANE_CENTER, self.main_tab, False)
-
-        self.main_paned.add_view(PANE_RIGHT, self.protocols_tab, False)
-        self.main_paned.add_view(PANE_RIGHT, self.property_tab, False)
-
-        self.main_paned.add_view(PANE_BOTTOM, self.vte_tab, False)
-        self.main_paned.add_view(PANE_BOTTOM, self.console_tab, False)
-        self.main_paned.add_view(PANE_BOTTOM, self.hack_tab, False)
+        # Tabs
+        self.register_tab(MainTab())
+        self.register_tab(VteTab())
+        self.register_tab(HackTab())
+        self.register_tab(ProtocolSelectorTab())
+        self.register_tab(PropertyTab())
+        self.register_tab(ConsoleTab())
 
         self.add(self.vbox)
@@ -165 +187 @@
         "Used to connect signals between tabs"
 
-        for tab in self.registered_tabs:
+        for key, tab in self.registered_tabs.items():
             tab.connect_tab_signals()
 
+    def __on_toggle_tab_menu(self, menuitem, tab):
+        if menuitem.get_active():
+            self.main_paned.add_view(tab)
+        else:
+            self.main_paned.remove_view(tab)
+
     def __on_save_template(self, action):
-        session = self.main_tab.get_current_session()
+        session = self.get_tab("MainTab").get_current_session()
 
         if not session:

branch/PacketManipulator/Tabs/ConsoleTab.py

@@ -26 +26 @@
 class ConsoleTab(UmitView):
     label_text = "Packet Shell"
+    tab_position = gtk.POS_BOTTOM
 
     def __create_widgets(self):

branch/PacketManipulator/Tabs/HackTab.py

@@ -247 +247 @@
 class HackTab(UmitView):
     icon_name = gtk.STOCK_CONVERT
+    tab_position = gtk.POS_BOTTOM
     label_text = "Hack Tab"
 

branch/PacketManipulator/Tabs/MainTab.py

@@ -134 +134 @@
 
 class MainTab(UmitView):
+    tab_position = None
+    label_text = "MainTab"
+
     def __create_widgets(self):
         "Create the widgets"

branch/PacketManipulator/Tabs/PropertyTab.py

@@ -27 +27 @@
     label_text = "Properties"
     icon_name = gtk.STOCK_INDEX
+    tab_position = gtk.POS_RIGHT
 
     def create_ui(self):
@@ -42 +43 @@
 
         from App import PMApp
-        tab = PMApp().main_window.main_tab
+        tab = PMApp().main_window.get_tab("MainTab")
+        print tab
         tab.session_notebook.connect('switch-page', self.__on_repopulate)
 

branch/PacketManipulator/Tabs/ProtocolSelectorTab.py

@@ -163 +163 @@
     icon_name = gtk.STOCK_CONNECT
     label_text = "Protocols"
+    tab_position = gtk.POS_RIGHT
 
     def create_ui(self):

branch/PacketManipulator/Tabs/VteTab.py

@@ -73 +73 @@
     icon_name = gtk.STOCK_OK
     label_text = "Terminal"
+    tab_position = gtk.POS_BOTTOM
 
     def create_ui(self):

branch/PacketManipulator/fallbackpaned.py

@@ -50 +50 @@
         self.show_all()
 
-    def add_view(self, pos, tab, unused=False):
+    def add_view(self, tab, unused=False):
         widget = tab.get_toplevel()
 
-        if pos == PANE_CENTER:
+        if not tab.tab_position:
             if not self.hpaned.get_child2():
                 self.hpaned.pack2(widget, True, False)
@@ -62 +62 @@
         image = gtk.image_new_from_stock(tab.icon_name, gtk.ICON_SIZE_MENU)
 
+        pos = tab.tab_position
+
         label.pack_start(image, False, False)
         label.pack_start(gtk.Label(tab.label_text))
@@ -68 +70 @@
         print "Adding widget", widget, "to", pos
 
-        if pos == PANE_RIGHT or pos == PANE_LEFT:
+        if pos == gtk.POS_RIGHT or pos == gtk.POS_LEFT:
             self.hnotebook.append_page(widget, label)
-        elif pos == PANE_TOP or pos == PANE_BOTTOM:
+        elif pos == gtk.POS_TOP or pos == gtk.POS_BOTTOM:
             self.vnotebook.append_page(widget, label)
+
+    def remove_view(self, tab):
+        pos = tab.tab_position
+
+        if pos == gtk.POS_RIGHT or pos == gtk.POS_LEFT:
+            nb = self.hnotebook
+        elif pos == gtk.POS_TOP or pos == gtk.POS_BOTTOM:
+            nb = self.vnotebook
+
+        num = nb.page_num(tab.get_toplevel())
+        if num > -1:
+            nb.remove_page(num)
+        else:
+            raise Exception("Cannot found the widget")
 
 if __name__ == "__main__":

branch/PacketManipulator/paned.py

@@ -32 +32 @@
             yield self.get_paned(pos)
 
-    def add_view(self, name, view, removable=True):
-        if name == PANE_CENTER:
+    def add_view(self, view, removable=True):
+        if not view.tab_position:
             self.add_child(view.get_toplevel())
         else:
-            POS = POS_MAP[name]
+            POS = view.tab_position
             lab = PaneLabel(view.icon_name, None, view.label_text)
             pane = self.insert_pane(view.get_toplevel(), lab, POS, POS)

branch/PacketManipulator/views.py

@@ -67 +67 @@
 
 class UmitViewMixin(object):
-
     icon_name = gtk.STOCK_INFO
     label_text = 'Umit View'
+    tab_position = gtk.POS_RIGHT
 
     def __init__(self, toplevel=None):

branch/PacketManipulator/widgets/Expander.py

@@ -444 +444 @@
         self.pack_start(self._layout)
         
+        self.set_size_request(40, 100)
         self.show_all()
+
+    def do_size_allocate(self, allocation):
+        # We should force a size allocate to avoid bugs
+        # when the widget is getting too small!
+        gtk.VBox.do_size_allocate(self, allocation)
+        self._layout.size_allocate(self._layout.allocation)
 
     def do_realize(self):
@@ -466 +473 @@
 
     def add(self, widget):
-        self.add_widget(widget, True)
+        self.add_widget(widget, False) #FIXME
 
     def get_label(self):