Changeset 1159:205b05b8ff8c

Timestamp:

05/17/08 23:56:47 (7 months ago)

Author:

Tobias Eberle <info@…>

Message:

filemanager: rewrite of file hidden check: checkers can now be en-/disabled by the user

Location:

pida

Files:

• core/actions.py (modified) (4 diffs)
• services/filemanager/filehiddencheck.py (added)
• services/filemanager/filemanager.py (modified) (13 diffs)
• services/filemanager/uidef/filemanager-toolbar.xml (modified) (1 diff)
• services/versioncontrol/versioncontrol.py (modified) (4 diffs)
• ui/dropdownmenutoolbutton.py (added)

pida/core/actions.py

@@ -2 +2 @@
 
 # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:
-#Copyright (c) 2005-2006 The PIDA Project
+#Copyright (c) 2005-2006,2008 The PIDA Project
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -34 +34 @@
 import warnings
 
+# kiwi imports
+from pida.ui.dropdownmenutoolbutton import DropDownMenuToolButton
+
 
 
@@ -47 +50 @@
         gtk.Action.__init__(self, *args, **kw)
         self.set_tool_item_type(gtk.MenuToolButton)
+
+class PidaDropDownMenuToolAction(gtk.Action):
+    """
+    Custom gtk.Action subclass for handling toolitems with a dropdown menu
+    attached.
+    """
+
+    __gtype_name__ = "PidaDropDownMenuToolAction"
+
+    def __init__(self, *args, **kw):
+        gtk.Action.__init__(self, *args, **kw)
+        self.set_tool_item_type(DropDownMenuToolButton)
+        self._set_arrow = ((kw['label'] == None) or (kw['label'] == '')) and \
+                          (kw['stock_id'] == None)
+
+    def create_tool_item(self):
+        toolitem = gtk.Action.create_tool_item(self)
+        if (self._set_arrow == True):
+            toolitem.set_arrow()
+        return toolitem
 
 
@@ -53 +76 @@
 TYPE_RADIO = gtk.RadioAction
 TYPE_MENUTOOL = PidaMenuToolAction
+TYPE_DROPDOWNMENUTOOL = PidaDropDownMenuToolAction
 
 

pida/services/filemanager/filemanager.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*- 
 
-# Copyright (c) 2007 The PIDA Project
+# Copyright (c) 2007-2008 The PIDA Project
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -40 +40 @@
 from pida.core.events import EventsConfig
 from pida.core.actions import ActionsConfig
-from pida.core.actions import TYPE_NORMAL, TYPE_MENUTOOL, TYPE_RADIO, TYPE_TOGGLE
-from pida.core.options import OptionsConfig, OTypeBoolean, OTypeString
+from pida.core.actions import TYPE_NORMAL, TYPE_MENUTOOL, TYPE_DROPDOWNMENUTOOL, TYPE_RADIO, TYPE_TOGGLE
+from pida.core.options import OptionsConfig, OTypeBoolean, OTypeString, OTypeStringList
 from pida.core.environment import get_uidef_path
 
@@ -48 +48 @@
 from pida.ui.views import PidaView
 from pida.ui.objectlist import AttrSortCombo
+from pida.ui.dropdownmenutoolbutton import DropDownMenuToolButton
 from kiwi.ui.objectlist import Column, ColoredColumn, ObjectList
+
+from filehiddencheck import *
+
 
 # locale
@@ -150 +154 @@
         self._vbox.show()
         self.create_toolbar()
+        self._file_hidden_check_actions = {}
+        self._create_file_hidden_check_toolbar()
         self.create_file_list()
         self._clipboard_file = None
@@ -204 +210 @@
         from operator import and_
         def check(checker):
-            return checker(
-                    name=entry.name, 
-                    path=entry.parent_path,
-                    state=entry.state,
-                    )
+            check = checker(self.svc.boss)
+            if (check.identifier in self._file_hidden_check_actions) and \
+               (self._file_hidden_check_actions[check.identifier].get_active()):
+                return check(name=entry.name, path=entry.parent_path,
+                    state=entry.state, )
+            else:
+                return True
 
         if self.svc.opt('show_hidden'):
@@ -334 +342 @@
         return ancs
 
