From caf8d79f824d4f2092582af9bfd5e39cd3952da0 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 17 Dec 2020 16:43:39 +0100
Subject: [PATCH] Move open_about_page into MainWindowController
---
briar-gtk/briar_gtk/actions/window.py | 2 +-
briar-gtk/briar_gtk/controllers/main_window.py | 6 ++++++
briar-gtk/briar_gtk/views/main_window.py | 6 ------
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/briar-gtk/briar_gtk/actions/window.py b/briar-gtk/briar_gtk/actions/window.py
index 345270f..e08a44a 100644
--- a/briar-gtk/briar_gtk/actions/window.py
+++ b/briar-gtk/briar_gtk/actions/window.py
@@ -81,7 +81,7 @@ class WindowActions(Actions):
# pylint: disable=unused-argument
def _open_about_page(self, action, parameter):
- self.widget.current_container.open_about_page()
+ self.widget.current_controller.open_about_page()
# pylint: disable=unused-argument
def _open_add_contact(self, action, parameter):
diff --git a/briar-gtk/briar_gtk/controllers/main_window.py b/briar-gtk/briar_gtk/controllers/main_window.py
index 445c617..1781c7f 100644
--- a/briar-gtk/briar_gtk/controllers/main_window.py
+++ b/briar-gtk/briar_gtk/controllers/main_window.py
@@ -12,6 +12,7 @@ from briar_gtk.define import APP
from briar_gtk.views.main_menu import MainMenuView
from briar_gtk.views.private_chat import PrivateChatView
from briar_gtk.views.sidebar import SidebarView
+from briar_gtk.widgets.about_dialog import AboutDialogWidget
class MainWindowController():
@@ -25,6 +26,11 @@ class MainWindowController():
self._load_content()
self._setup_destroy_listener()
+ @staticmethod
+ def open_about_page():
+ about_dialog = AboutDialogWidget()
+ about_dialog.show()
+
def open_private_chat(self, contact_id):
contact_name = self._get_contact_name(contact_id)
self._prepare_chat_view(contact_name)
diff --git a/briar-gtk/briar_gtk/views/main_window.py b/briar-gtk/briar_gtk/views/main_window.py
index 75e1756..a89e69d 100644
--- a/briar-gtk/briar_gtk/views/main_window.py
+++ b/briar-gtk/briar_gtk/views/main_window.py
@@ -20,7 +20,6 @@ from briar_gtk.define import NOTIFICATION_PRIVATE_MESSAGE
from briar_gtk.views.main_menu import MainMenuView
from briar_gtk.views.private_chat import PrivateChatView
from briar_gtk.views.sidebar import SidebarView
-from briar_gtk.widgets.about_dialog import AboutDialogWidget
from briar_gtk.widgets.contact_row import ContactRowWidget
from briar_gtk.widgets.edit_dialog import EditDialog
@@ -72,11 +71,6 @@ class MainWindowView(Gtk.Overlay):
def chat_entry(self):
return self._builder.get_object("chat_entry")
- @staticmethod
- def open_about_page():
- about_dialog = AboutDialogWidget()
- about_dialog.show()
-
def show_sidebar(self):
self.main_window_leaflet.set_visible_child(
self._builder.get_object("sidebar_box"))
--
GitLab