Changeset 3439

Timestamp:

08/15/08 09:59:42 (5 years ago)

Author:

nopper

Message:

Closable label title addition to StatiContext? redraw_rows fix

Location:

branch/PacketManipulator

Files:

• Backend/PM/BaseContext/Static.py (modified) (4 diffs)
• Backend/PM/BaseContext/Timed.py (modified) (1 diff)
• Backend/Scapy/Context/Sniff.py (modified) (1 diff)
• Backend/Scapy/Context/Static.py (modified) (2 diffs)
• Icons.py (modified) (1 diff)
• MainWindow.py (modified) (2 diffs)
• PacketManipulator (modified) (1 diff)
• Tabs/MainTab.py (modified) (6 diffs)
• Tabs/OperationsTab.py (modified) (2 diffs)
• share/pixmaps/umit/stock-close-16.png (added)
• widgets/ClosableLabel.py (added)
• widgets/Sniff.py (modified) (10 diffs)

branch/PacketManipulator/Backend/PM/BaseContext/Static.py

@@ -22 +22 @@
 
 class BaseStaticContext(object):
-    def __init__(self, fname=None):
+    NOT_SAVED, SAVED = range(2)
+
+    def __init__(self, title, fname=None):
         self._data = []
+        self._title = title
+        self._status = self.NOT_SAVED
 
         if fname:
@@ -33 +37 @@
 
     def load(self):
-        pass
+        self.status = self.SAVED
     def save(self):
-        pass
+        self.status = self.SAVED
 
     def get_summary(self):
@@ -47 +51 @@
         self._data = val
 
+    def get_title(self):
+        return self._title
+    def set_title(self, val):
+        self._title = val
+
+    def get_status(self):
+        return self._status
+    def set_status(self, val):
+        self._status = val
+
     def get_cap_file(self):
         return self._cap_file
@@ -53 +67 @@
 
     data = property(get_data, set_data)
+    title = property(get_title, set_title)
     summary = property(get_summary, set_summary)
+    status = property(get_status, set_status)
     cap_file = property(get_cap_file, set_cap_file)
 

branch/PacketManipulator/Backend/PM/BaseContext/Timed.py

@@ -37 +37 @@
         self._last = 0
 
-        StaticContext.__init__(self)
+        StaticContext.__init__(self, '')
 
     def _start(self):

branch/PacketManipulator/Backend/Scapy/Context/Sniff.py

@@ -44 +44 @@
             self.internal = True
 
-            self.summary = _('Sniffing on %s') % self.iface
+            self.title = _('%s capture') % self.iface
             self.thread = None
 

branch/PacketManipulator/Backend/Scapy/Context/Static.py

@@ -41 +41 @@
                 self.data.append(MetaPacket(packet))
 
+            self.status = self.SAVED
             self.summary = _('%d packets loaded.') % len(data)
             return True
@@ -60 +61 @@
                 return False
 
+            self.status = self.SAVED
             self.summary = _('%d packets written.') % len(data)
             return True

branch/PacketManipulator/Icons.py

@@ -36 +36 @@
     'info',
     'warning',
-    'error'
+    'error',
+
+    'stock-close'
 )
 

branch/PacketManipulator/MainWindow.py

@@ -20 +20 @@
 
 import gtk
+import Backend
 
 from Manager.PreferenceManager import Prefs
@@ -290 +291 @@
 
     def __on_quit(self, *args):
+        self.hide()
 
         # We need to stop the pending sniff threads
         maintab = self.get_tab("MainTab")
 
+        lst = []
+
         for page in maintab.session_notebook:
-            page.sniff_page.stop_sniffing()
-
-        for page in maintab.session_notebook:
-            if hasattr(page.sniff_page, 'context'):
-                page.sniff_page.context.join()
+            if isinstance(page.context, Backend.TimedContext):
+                lst.append(page.context)
+
+        for ctx in lst:
+            ctx.stop()
+
+        for ctx in lst:
+            ctx.join()
 
         gtk.main_quit()

