meld r1141 - in trunk: . glade2

[kaiw svn gnome org]

Author: kaiw
Date: Sun Feb  1 08:44:42 2009
New Revision: 1141
URL: http://svn.gnome.org/viewvc/meld?rev=1141&view=rev

Log:
Add VC options to the view menu

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

Modified: trunk/glade2/meldapp-ui.xml
==============================================================================
--- trunk/glade2/meldapp-ui.xml	(original)
+++ trunk/glade2/meldapp-ui.xml	Sun Feb  1 08:44:42 2009
@@ -25,6 +25,9 @@
       <menuitem name="Preferences" action="Preferences"/>
     </menu>
     <menu action="ViewMenu">
+      <placeholder name="ViewPlaceholder" />
+      <menu action="VcStatus" />
+      <separator/>
       <menuitem action="Stop" />
       <menuitem action="Refresh" />
       <menuitem action="Reload" />

Modified: trunk/glade2/vcview-ui.xml
==============================================================================
--- trunk/glade2/vcview-ui.xml	(original)
+++ trunk/glade2/vcview-ui.xml	Sun Feb  1 08:44:42 2009
@@ -1,4 +1,18 @@
 <ui>
+  <menubar name="Menubar">
+    <menu action="ViewMenu">
+      <placeholder name="ViewPlaceholder">
+        <menuitem action="VcFlatten" />
+      </placeholder>
+      <menu action="VcStatus">
+        <menuitem action="VcShowModified" />
+        <menuitem action="VcShowNormal" />
+        <menuitem action="VcShowNonVC" />
+        <menuitem action="VcShowIgnored" />
+      </menu>
+    </menu>
+  </menubar>
+
   <toolbar name="Toolbar">
     <placeholder name="GeneralActions">
       <toolitem action="VcCompare" />

Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py	(original)
+++ trunk/meldapp.py	Sun Feb  1 08:44:42 2009
@@ -523,6 +523,7 @@
             ("Preferences", gtk.STOCK_PREFERENCES, _("Prefere_nces"), None, _("Configure the application"), self.on_menu_preferences_activate),
 
             ("ViewMenu", None, "_View"),
+            ("VcStatus",    None, "Version status"),
             ("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),