Move find and replace to GActions

Author: kaiw

data/ui/meldapp-ui.xml

@@ -1,9 +1,5 @@
 <ui>
   <menubar name="Menubar">
-    <menu action="EditMenu">
-      <menuitem action="Find"/>
-      <menuitem action="Replace"/>
-    </menu>
     <menu action="ChangesMenu">
       <placeholder name="ChangesActions" />
     </menu>

meld/accelerators.py

@@ -4,8 +4,10 @@
 
 def register_accels(app: Gtk.Application):
     view_accels = (
+        ('view.find', '<Primary>F'),
         ('view.find-next', '<Primary>G'),
         ('view.find-previous', '<Primary><Shift>G'),
+        ('view.find-replace', '<Primary>H'),
         ('view.folder-compare', 'Return'),
         ('view.folder-copy-left', '<Alt>Left'),
         ('view.folder-copy-right', '<Alt>Right'),

meld/dirdiff.py

@@ -408,6 +408,7 @@ def __init__(self, num_panes):
 
         # Manually handle GAction additions
         actions = (
+            ('find', self.action_find),
             ('folder-collapse', self.action_folder_collapse),
             ('folder-compare', self.action_diff),
             ('folder-copy-left', self.action_copy_left),
@@ -1662,7 +1663,7 @@ def action_previous_change(self, *args):
     def action_next_change(self, *args):
         self.next_diff(Gdk.ScrollDirection.DOWN)
 
-    def action_refresh(self, *extra):
+    def action_refresh(self, *args):
         self.on_fileentry_file_set(None)
 
     def on_delete_event(self):
@@ -1671,7 +1672,7 @@ def on_delete_event(self):
         self.close_signal.emit(0)
         return Gtk.ResponseType.OK
 
-    def on_find_activate(self, *extra):
+    def action_find(self, *args):
         self.focus_pane.emit("start-interactive-search")
 
     def auto_compare(self):

meld/filediff.py

@@ -291,8 +291,10 @@ def __init__(self, num_panes):
         actions = (
             ('add-sync-point', self.add_sync_point),
             ('clear-sync-point', self.clear_sync_points),
+            ('find', self.action_find),
             ('find-next', self.action_find_next),
             ('find-previous', self.action_find_previous),
+            ('find-replace', self.action_find_replace),
             ('format-as-patch', self.action_format_as_patch),
             ('go-to-line', self.action_go_to_line),
             ('merge-all-left', self.action_pull_all_changes_left),
@@ -1157,12 +1159,12 @@ def get_selected_text(self, pane):
         if sel:
             return buf.get_text(sel[0], sel[1], False)
 
-    def on_find_activate(self, *args):
+    def action_find(self, *args):
         selected_text = self.get_selected_text()
         self.findbar.start_find(
             textview=self.focus_pane, replace=False, text=selected_text)
 
-    def on_replace_activate(self, *args):
+    def action_find_replace(self, *args):
         selected_text = self.get_selected_text()
         self.findbar.start_find(
             textview=self.focus_pane, replace=True, text=selected_text)

meld/melddoc.py

@@ -168,12 +168,6 @@ def open_cb(source, result, *data):
             f.query_info_async(query_attrs, 0, GLib.PRIORITY_LOW, None,
                                open_cb, None)
 
-    def on_find_activate(self, *extra):
-        pass
-
-    def on_replace_activate(self, *extra):
-        pass
-
     def on_file_changed(self, filename):
         pass
 

meld/meldwindow.py

@@ -60,14 +60,6 @@ def __init__(self):
         self.init_template()
 
         actions = (
-            ("EditMenu", None, _("_Edit")),
-            ("Find", Gtk.STOCK_FIND, _("Find…"), None, _("Search for text"),
-                self.on_menu_find_activate),
-            ("Replace", Gtk.STOCK_FIND_AND_REPLACE,
-                _("_Replace…"), "<Primary>H",
-                _("Find and replace text"),
-                self.on_menu_replace_activate),
-
             ("ChangesMenu", None, _("_Changes")),
         )
         self.actiongroup = Gtk.ActionGroup(name='MainActions')
@@ -224,17 +216,6 @@ def _update_page_action_sensitivity(self):
             page = None
 
         self.lookup_action('close').set_enabled(bool(page))
-        if not isinstance(page, MeldDoc):
-            for action in (
-                           "Find", "Replace",
-                           ):
-                self.actiongroup.get_action(action).set_sensitive(False)
-        else:
-            for action in ("Find",):
-                self.actiongroup.get_action(action).set_sensitive(True)
-            is_filediff = isinstance(page, FileDiff)
-            for action in ("Replace",):
-                self.actiongroup.get_action(action).set_sensitive(is_filediff)
 
     def handle_current_doc_switch(self, page):
         page.on_container_switch_out_event(self.ui, self)
@@ -280,12 +261,6 @@ def action_close(self, *extra):
             page = self.notebook.get_nth_page(i)
             page.on_delete_event()
 
-    def on_menu_find_activate(self, *extra):
-        self.current_doc().on_find_activate()
-
-    def on_menu_replace_activate(self, *extra):
-        self.current_doc().on_replace_activate()
-
     def on_action_fullscreen_change_state(self, action, state):
         window_state = self.get_window().get_state()
         is_full = window_state & Gdk.WindowState.FULLSCREEN

meld/resources/gtk/menus.ui

@@ -39,6 +39,17 @@
         <attribute name="action">view.revert</attribute>
       </item>
     </section>
+    <section>
+      <attribute name="id">find-section</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_Find…</attribute>
+        <attribute name="action">view.find</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Replace…</attribute>
+        <attribute name="action">view.find-replace</attribute>
+      </item>
+    </section>
     <section>
       <submenu>
         <attribute name="label" translatable="yes">View</attribute>

meld/vcview.py

@@ -201,6 +201,7 @@ def __init__(self):
         # Manually handle GAction additions
         actions = (
             ('compare', self.action_diff),
+            ('find', self.action_find),
             ('next-change', self.action_next_change),
             ('open-external', self.action_open_external),
             ('previous-change', self.action_previous_change),
@@ -896,10 +897,10 @@ def action_previous_change(self, *args):
     def action_next_change(self, *args):
         self.next_diff(Gdk.ScrollDirection.DOWN)
 
-    def action_refresh(self, *extra):
+    def action_refresh(self, *args):
         self.on_fileentry_file_set(self.fileentry)
 
-    def on_find_activate(self, *extra):
+    def action_find(self, *args):
         self.treeview.emit("start-interactive-search")
 
     def auto_compare(self):