branch/PacketManipulator/PacketManipulator

@@ -94 +94 @@
 
 def main(args):
-    from App import PMApp
     from umitCore.Paths import Path
     Path.set_umit_conf(os.path.split(args[0])[0])
+
+    from App import PMApp
 
     try:

branch/PacketManipulator/Tabs/MainTab.py

@@ -25 +25 @@
 from widgets.Expander import AnimatedExpander
 from widgets.Sniff import SniffPage
+from widgets.ClosableLabel import ClosableLabel
 
 from views import UmitView
@@ -247 +248 @@
 
         self.sniff_page = SniffPage(self)
-        self._label = gtk.Label(ctx.summary)
+        self._label = ClosableLabel(ctx.title)
 
         self.set_border_width(4)
@@ -289 +290 @@
 
     def create_edit_session(self, packet):
-        ctx = Backend.StaticContext()
+        ctx = Backend.StaticContext(_('Unsaved'))
 
         if isinstance(packet, basestring):
@@ -310 +311 @@
 
     def create_offline_session(self, fname):
-        ctx = Backend.StaticContext(fname)
+        ctx = Backend.StaticContext(fname, fname)
         ctx.load()
 
@@ -321 +322 @@
 
     def __append_session(self, session):
+        session.label.connect('close-clicked', self.__on_close_page, session)
+
         self.append_page(session, session.label)
         self.set_tab_reorderable(session, True)
+
         return session
+
+    def __remove_session(self, session):
+        from App import PMApp
+        tab = PMApp().main_window.get_tab("Operations")
+
+        tab.tree.remove_operation(session.context)
+
+        idx = self.page_num(session)
+        self.remove_page(idx)
 
     def get_current_session(self):
@@ -339 +352 @@
 
         return None
+
+    def __on_close_page(self, label, session):
+        # Check if are stopped
+
+        if isinstance(session.context, Backend.TimedContext) and \
+           session.context.state != session.context.NOT_RUNNING:
+            dialog = gtk.MessageDialog(self.get_toplevel(),
+                                       gtk.DIALOG_DESTROY_WITH_PARENT,
+                                       gtk.MESSAGE_QUESTION,
+                                       gtk.BUTTONS_YES_NO,
+                                       _('The session is running.\nDo you want stop it?'))
+            id = dialog.run()
+
+            dialog.hide()
+            dialog.destroy()
+            
+            if id == gtk.RESPONSE_YES:
+                session.context.stop()
+
+            return
+
+        if session.context.status == session.context.SAVED:
+            self.__remove_session(session)
+        else:
+
+            dialog = gtk.MessageDialog(self.get_toplevel(),
+                                       gtk.DIALOG_DESTROY_WITH_PARENT,
+                                       gtk.MESSAGE_QUESTION,
+                                       gtk.BUTTONS_YES_NO,
+                                       _('The session has unsaved changes.\nDo you want to save them?'))
+
+            id = dialog.run()
+
+            dialog.hide()
+            dialog.destroy()
+            
+            if id == gtk.RESPONSE_NO or \
+               (id == gtk.RESPONSE_YES and session.sniff_page.save()):
+                
+                self.__remove_session(session)
 
 class MainTab(UmitView):

branch/PacketManipulator/Tabs/OperationsTab.py

@@ -274 +274 @@
             operation.start()
 
+    def remove_operation(self, operation):
+        """
+        Remove an operation from the store
+
+        @param operation the Operation to remove
+        """
+
+        if not isinstance(operation, Operation):
+            return
+
+        def remove(model, path, iter, operation):
+            if model.get_value(iter, 0) is operation:
+                model.remove(iter)
+                return True
+
+        self.store.foreach(remove, operation)
+
     # Callbacks section
 
@@ -292 +309 @@
 
     def __on_clear(self, action, operation):
-        pass
+        # TODO: try a better method
+        iter = self.store.get_iter_first()
+
+        while iter:
+            operation = self.store.get_value(iter, 0)
+
+            if operation.state == operation.NOT_RUNNING:
+                self.store.remove(iter)
+
+            iter = self.store.iter_next(iter)
 
 class OperationsTab(UmitView):