+    def _on_act_file_hidden_check(self, action, check):
+        if (check.scope == SCOPE_GLOBAL):
+            # global
+            active_checker = self.svc.opt('file_hidden_check')
+            if (action.get_active()):
+                active_checker.append(check.identifier)
+            else:
+                active_checker.remove(check.identifier)
+            self.svc.set_opt('file_hidden_check', active_checker)
+        else:
+            # project
+            if (self.svc.current_project is not None):
+                section = self.svc.current_project.get_section('file_hidden_check')
+                if (section is None):
+                    section = {}
+                section[check.identifier] = action.get_active()
+                self.svc.current_project.save_section('file_hidden_check',
+                  section)
+        self.update_to_path()
+    
+    def __file_hidden_check_scope_project_set_active(self, action):
+        """sets active state of a file hidden check action with
+           scope = project
+           relies on action name = identifier of checker"""
+        if (self.svc.current_project is not None):
+            section = self.svc.current_project.get_section('file_hidden_check')
+            action.set_active(
+              (section is not None) and
+              (action.get_name() in section) and
+              (section[action.get_name()] == 'True'))
+        else:
+            action.set_active(False)
+        
+    
+    def refresh_file_hidden_check(self):
+        """refreshes active status of actions of project scope checker"""
+        for checker in self.svc.features('file_hidden_check'):
+            check = checker(self.svc.boss)
+            if (check.scope == SCOPE_PROJECT):
+                action = self._file_hidden_check_actions[check.identifier]
+                self.__file_hidden_check_scope_project_set_active(action)
+    
+    def _create_file_hidden_check_toolbar(self):
+        self._file_hidden_check_actions = {}
+        menu = gtk.Menu()
+        separator = gtk.SeparatorMenuItem()
+        project_scope_count = 0
+        menu.append(separator)
+        for checker in self.svc.features('file_hidden_check'):
+            check = checker(self.svc.boss)
+            action = gtk.ToggleAction(check.identifier, check.label,
+              check.label, None)
+            # active?
+            if (check.scope == SCOPE_GLOBAL):
+                action.set_active(
+                    check.identifier in self.svc.opt('file_hidden_check'))
+            else:
+                self.__file_hidden_check_scope_project_set_active(action)
+
+            action.connect('activate', self._on_act_file_hidden_check, check)
+            self._file_hidden_check_actions[check.identifier] = action
+            menuitem = action.create_menu_item()
+            if (check.scope == SCOPE_GLOBAL):
+                menu.prepend(menuitem)
+            else:
+                menu.append(menuitem)
+                project_scope_count += 1
+        menu.show_all()
+        if (project_scope_count == 0):
+            separator.hide()
+        toolitem = None
+        for proxy in self.svc.get_action('toolbar_hidden_menu').get_proxies():
+            if (isinstance(proxy, DropDownMenuToolButton)):
+                toolitem = proxy
+                break
+        if (toolitem is not None):
+            toolitem.set_menu(menu)
+
     def get_selected_filename(self):
         fileentry = self.file_list.get_selected()
@@ -383 +469 @@
             self._fix_paste_sensitivity()
 
+class DotFilesFileHiddenCheck(FileHiddenCheck):
+    _identifier = "DotFiles"
+    _label = "Hide Dot-Files"
+    _scope = SCOPE_GLOBAL
+    
+    def __call__(self, name, path, state):
+        return name[0] != '.'
+
+class RegExFileHiddenCheck(FileHiddenCheck):
+    _identifier = "RegEx"
+    _label = "Hide by User defined Regular Expression"
+    _scope = SCOPE_GLOBAL
+    
+    def __call__(self, name, path, state):
+        _re = self.boss.get_service('filemanager').opt('hide_regex')
+        if not re:
+            return True
+        else:
+            return re.match(_re, name) is None
 
 class FilemanagerEvents(EventsConfig):
@@ -394 +499 @@
         self.subscribe_foreign_event('project', 'project_switched',
                                      self.svc.on_project_switched)
+        self.subscribe_foreign_event('plugins', 'plugin_started',
+            self.on_plugin_started)
+        self.subscribe_foreign_event('plugins', 'plugin_stopped',
+            self.on_plugin_stopped);
+
+    def on_plugin_started(self, plugin):
+        if (plugin.has_foreign_feature('filemanager', 'file_hidden_check')):
+            self.svc.refresh_file_hidden_check_menu()
+    
+    def on_plugin_stopped(self, plugin):
+        self.svc.refresh_file_hidden_check_menu()
 
 
@@ -429 +545 @@
 
     def subscribe_foreign_features(self):
