From a4b65e9ab24c27789c0fd9cee90c49e387c5359a Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 26 Mar 2020 12:00:01 +0000
Subject: [PATCH] Listen only on enter in all classes
---
briar-gtk/briar_gtk/containers/add_contact.py | 21 +++++++------------
briar-gtk/briar_gtk/containers/login.py | 11 ++++------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/briar-gtk/briar_gtk/containers/add_contact.py b/briar-gtk/briar_gtk/containers/add_contact.py
index 0609319..4928500 100644
--- a/briar-gtk/briar_gtk/containers/add_contact.py
+++ b/briar-gtk/briar_gtk/containers/add_contact.py
@@ -29,7 +29,7 @@ class AddContactContainer(Container):
self._setup_add_contact_flow_stack()
self._setup_add_contact_flow_headers()
- self._setup_link_keystroke_listener()
+ self._setup_link_enter_listener()
def _load_content(self):
contacts = Contacts(APP().api)
@@ -46,15 +46,12 @@ class AddContactContainer(Container):
add_contact_flow_headers.show_all()
APP().window.set_titlebar(add_contact_flow_headers)
- def _setup_link_keystroke_listener(self):
+ def _setup_link_enter_listener(self):
their_link_entry = self.builder.get_object("their_link_entry")
- their_link_entry.connect("key-press-event",
- self._link_keystroke)
+ their_link_entry.connect("activate", self._on_link_enter)
# pylint: disable=unused-argument
- def _link_keystroke(self, widget, event):
- if event.hardware_keycode != 36 and event.hardware_keycode != 104:
- return
+ def _on_link_enter(self, widget):
self.on_links_next_pressed(None)
# pylint: disable=unused-argument
@@ -90,20 +87,18 @@ class AddContactContainer(Container):
self.add_contact_flow_stack.set_visible_child(alias_page)
self._focus_alias_entry()
- self._setup_alias_keystroke_listener()
+ self._setup_alias_enter_listener()
def _focus_alias_entry(self):
alias_entry = self.builder.get_object("alias_entry")
alias_entry.grab_focus()
- def _setup_alias_keystroke_listener(self):
+ def _setup_alias_enter_listener(self):
alias_entry = self.builder.get_object("alias_entry")
- alias_entry.connect("key-press-event", self._alias_keystroke)
+ alias_entry.connect("activate", self._on_alias_enter)
# pylint: disable=unused-argument
- def _alias_keystroke(self, widget, event):
- if event.hardware_keycode != 36 and event.hardware_keycode != 104:
- return
+ def _on_alias_enter(self, widget):
self.on_add_contact_pressed(None)
# pylint: disable=unused-argument
diff --git a/briar-gtk/briar_gtk/containers/login.py b/briar-gtk/briar_gtk/containers/login.py
index ea35cb9..3d36f56 100644
--- a/briar-gtk/briar_gtk/containers/login.py
+++ b/briar-gtk/briar_gtk/containers/login.py
@@ -25,7 +25,7 @@ class LoginContainer(Container):
self._setup_login_flow_stack()
self._setup_login_flow_headers()
- self._setup_keystroke_listener()
+ self._setup_enter_listener()
def _setup_login_flow_stack(self):
self.login_flow_stack = self.builder.get_object(self.STACK_NAME)
@@ -37,15 +37,12 @@ class LoginContainer(Container):
login_flow_headers.show_all()
self._window.set_titlebar(login_flow_headers)
- def _setup_keystroke_listener(self):
+ def _setup_enter_listener(self):
password_entry = self.builder.get_object("password_entry")
- password_entry.connect("key-press-event",
- self._password_keystroke)
+ password_entry.connect("activate", self._on_password_enter)
# pylint: disable=unused-argument
- def _password_keystroke(self, widget, event):
- if event.hardware_keycode != 36 and event.hardware_keycode != 104:
- return
+ def _on_password_enter(self, widget):
self.on_login_pressed(None)
# pylint: disable=unused-argument
--
GitLab