branch/PacketManipulator/widgets/Sniff.py

@@ -75 +75 @@
         self.reload()
 
-    def clear(self):
-        self.store.clear()
-
-    def reload(self):
-        for packet in self.session.context.get_data():
-            self.store.append([packet])
-
-        self.statusbar.label = "<b>%s</b>" % self.session.context.summary
-
-        if self.timeout_id:
-            gobject.source_remove(self.timeout_id)
-
-        if isinstance(self.session.context, Backend.TimedContext):
-            self.timeout_id = gobject.timeout_add(200, self.__update_tree)
-
     def __create_toolbar(self):
         self.toolbar = gtk.Toolbar()
@@ -95 +80 @@
 
         stocks = (
+            gtk.STOCK_REFRESH,
             gtk.STOCK_MEDIA_STOP,
             gtk.STOCK_SAVE,
@@ -101 +87 @@
 
         callbacks = (
+            self.__on_restart,
             self.__on_stop,
             self.__on_save,
@@ -107 +94 @@
 
         tooltips = (
+            _('Restart capturing'),
             _('Stop capturing'),
             _('Save packets'),
@@ -182 +170 @@
                 for rend in col.get_cell_renderers():
                     rend.set_property('font-desc', desc)
+
+            self.__redraw_rows()
         except:
             # Block change
@@ -190 +180 @@
         self.use_colors = value
         self.tree.set_rules_hint(not self.use_colors)
+
+        self.__redraw_rows()
+
+    def __redraw_rows(self):
+        def emit_row_changed(model, path, iter):
+            model.row_changed(path, iter)
+
+        self.store.foreach(emit_row_changed)
 
     def __get_color(self, packet):
@@ -215 +213 @@
         return alive
 
+    # Public functions
+
     def populate(self, pktlist):
         for packet in pktlist:
             self.store.append([packet])
 
-    def stop_sniffing(self):
-        self.session.context.stop()
+    def clear(self):
+        self.store.clear()
+
+    def reload(self):
+        for packet in self.session.context.get_data():
+            self.store.append([packet])
+
+        self.statusbar.label = "<b>%s</b>" % self.session.context.summary
+
+        if self.timeout_id:
+            gobject.source_remove(self.timeout_id)
+
+        if isinstance(self.session.context, Backend.TimedContext):
+            self.timeout_id = gobject.timeout_add(200, self.__update_tree)
+
+    def save(self):
+        return self.__on_save(None)
+
+    def save_as(self):
+        return self.__on_save_as(None)
 
     # Signals callbacks
@@ -273 +291 @@
     def __on_stop(self, action):
         self.session.context.stop()
-
-    def __on_save(self, action, saveas_on_fail=True):
+    def __on_restart(self, action):
+        self.session.context.restart()
+
+    def __on_save(self, action):
         if self.session.context.cap_file:
-            self.__save_packets(self.session.context.cap_file)
+            return self.__save_packets(self.session.context.cap_file)
         else:
-            self.__on_save_as(None)
+            return self.__on_save_as(None)
 
     def __on_save_as(self, action):
@@ -295 +315 @@
             dialog.add_filter(filter)
 
+        ret = False
         if dialog.run() == gtk.RESPONSE_ACCEPT:
-            self.__save_packets(dialog.get_filename())
+            ret = self.__save_packets(dialog.get_filename())
 
         dialog.hide()
         dialog.destroy()
 
+        return ret
+
     def __save_packets(self, fname):
         self.session.context.cap_file = fname
-
-        if self.session.context.save():
+        ret = self.session.context.save()
+
+        if ret:
             self.statusbar.image = gtk.STOCK_HARDDISK
         else:
@@ -311 +335 @@
         self.statusbar.label = "<b>%s</b>" % self.session.context.summary
         self.statusbar.start_animation(True)
+
+        return ret
 
 class SniffFilter(gtk.HBox):