-        self.subscribe_feature('file_hidden_check', self.svc.check_hidden_regex)
+        self.subscribe_feature('file_hidden_check', DotFilesFileHiddenCheck)
+        self.subscribe_feature('file_hidden_check', RegExFileHiddenCheck)
 
         self.subscribe_foreign_feature('contexts', 'file-menu',
@@ -446 +563 @@
                 True,
                 _('Shows hidden files'))
+        self.create_option(
+                'file_hidden_check',
+                _('Used file hidden checker'),
+                OTypeStringList,
+                [],
+                _('The used file hidden checker'))
         
         self.create_option(
@@ -566 +689 @@
             TYPE_TOGGLE,
             _('Show Hidden Files'),
-            _('Toggle the display of hidden files'),
+            _('Show hidden files'),
             gtk.STOCK_SELECT_ALL,
             self.on_toggle_hidden,
         )
+        self.create_action(
+            'toolbar_hidden_menu',
+            TYPE_DROPDOWNMENUTOOL,
+            '',
+            _('Setup which kind of files should be hidden'),
+            None,
+            None,
+        )
+
 
     def on_browse_for_file(self, action):
@@ -590 +722 @@
         self.svc.boss.cmd('commander','execute_shell', cwd=self.svc.path)
 
+    def _on_menu_down(self, menu, action):
+        action.set_active(False)
+        print "down"
+    
     def on_toggle_hidden(self, action):
         self.svc.set_opt('show_hidden', action.get_active())
@@ -661 +797 @@
         self.browse(dir)
 
-    def check_hidden_regex(self, name, path, state):
-        _re = self.opt('hide_regex')
-        if not re:
-            return True
-        else:
-            return re.match(_re, name) is None
-
     def rename_file(self, old, new, basepath):
         pass
 
+    def refresh_file_hidden_check_menu(self):
+        self.get_view()._create_file_hidden_check_toolbar()
+    
     def on_project_switched(self, project):
         self.current_project = project
         self.get_action('toolbar_projectroot').set_sensitive(project is not None)
+        self.get_view().refresh_file_hidden_check()
 
 

pida/services/filemanager/uidef/filemanager-toolbar.xml

@@ -6 +6 @@
         <toolitem action="toolbar_refresh" name="toolbar_refresh"/>
         <toolitem action="toolbar_terminal" name="toolbar_terminal"/>
-        <toolitem action="toolbar_toggle_hidden" name="toggle_hidden"/>
+        <toolitem action="toolbar_toggle_hidden" name="toolbar_toggle_hidden"/>
+        <toolitem action="toolbar_hidden_menu" name="toolbar_hidden_menu"/>
         <separator />
         <toolitem action="toolbar_delete" name="toolbar_delete"/>

pida/services/versioncontrol/versioncontrol.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*- 
 
-# Copyright (c) 2007 The PIDA Project
+# Copyright (c) 2007-2008 The PIDA Project
 
 #Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -42 +42 @@
 
 from pida.utils.gthreads import AsyncTask, gcall
+
+from pida.services.filemanager.filehiddencheck import FileHiddenCheck, SCOPE_GLOBAL
 
 # locale
@@ -216 +218 @@
         self.svc.get_action('show_commit').set_active(False)
 
+class VersionControlFileHiddenCheck(FileHiddenCheck):
+    _identifier = "VersionControl"
+    _label = "Hide Ignored Files by Version Control"
+    _scope = SCOPE_GLOBAL
+    
+    def __call__(self, name, path, state):
+        return not (state == "hidden" or state == "ignored")
 
 class VersioncontrolFeaturesConfig(FeaturesConfig):
@@ -228 +237 @@
             self.subscribe_feature("workdir-manager", mgr)
 
-        self.subscribe_foreign_feature(
-                "filemanager", "file_hidden_check",
-                self.svc.ignored_file_checker
-                )
+        #self.subscribe_foreign_feature(
+        #        "filemanager", "file_hidden_check",
+        #        self.svc.ignored_file_checker
+        #        )
+        self.subscribe_foreign_feature('filemanager', 'file_hidden_check',
+            VersionControlFileHiddenCheck)
         self.subscribe_foreign_feature('contexts', 'file-menu',
             (self.svc.get_action_group(), 'versioncontrol-file-menu.xml'))