From 2cb33ce8cecddd5c9d57eb4ff9a51537a398f42d Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Fri, 27 Mar 2020 12:00:06 +0000
Subject: [PATCH] Use action prefixes in all classes
---
briar-gtk/briar_gtk/actions/application.py | 5 ++++-
briar-gtk/briar_gtk/actions/login.py | 5 ++---
briar-gtk/briar_gtk/actions/window.py | 5 ++++-
briar-gtk/briar_gtk/containers/login.py | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/application.py b/briar-gtk/briar_gtk/actions/application.py
index 50b9e96..cd2a731 100644
--- a/briar-gtk/briar_gtk/actions/application.py
+++ b/briar-gtk/briar_gtk/actions/application.py
@@ -7,6 +7,7 @@
# https://gitlab.gnome.org/World/lollypop/blob/1.2.20/lollypop/application_actions.py
from briar_gtk.actions.actions import Actions
+from briar_gtk.actions.prefixes import APPLICATION_PREFIX
# pylint: disable=too-few-public-methods
@@ -22,7 +23,9 @@ class ApplicationActions(Actions):
def _setup_quit_action(self):
self._setup_action("quit", None, self._quit)
- self.widget.set_accels_for_action("app.quit", ["<Ctrl>q"])
+ self.widget.set_accels_for_action(
+ f"{APPLICATION_PREFIX}.quit", ["<Ctrl>q"]
+ )
# pylint: disable=unused-argument
def _quit(self, action, parameter):
diff --git a/briar-gtk/briar_gtk/actions/login.py b/briar-gtk/briar_gtk/actions/login.py
index 42a0cae..48404c4 100644
--- a/briar-gtk/briar_gtk/actions/login.py
+++ b/briar-gtk/briar_gtk/actions/login.py
@@ -3,16 +3,15 @@
# License-Filename: LICENSE.md
from briar_gtk.actions.actions import Actions
+from briar_gtk.actions.prefixes import LOGIN_PREFIX
# pylint: disable=too-few-public-methods
class LoginActions(Actions):
- ACTIONS_PREFIX = "login"
-
def __init__(self, widget):
super().__init__(widget)
- self._setup_simple_action_group(self.ACTIONS_PREFIX)
+ self._setup_simple_action_group(LOGIN_PREFIX)
self._setup_actions()
def _setup_actions(self):
diff --git a/briar-gtk/briar_gtk/actions/window.py b/briar-gtk/briar_gtk/actions/window.py
index 9c8ca5b..803d609 100644
--- a/briar-gtk/briar_gtk/actions/window.py
+++ b/briar-gtk/briar_gtk/actions/window.py
@@ -9,6 +9,7 @@
from gi.repository import GLib
from briar_gtk.actions.actions import Actions
+from briar_gtk.actions.prefixes import WINDOW_PREFIX
from briar_gtk.containers.main_window import MainWindowContainer
from briar_gtk.define import APP
@@ -30,7 +31,9 @@ class WindowActions(Actions):
def _setup_back_to_sidebar_action(self):
self._setup_action("back-to-sidebar", None, self._back_to_sidebar)
- APP().set_accels_for_action("win.back-to-sidebar", ["<Ctrl>w"])
+ APP().set_accels_for_action(
+ f"{WINDOW_PREFIX}.back-to-sidebar", ["<Ctrl>w"]
+ )
def _setup_open_about_page_action(self):
self._setup_action("open-about-dialog", None, self._open_about_page)
diff --git a/briar-gtk/briar_gtk/containers/login.py b/briar-gtk/briar_gtk/containers/login.py
index 7caff0b..bfcecf4 100644
--- a/briar-gtk/briar_gtk/containers/login.py
+++ b/briar-gtk/briar_gtk/containers/login.py
@@ -5,6 +5,7 @@
from gi.repository import GLib
from briar_gtk.actions.login import LoginActions
+from briar_gtk.actions.prefixes import LOGIN_PREFIX
from briar_gtk.container import Container
from briar_gtk.define import APP
@@ -38,7 +39,7 @@ class LoginContainer(Container):
login_flow_headers = self.builder.get_object(self.HEADERS_NAME)
login_flow_headers.show_all()
login_flow_headers.insert_action_group(
- "login", self.get_action_group("login")
+ LOGIN_PREFIX, self.get_action_group(LOGIN_PREFIX)
)
self._window.set_titlebar(login_flow_headers)
--
GitLab