[meld/ui-next] ui.findbar: Get rid of code duplication between replace + find
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/ui-next] ui.findbar: Get rid of code duplication between replace + find
- Date: Tue, 12 Mar 2019 20:27:13 +0000 (UTC)
commit 93f95dcc736e03e0dc0f9e85843c84a59ea08fe5
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon Mar 11 06:37:24 2019 +1000
ui.findbar: Get rid of code duplication between replace + find
meld/filediff.py | 6 ++++--
meld/ui/findbar.py | 13 ++-----------
2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 25dc1ac0..8589e21c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -1128,12 +1128,14 @@ class FileDiff(Gtk.VBox, MeldDoc):
def on_find_activate(self, *args):
selected_text = self.get_selected_text()
- self.findbar.start_find(self.focus_pane, selected_text)
+ self.findbar.start_find(
+ textview=self.focus_pane, replace=False, text=selected_text)
self.keymask = 0
def on_replace_activate(self, *args):
selected_text = self.get_selected_text()
- self.findbar.start_replace(self.focus_pane, selected_text)
+ self.findbar.start_find(
+ textview=self.focus_pane, replace=True, text=selected_text)
self.keymask = 0
def on_find_next_activate(self, *args):
diff --git a/meld/ui/findbar.py b/meld/ui/findbar.py
index 729cfec1..fda5741a 100644
--- a/meld/ui/findbar.py
+++ b/meld/ui/findbar.py
@@ -82,8 +82,8 @@ class FindBar(Gtk.Grid):
else:
self.search_context = None
- def start_find(self, textview, text=None):
- self.replace_mode = False
+ def start_find(self, *, textview: Gtk.TextView, replace: bool, text: str):
+ self.replace_mode = replace
self.set_text_view(textview)
self.find_entry.get_style_context().remove_class("not-found")
if text:
@@ -99,15 +99,6 @@ class FindBar(Gtk.Grid):
self.set_text_view(textview)
self._find_text(backwards=True)
- def start_replace(self, textview, text=None):
- self.replace_mode = True
- self.set_text_view(textview)
- self.find_entry.get_style_context().remove_class("not-found")
- if text:
- self.find_entry.set_text(text)
- self.show()
- self.find_entry.grab_focus()
-
@Template.Callback()
def on_find_next_button_clicked(self, button):
self._find_text()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]