[meld/ui-next] dirdiff: Migrate folder actions to GActions

From: Kai Willadsen <kaiw src gnome org>
To: commits-list gnome org
Cc:
Subject: [meld/ui-next] dirdiff: Migrate folder actions to GActions
Date: Sat, 23 Mar 2019 02:01:16 +0000 (UTC)
commit 00575521db171c2c3ca101247c8ce499d203c29d
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Feb 24 10:18:25 2019 +1000

    dirdiff: Migrate folder actions to GActions
    
    As with the vcview migration, this UI is very placeholder right now.
    
    Also, this commit removes the long-since-unused Hide action.

 data/ui/dirdiff-ui.xml       |  27 ---------
 meld/accelerators.py         |   4 ++
 meld/dirdiff.py              |  55 ++++++++---------
 meld/resources/ui/dirdiff.ui | 139 ++++++++++++++++++++++++++++---------------
 4 files changed, 121 insertions(+), 104 deletions(-)
---
diff --git a/data/ui/dirdiff-ui.xml b/data/ui/dirdiff-ui.xml
index 4800fbb8..c5a7e1e7 100644
--- a/data/ui/dirdiff-ui.xml
+++ b/data/ui/dirdiff-ui.xml
@@ -1,40 +1,13 @@
 <ui>
-  <menubar name="Menubar">
-    <menu action="ChangesMenu">
-      <placeholder name="ChangesActions">
-        <menuitem action="DirCopyLeft" />
-        <menuitem action="DirCopyRight" />
-        <menuitem action="DirDelete" />
-        <separator/>
-        <menuitem action="DirCompare" />
-      </placeholder>
-    </menu>
-
-  </menubar>
-
   <toolbar name="Toolbar">
-    <placeholder name="GeneralActions">
-      <toolitem action="DirCompare" />
-    </placeholder>
-    <placeholder name="SpecialActions">
-      <toolitem action="DirCopyLeft" />
-      <toolitem action="DirCopyRight" />
-      <toolitem action="DirDelete" />
-    </placeholder>
     <placeholder name="FilterActions">
       <toolitem action="CustomFilterMenu"/>
     </placeholder>
   </toolbar>
 
   <popup name="Popup">
-    <menuitem action="DirCompare" />
-    <separator/>
     <menuitem action="DirCollapseRecursively" />
     <menuitem action="DirExpandRecursively" />
-    <separator/>
-    <menuitem action="DirCopyLeft" />
-    <menuitem action="DirCopyRight" />
-    <menuitem action="DirDelete" />
   </popup>
 
   <popup name="CustomPopup">
