From 66f4020e3791de94ebbb88132d70601905e2b0dc Mon Sep 17 00:00:00 2001 From: Joe Peled Date: Sat, 17 Oct 2020 17:51:19 -0400 Subject: [PATCH 1/2] Preserve case sensitivity state in config file on state change --- terminatorlib/config.py | 1 + terminatorlib/searchbar.py | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/terminatorlib/config.py b/terminatorlib/config.py index 8083791a..f9dc5620 100644 --- a/terminatorlib/config.py +++ b/terminatorlib/config.py @@ -122,6 +122,7 @@ DEFAULTS = { 'putty_paste_style_source_clipboard': False, 'smart_copy' : True, 'line_height' : 1.0, + 'case_sensitive' : True, }, 'keybindings': { 'zoom_in' : 'plus', diff --git a/terminatorlib/searchbar.py b/terminatorlib/searchbar.py index 35c64dc1..dcbf3351 100644 --- a/terminatorlib/searchbar.py +++ b/terminatorlib/searchbar.py @@ -84,8 +84,12 @@ class Searchbar(Gtk.HBox): # Match Case checkbox self.match_case = Gtk.CheckButton.new_with_label('Match Case') self.match_case.show() + if self.config.base.get_item('case_sensitive') is True: + case_sensitive = True + else: + case_sensitive = False self.match_case.set_sensitive(True) - self.match_case.set_active(True) + self.match_case.set_active(case_sensitive) self.match_case.connect('toggled', self.match_case_toggled) # Wrap checkbox @@ -132,6 +136,8 @@ class Searchbar(Gtk.HBox): self.regex_flags_pcre2 = regex.FLAGS_PCRE2 self.regex_flags_glib = regex.FLAGS_GLIB + self.config.base.set_item('case_sensitive', toggled_state) + self.config.save() self.do_search(self.entry) # Start a new search everytime the check box is toggled. def get_vte(self): From 19e1cf755cff50d8efa295337663103c887d0121 Mon Sep 17 00:00:00 2001 From: Joe Peled Date: Sat, 17 Oct 2020 22:04:00 -0400 Subject: [PATCH 2/2] Simplify parsing config value --- terminatorlib/searchbar.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/terminatorlib/searchbar.py b/terminatorlib/searchbar.py index dcbf3351..e6095ab1 100644 --- a/terminatorlib/searchbar.py +++ b/terminatorlib/searchbar.py @@ -84,12 +84,8 @@ class Searchbar(Gtk.HBox): # Match Case checkbox self.match_case = Gtk.CheckButton.new_with_label('Match Case') self.match_case.show() - if self.config.base.get_item('case_sensitive') is True: - case_sensitive = True - else: - case_sensitive = False self.match_case.set_sensitive(True) - self.match_case.set_active(case_sensitive) + self.match_case.set_active(self.config.base.get_item('case_sensitive')) self.match_case.connect('toggled', self.match_case_toggled) # Wrap checkbox