Changeset 1172:9c52e32032d4

Timestamp:

05/21/08 22:14:03 (2 months ago)

Author:

Tobias Eberle <info@…>

Message:

contexts/filemanager: popup menu improvements

contexts: added events emitted when popup menu is shown / deactivated
filemanager: added delete file / delete dir

Location:

pida/services

Files:

• contexts/contexts.py (modified) (2 diffs)
• filemanager/filemanager.py (modified) (7 diffs)
• filemanager/uidef/filemanager-dir-menu.xml (modified) (1 diff)
• filemanager/uidef/filemanager-file-menu.xml (modified) (1 diff)

pida/services/contexts/contexts.py

@@ -51 +51 @@
 
     def popup_menu(self, context, event=None, **kw):
+        handler_id = 0
         menu = self.get_menu(context, **kw)
         menu.show_all()
@@ -59 +60 @@
             button = event.button
             time = event.time
+
+            def on_menu_deactivated(menu):
+                menu.handler_disconnect(handler_id)
+                self.svc.emit('menu-deactivated', context=context, **kw)
+
+        handler_id = menu.connect('deactivate', on_menu_deactivated)
+        self.svc.emit('show-menu', context=context, **kw)
         menu.popup(None, None, None, button, time)
 
 class ContextEventsConfig(EventsConfig):
 
+    def create(self):
+        self.publish('show-menu')
+        self.publish('menu-deactivated')
+    
     def subscribe_all_foreign(self):
         self.subscribe_foreign('plugins', 'plugin_started',

pida/services/filemanager/filemanager.py

@@ -320 +320 @@
         if item.is_dir:
             self.svc.boss.cmd('contexts', 'popup_menu', context='dir-menu',
-                          dir_name=item.path, event=event) 
+                          dir_name=item.path, event=event, filemanager=True) 
         else:
             self.svc.boss.cmd('contexts', 'popup_menu', context='file-menu',
-                          file_name=item.path, event=event) 
+                          file_name=item.path, event=event, filemanager=True)
 
     def on_selection_changed(self, ol, item):
@@ -521 +521 @@
         self.subscribe_foreign('plugins', 'plugin_stopped',
             self.on_plugin_stopped);
+        self.subscribe_foreign('contexts', 'show-menu',
+            self.on_contexts__show_menu)
+        self.subscribe_foreign('contexts', 'menu-deactivated',
+            self.on_contexts__menu_deactivated)
 
     def on_plugin_started(self, plugin):
@@ -528 +532 @@
     def on_plugin_stopped(self, plugin):
         self.svc.refresh_file_hidden_check_menu()
+
+    def on_contexts__show_menu(self, context, **kw):        
+        if (kw.has_key('filemanager')):
+            if (context == 'file-menu'):
+                self.svc.get_action('delete-file').set_visible(True)
+            else:
+                self.svc.get_action('delete-dir').set_visible(
+                    kw['dir_name'] != self.svc.get_view().path)
+        else:
+            self.svc.get_action('delete-file').set_visible(False)
+            self.svc.get_action('delete-dir').set_visible(False)
+
+    def on_contexts__menu_deactivated(self, context, **kw):
+        if (kw.has_key('filemanager')):
+            if (context == 'file-menu'):
+                self.svc.get_action('delete-file').set_visible(False)
+            else:
+                self.svc.get_action('delete-dir').set_visible(False)
 
 
@@ -612 +634 @@
     def create_actions(self):
         self.create_action(
+            'delete-file',
+            TYPE_NORMAL,
+            _('Delete File'),
+            _('Delete selected file'),
+            gtk.STOCK_DELETE,
+            self.on_delete
+        )
+        
+        self.create_action(
             'browse-for-file',
             TYPE_NORMAL,
@@ -618 +649 @@
             'file-manager',
             self.on_browse_for_file,
+        )
+        
+        self.create_action(
+            'delete-dir',
+            TYPE_NORMAL,
+            _('Delete Directory'),
+            _('Delete selected directory'),
+            gtk.STOCK_DELETE,
+            self.on_delete
         )
 
@@ -700 +740 @@
             _('Delete the selected file'),
             gtk.STOCK_DELETE,
-            self.on_toolbar_delete,
+            self.on_delete,
         )
         self.create_action(
@@ -759 +799 @@
         self.svc.get_view().paste_clipboard()
 
-    def on_toolbar_delete(self, action):
+    def on_delete(self, action):
         current = self.svc.get_view().get_selected_filename()
         if current is not None:

pida/services/filemanager/uidef/filemanager-dir-menu.xml

@@ -2 +2 @@
 <popup>
 <placeholder name="1">
-<menuitem action="browse-for-dir" name="browse-for-dir"/>
+  <menuitem action="browse-for-dir" name="browse-for-dir"/>
+  <menuitem action="delete-dir" name="delete-dir"/>
 </placeholder>
 <separator/>

pida/services/filemanager/uidef/filemanager-file-menu.xml

@@ -1 +1 @@
 <ui>
 <popup>
-<placeholder name="1"/>
-<separator/>
-<placeholder name="2">
-<menuitem action="browse-for-file" name="browse-for-file"/>
-</placeholder>
-<separator/>
-<placeholder name="3"/>
-<separator/>
-<placeholder name="4"/>
-<separator/>
+  <placeholder name="1">
+    <menuitem action="delete-file" name="delete-file"/>
+  </placeholder>
+  <separator/>
+  <placeholder name="2">
+    <menuitem action="browse-for-file" name="browse-for-file"/>
+  </placeholder>
+  <separator/>
+  <placeholder name="3"/>
+  <separator/>
+  <placeholder name="4"/>
+  <separator/>
 </popup>
 </ui>