diff --git a/meld/accelerators.py b/meld/accelerators.py
index ce06b0d1..62c01e21 100644
--- a/meld/accelerators.py
+++ b/meld/accelerators.py
@@ -4,6 +4,10 @@ from gi.repository import Gtk
 
 def register_accels(app: Gtk.Application):
     view_accels = (
+        ('view.folder-compare', 'Return'),
+        ('view.folder-copy-left', '<Alt>Left'),
+        ('view.folder-copy-right', '<Alt>Right'),
+        ('view.folder-delete', 'Delete'),
         ("view.next-change", ("<Alt>Down", "<Alt>KP_Down", "<Primary>D")),
         ("view.previous-change", ("<Alt>Up", "<Alt>KP_Up", "<Primary>E")),
         ('view.redo', '<Primary><Shift>Z'),
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 2c852327..eea08309 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -412,6 +412,10 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
 
         # Manually handle GAction additions
         actions = (
+            ('folder-compare', self.action_diff),
+            ('folder-copy-left', self.action_copy_left),
+            ('folder-copy-right', self.action_copy_right),
+            ('folder-delete', self.action_delete),
             ('next-change', self.action_next_change),
             ('open-external', self.action_open_external),
             ('previous-change', self.action_previous_change),
@@ -1152,6 +1156,7 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
                     break
 
             busy = self._scan_in_progress > 0
+            is_valid = is_valid and not busy
 
             is_single_foldable_row = False
             if (selection.count_selected_rows() == 1):
@@ -1161,24 +1166,27 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
                 is_single_foldable_row = self.model.is_folder(
                     it, pane, os_path)
 
-            get_action("DirCompare").set_sensitive(True)
             get_action("DirCollapseRecursively").set_sensitive(
                 is_single_foldable_row)
             get_action("DirExpandRecursively").set_sensitive(
                 is_single_foldable_row)
-            get_action("Hide").set_sensitive(True)
-            get_action("DirDelete").set_sensitive(
-                is_valid and not busy)
-            get_action("DirCopyLeft").set_sensitive(
-                is_valid and not busy and pane > 0)
-            get_action("DirCopyRight").set_sensitive(
-                is_valid and not busy and pane + 1 < self.num_panes)
-            self.set_action_enabled("open-external", is_valid)
+
+            self.set_action_enabled('folder-compare', True)
+            self.set_action_enabled('folder-delete', is_valid)
+            self.set_action_enabled('folder-copy-left', is_valid and pane > 0)
+            self.set_action_enabled(
+                'folder-copy-right', is_valid and pane + 1 < self.num_panes)
+            self.set_action_enabled('open-external', is_valid)
         else:
-            for action in ("DirCompare", "DirCopyLeft", "DirCopyRight",
-                           "DirDelete", "Hide"):
-                get_action(action).set_sensitive(False)
-            self.set_action_enabled("open-external", False)
+            actions = (
+                'folder-compare',
+                'folder-copy-left',
+                'folder-copy-right',
+                'folder-delete',
+                'open-external',
+            )
+            for action in actions:
+                self.set_action_enabled(action, False)
 
     @Template.Callback()
     def on_treeview_cursor_changed(self, view):
@@ -1313,8 +1321,7 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
                   for p in row_paths if os.path.exists(p)]
         self.create_diff_signal.emit(gfiles, {})
 
-    @Template.Callback()
-    def on_button_diff_clicked(self, button):
+    def action_diff(self, *args):
         pane = self._get_focused_pane()
         if pane is None:
             return
@@ -1354,16 +1361,13 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
         for path in paths:
             self.treeview[pane].expand_row(path, True)
 
-    @Template.Callback()
-    def on_button_copy_left_clicked(self, button):
+    def action_copy_left(self, *args):
         self.copy_selected(-1)
 
-    @Template.Callback()
-    def on_button_copy_right_clicked(self, button):
+    def action_copy_right(self, *args):
         self.copy_selected(1)
 
-    @Template.Callback()
-    def on_button_delete_clicked(self, button):
+    def action_delete(self, *args):
         self.delete_selected()
 
     def action_open_external(self, *args):
@@ -1403,15 +1407,6 @@ class DirDiff(Gtk.VBox, tree.TreeviewCommon, MeldDoc):
         self.name_filters[idx].active = button.get_active()
         self.refresh()
 
-    @Template.Callback()
-    def on_filter_hide_current_clicked(self, button):
-        pane = self._get_focused_pane()
-        if pane is not None:
-            paths = self._get_selected_paths(pane)
-            paths.reverse()
-            for p in paths:
-                self.model.remove(self.model.get_iter(p))
-
         #
         # Selection
         #
diff --git a/meld/resources/ui/dirdiff.ui b/meld/resources/ui/dirdiff.ui
index 4a0dedfe..6dff7aa1 100644
--- a/meld/resources/ui/dirdiff.ui
+++ b/meld/resources/ui/dirdiff.ui
@@ -3,16 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires meld.ui.gladesupport 0.0 -->
   <object class="GtkActionGroup" id="DirdiffActions">
-    <child>
-      <object class="GtkAction" id="DirCompare">
-        <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>
-      <accelerator key="Return"/>
-    </child>
     <child>
       <object class="GtkAction" id="DirCollapseRecursively">
         <property name="label" translatable="yes">Collapse Recursively</property>
@@ -31,43 +21,6 @@
         <signal name="activate" handler="on_expand_recursive_clicked" swapped="no"/>
       </object>
     </child>
-    <child>
-      <object class="GtkAction" id="DirCopyLeft">
-        <property name="label" translatable="yes">Copy to _Left</property>
-        <property name="tooltip" translatable="yes">Copy to left</property>
-        <property name="stock_id">gtk-go-back</property>
-        <property name="is_important">True</property>
-        <signal name="activate" handler="on_button_copy_left_clicked" swapped="no"/>
-      </object>
-      <accelerator key="Left" modifiers="GDK_MOD1_MASK"/>
-    </child>
-    <child>
-      <object class="GtkAction" id="DirCopyRight">
-        <property name="label" translatable="yes">Copy to _Right</property>
-        <property name="tooltip" translatable="yes">Copy to right</property>
-        <property name="stock_id">gtk-go-forward</property>
-        <property name="is_important">True</property>
-        <signal name="activate" handler="on_button_copy_right_clicked" swapped="no"/>
-      </object>
-      <accelerator key="Right" modifiers="GDK_MOD1_MASK"/>
-    </child>
-    <child>
-      <object class="GtkAction" id="DirDelete">
-        <property name="tooltip" translatable="yes">Delete selected</property>
-        <property name="stock_id">gtk-delete</property>
-        <property name="is_important">True</property>
-        <signal name="activate" handler="on_button_delete_clicked" swapped="no"/>
-      </object>
-      <accelerator key="Delete"/>
-    </child>
-    <child>
-      <object class="GtkAction" id="Hide">
-        <property name="label" translatable="yes">Hide</property>
-        <property name="tooltip" translatable="yes">Hide selected</property>
-        <property name="stock_id">gtk-no</property>
-        <signal name="activate" handler="on_filter_hide_current_clicked" swapped="no"/>
-      </object>
-    </child>
     <child>
       <object class="GtkToggleAction" id="CustomFilterMenu">
         <property name="label" translatable="yes">Filters</property>
@@ -80,6 +33,98 @@
   <template class="DirDiff" parent="GtkVBox">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <child>
+      <object class="GtkActionBar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">True</property>
+            <property name="action_name">view.folder-compare</property>
+            <!-- <property name="label" translatable="yes">Compare</property> -->
+            <property name="tooltip_text" translatable="yes">Compare selected files</property>
+            <property name="focus_on_click">False</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">document-new-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox">
+            <property name="visible">True</property>
+            <property name="orientation">horizontal</property>
+            <property name="homogeneous">True</property>
+            <style>
+              <class name="linked"/>
+            </style>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="action_name">view.folder-copy-left</property>
+                <!-- <property name="label" translatable="yes">Copy to Left</property> -->
+                <property name="tooltip_text" translatable="yes">Copy to left</property>
+                <property name="focus_on_click">False</property>
+                <style>
+                  <class name="image-button"/>
+                </style>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon-name">go-previous-symbolic</property>
+                    <property name="icon-size">1</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkButton">
+                <property name="visible">True</property>
+                <property name="action_name">view.folder-copy-right</property>
+                <!-- <property name="label" translatable="yes">Copy to Right</property> -->
+                <property name="tooltip_text" translatable="yes">Copy to right</property>
+                <property name="focus_on_click">False</property>
+                <child>
+                  <object class="GtkImage">
+                    <property name="visible">True</property>
+                    <property name="icon-name">go-next-symbolic</property>
+                    <property name="icon-size">1</property>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton">
+            <property name="visible">True</property>
+            <property name="action_name">view.folder-delete</property>
+            <!-- <property name="label" translatable="yes">Delete</property> -->
+            <property name="tooltip_text" translatable="yes">Delete selected</property>
+            <property name="focus_on_click">False</property>
+            <child>
+              <object class="GtkImage">
+                <property name="visible">True</property>
+                <property name="icon-name">user-trash-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="pack_type">start</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
     <child>
       <object class="GtkGrid" id="grid">
         <property name="visible">True</property>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]