meld r1143 - in trunk: . glade2

[kaiw svn gnome org]

Author: kaiw
Date: Sun Feb  1 09:02:37 2009
New Revision: 1143
URL: http://svn.gnome.org/viewvc/meld?rev=1143&view=rev

Log:
Add file filters to View menu

Modified:
   trunk/dirdiff.py
   trunk/glade2/meldapp-ui.xml
   trunk/meldapp.py

Modified: trunk/dirdiff.py
==============================================================================
--- trunk/dirdiff.py	(original)
+++ trunk/dirdiff.py	Sun Feb  1 09:02:37 2009
@@ -295,8 +295,9 @@
         for i,f in enumerate(self.name_filters_available):
             name = "Hide%d" % i
             callback = lambda b, i=i: self._update_name_filter(b, i)
-            actions.append((name, gtk.STOCK_FIND, f.label, None, _("Hide %s") % f.label, callback, f.active))
+            actions.append((name, gtk.STOCK_FIND, f.label, "", _("Hide %s") % f.label, callback, f.active))
             self.filter_ui.append(["/Toolbar/FilterActions/FilterButtons" , name, name, gtk.UI_MANAGER_TOOLITEM, False])
+            self.filter_ui.append(["/Menubar/ViewMenu/FileFilters" , name, name, gtk.UI_MANAGER_MENUITEM, False])
 
         self.filter_actiongroup = gtk.ActionGroup("DirdiffFilterActions")
         self.filter_actiongroup.add_toggle_actions(actions)

Modified: trunk/glade2/meldapp-ui.xml
==============================================================================
--- trunk/glade2/meldapp-ui.xml	(original)
+++ trunk/glade2/meldapp-ui.xml	Sun Feb  1 09:02:37 2009
@@ -28,6 +28,7 @@
       <placeholder name="ViewPlaceholder" />
       <menu action="FileStatus" />
       <menu action="VcStatus" />
+      <menu action="FileFilters" />
       <separator/>
       <menuitem action="Stop" />
       <menuitem action="Refresh" />

Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py	(original)
+++ trunk/meldapp.py	Sun Feb  1 09:02:37 2009
@@ -525,6 +525,7 @@
             ("ViewMenu", None, "_View"),
             ("FileStatus",  None, "File status"),
             ("VcStatus",    None, "Version status"),
+            ("FileFilters",  None, "File filters"),
             ("Stop",    gtk.STOCK_STOP,     None, "Escape", _("Stop the current action"), self.on_toolbar_stop_clicked),
             ("Refresh", gtk.STOCK_REFRESH,  None, "<control>R", _("Refresh the view"), self.on_menu_refresh_activate),
             ("Reload",  gtk.STOCK_REFRESH,  _("Reload"), "<control><shift>R", _("Reload the comparison"), self.on_menu_reload_activate),