[meld] vcview: Move actions into UI file

[Kai Willadsen <kaiw src gnome org>]

commit db26ad00c545021a9d54b802bba0055719bab911
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jun 16 09:39:25 2013 +1000

    vcview: Move actions into UI file

 data/ui/vcview.ui |  127 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 meld/vcview.py    |   62 +-------------------------
 2 files changed, 129 insertions(+), 60 deletions(-)
---
diff --git a/data/ui/vcview.ui b/data/ui/vcview.ui
index d1408f1..5f8c2b7 100644
--- a/data/ui/vcview.ui
+++ b/data/ui/vcview.ui
@@ -1,6 +1,133 @@
 <?xml version="1.0"?>
 <!--*- mode: xml -*-->
 <interface>
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkActionGroup" id="VcviewActions">
+    <child>
+      <object class="GtkAction" id="VcCompare">
+        <property name="label" translatable="yes">_Compare</property>
+        <property name="tooltip" translatable="yes">Compare selected files</property>
+        <property name="stock_id">gtk-dialog-info</property>
+        <property name="is_important">True</property>
+        <signal name="activate" handler="on_button_diff_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcCommit">
+        <property name="label" translatable="yes">Co_mmit...</property>
+        <property name="tooltip" translatable="yes">Commit changes to version control</property>
+        <property name="icon_name">vc-commit-24</property>
+        <signal name="activate" handler="on_button_commit_clicked" swapped="no"/>
+      </object>
+      <accelerator key="M" modifiers="GDK_CONTROL_MASK"/>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcUpdate">
+        <property name="label" translatable="yes">_Update</property>
+        <property name="tooltip" translatable="yes">Update working copy from version control</property>
+        <property name="icon_name">vc-update-24</property>
+        <signal name="activate" handler="on_button_update_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcPush">
+        <property name="label" translatable="yes">_Push</property>
+        <property name="tooltip" translatable="yes">Push local changes to remote</property>
+        <property name="icon_name">vc-push-24</property>
+        <signal name="activate" handler="on_button_push_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcAdd">
+        <property name="label" translatable="yes">_Add</property>
+        <property name="tooltip" translatable="yes">Add to version control</property>
+        <property name="icon_name">vc-add-24</property>
+        <signal name="activate" handler="on_button_add_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcRemove">
+        <property name="label" translatable="yes">_Remove</property>
+        <property name="tooltip" translatable="yes">Remove from version control</property>
+        <property name="icon_name">vc-remove-24</property>
+        <signal name="activate" handler="on_button_remove_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcResolved">
+        <property name="label" translatable="yes">Mar_k as Resolved</property>
+        <property name="tooltip" translatable="yes">Mark as resolved in version control</property>
+        <property name="icon_name">vc-resolve-24</property>
+        <signal name="activate" handler="on_button_resolved_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcRevert">
+        <property name="label" translatable="yes">Re_vert</property>
+        <property name="tooltip" translatable="yes">Revert working copy to original state</property>
+        <property name="stock_id">gtk-revert-to-saved</property>
+        <signal name="activate" handler="on_button_revert_clicked" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkAction" id="VcDeleteLocally">
+        <property name="tooltip" translatable="yes">Delete from working copy</property>
+        <property name="stock_id">gtk-delete</property>
+        <signal name="activate" handler="on_button_delete_clicked" swapped="no"/>
+      </object>
+    </child>
+
+    <child>
+      <object class="GtkToggleAction" id="VcFlatten">
+        <property name="label" translatable="yes">_Flatten</property>
+        <property name="tooltip" translatable="yes">Flatten directories</property>
+        <property name="stock_id">gtk-goto-bottom</property>
+        <property name="is_important">True</property>
+        <property name="active">False</property>
+        <signal name="toggled" handler="on_button_flatten_toggled" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="VcShowModified">
+        <property name="label" translatable="yes">_Modified</property>
+        <property name="tooltip" translatable="yes">Show modified files</property>
+        <property name="icon_name">filter-modified-24</property>
+        <property name="is_important">True</property>
+        <property name="active">False</property>
+        <signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="VcShowNormal">
+        <property name="label" translatable="yes">_Normal</property>
+        <property name="tooltip" translatable="yes">Show normal files</property>
+        <property name="icon_name">filter-normal-24</property>
+        <property name="is_important">True</property>
+        <property name="active">False</property>
+        <signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="VcShowNonVC">
+        <property name="label" translatable="yes">Un_versioned</property>
+        <property name="tooltip" translatable="yes">Show unversioned files</property>
+        <property name="icon_name">filter-nonvc-24</property>
+        <property name="is_important">True</property>
+        <property name="active">False</property>
+        <signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkToggleAction" id="VcShowIgnored">
+        <property name="label" translatable="yes">Ignored</property>
+        <property name="tooltip" translatable="yes">Show ignored files</property>
+        <property name="icon_name">filter-ignored-24</property>
+        <property name="is_important">True</property>
+        <property name="active">False</property>
+        <signal name="toggled" handler="on_filter_state_toggled" swapped="no"/>
+      </object>
+    </child>
+  </object>
   <object class="GtkWindow" id="container">
     <property name="visible">True</property>
     <property name="title" translatable="yes">window1</property>
