Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove InteractiveSearchBox entirely #1769

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions gramps/gui/selectors/baseselector.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
from ..managedwindow import ManagedWindow
from ..filters import SearchBar
from ..glade import Glade
from ..widgets.interactivesearchbox import InteractiveSearchBox
from ..display import display_help
from gramps.gen.const import URL_MANUAL_PAGE
from gramps.gui.widgets.persistenttreeview import PersistentTreeView
Expand Down Expand Up @@ -107,10 +106,6 @@ def __init__(
self.glade.get_object("help"), self.WIKI_HELP_PAGE, self.WIKI_HELP_SEC
)

# connect to signal for custom interactive-search
self.searchbox = InteractiveSearchBox(self.tree)
self.tree.connect("key-press-event", self.searchbox.treeview_keypress)

# add the search bar
self.search_bar = SearchBar(
dbstate, uistate, self.build_tree, apply_clear=self.apply_clear
Expand Down
8 changes: 0 additions & 8 deletions gramps/gui/views/listview.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
from ..ddtargets import DdTargets
from ..plug.quick import create_quickreport_menu, create_web_connect_menu
from ..utils import is_right_click
from ..widgets.interactivesearchbox import InteractiveSearchBox
from ..widgets.persistenttreeview import PersistentTreeView

# ----------------------------------------------------------------
Expand Down Expand Up @@ -175,7 +174,6 @@ def build_widget(self):
self.list.connect("button-press-event", self._button_press)
self.list.connect("key-press-event", self._key_press)
self.list.connect("start-interactive-search", self.open_all_nodes)
self.searchbox = InteractiveSearchBox(self.list)

if self.drag_info():
self.list.connect("drag_data_get", self.drag_data_get)
Expand Down Expand Up @@ -1115,9 +1113,6 @@ def _key_press_flat(self, obj, event):
if event.keyval in (Gdk.KEY_Return, Gdk.KEY_KP_Enter):
self.edit(obj)
return True
# Custom interactive search
if Gdk.keyval_to_unicode(event.keyval):
return self.searchbox.treeview_keypress(obj, event)
return False

def _key_press_tree(self, obj, event):
Expand Down Expand Up @@ -1146,9 +1141,6 @@ def _key_press_tree(self, obj, event):
else:
self.edit(obj)
return True
elif Gdk.keyval_to_unicode(event.keyval):
# Custom interactive search
return self.searchbox.treeview_keypress(obj, event)
return False

def expand_collapse_tree(self):
Expand Down
Loading