diff --git a/meld/vcview.py b/meld/vcview.py
index 2f46007..84ccc2c 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -155,69 +155,11 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
     def __init__(self, prefs):
         melddoc.MeldDoc.__init__(self, prefs)
         gnomeglade.Component.__init__(self, paths.ui_dir("vcview.ui"),
-                                      "vcview", ['liststore_vcs'])
-
-        actions = (
-            ("VcCompare", gtk.STOCK_DIALOG_INFO, _("_Compare"), None,
-                _("Compare selected files"),
-                self.on_button_diff_clicked),
-            ("VcCommit", "vc-commit-24", _("Co_mmit..."), "<Ctrl>M",
-                _("Commit changes to version control"),
-                self.on_button_commit_clicked),
-            ("VcUpdate", "vc-update-24", _("_Update"), None,
-                _("Update working copy from version control"),
-                self.on_button_update_clicked),
-            ("VcPush", "vc-push-24", _("_Push"), None,
-                _("Push local changes to remote"),
-                self.on_button_push_clicked),
-            ("VcAdd", "vc-add-24", _("_Add"), None,
-                _("Add to version control"),
-                self.on_button_add_clicked),
-            ("VcRemove", "vc-remove-24", _("_Remove"), None,
-                _("Remove from version control"),
-                self.on_button_remove_clicked),
-            ("VcResolved", "vc-resolve-24", _("Mar_k as Resolved"), None,
-                _("Mark as resolved in version control"),
-                self.on_button_resolved_clicked),
-            ("VcRevert", gtk.STOCK_REVERT_TO_SAVED, _("Re_vert"), None,
-                _("Revert working copy to original state"),
-                self.on_button_revert_clicked),
-            ("VcDeleteLocally", gtk.STOCK_DELETE, None, None,
-                _("Delete from working copy"),
-                self.on_button_delete_clicked),
-        )
-
-        toggleactions = (
-            ("VcFlatten", gtk.STOCK_GOTO_BOTTOM, _("_Flatten"),  None,
-                _("Flatten directories"),
-                self.on_button_flatten_toggled, False),
-            ("VcShowModified", "filter-modified-24", _("_Modified"), None,
-                _("Show modified files"),
-                self.on_filter_state_toggled, False),
-            ("VcShowNormal", "filter-normal-24", _("_Normal"), None,
-                _("Show normal files"),
-                self.on_filter_state_toggled, False),
-            ("VcShowNonVC", "filter-nonvc-24", _("Un_versioned"), None,
-                _("Show unversioned files"),
-                self.on_filter_state_toggled, False),
-            ("VcShowIgnored", "filter-ignored-24", _("Ignored"), None,
-                _("Show ignored files"),
-                self.on_filter_state_toggled, False),
-        )
+                                      "vcview", ["VcviewActions", 'liststore_vcs'])
 
         self.ui_file = paths.ui_dir("vcview-ui.xml")
-        self.actiongroup = gtk.ActionGroup('VcviewActions')
+        self.actiongroup = self.VcviewActions
         self.actiongroup.set_translation_domain("meld")
-        self.actiongroup.add_actions(actions)
-        self.actiongroup.add_toggle_actions(toggleactions)
-        for action in ("VcCompare", "VcFlatten", "VcShowModified",
-                       "VcShowNormal", "VcShowNonVC", "VcShowIgnored"):
-            self.actiongroup.get_action(action).props.is_important = True
-        for action in ("VcCommit", "VcUpdate", "VcPush", "VcAdd", "VcRemove",
-                       "VcShowModified", "VcShowNormal", "VcShowNonVC",
-                       "VcShowIgnored", "VcResolved"):
-            button = self.actiongroup.get_action(action)
-            button.props.icon_name = button.props.stock_id
         self.model = VcTreeStore()
         self.widget.connect("style-set", self.model.on_style_set)
         self.treeview.set_model(self.model)