From 175773e329aa78fa2fb74e8e97adb1cdf12ccf90 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 31 Dec 2020 12:00:00 +0000
Subject: [PATCH] Add private_chat module
---
briar-gtk/briar_gtk/conversation/conversation_presenter.py | 4 ++--
briar-gtk/briar_gtk/presenters/__init__.py | 7 -------
briar-gtk/briar_gtk/{widgets => private_chat}/__init__.py | 4 ++--
.../briar_gtk/{widgets => private_chat}/edit_dialog.py | 2 +-
.../private_chat_presenter.py} | 6 +++---
.../private_chat.py => private_chat/private_chat_view.py} | 6 +++---
.../briar_gtk/{widgets => private_chat}/private_message.py | 0
briar-gtk/briar_gtk/views/__init__.py | 6 ------
8 files changed, 11 insertions(+), 24 deletions(-)
delete mode 100644 briar-gtk/briar_gtk/presenters/__init__.py
rename briar-gtk/briar_gtk/{widgets => private_chat}/__init__.py (53%)
rename briar-gtk/briar_gtk/{widgets => private_chat}/edit_dialog.py (96%)
rename briar-gtk/briar_gtk/{presenters/private_chat.py => private_chat/private_chat_presenter.py} (98%)
rename briar-gtk/briar_gtk/{views/private_chat.py => private_chat/private_chat_view.py} (96%)
rename briar-gtk/briar_gtk/{widgets => private_chat}/private_message.py (100%)
delete mode 100644 briar-gtk/briar_gtk/views/__init__.py
diff --git a/briar-gtk/briar_gtk/conversation/conversation_presenter.py b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
index 9e40afb..3c9064a 100644
--- a/briar-gtk/briar_gtk/conversation/conversation_presenter.py
+++ b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
@@ -3,9 +3,9 @@
# License-Filename: LICENSE.md
from briar_gtk.handlers.notification import NotificationHandler
-from briar_gtk.presenters.private_chat import PrivateChatPresenter
+from briar_gtk.private_chat.private_chat_presenter import PrivateChatPresenter
from briar_gtk.define import APP
-from briar_gtk.views.private_chat import PrivateChatView
+from briar_gtk.private_chat.private_chat_view import PrivateChatView
from briar_gtk.conversation_sidebar.conversation_sidebar_view import SidebarView
from briar_gtk.conversation.about_dialog import AboutDialogWidget
diff --git a/briar-gtk/briar_gtk/presenters/__init__.py b/briar-gtk/briar_gtk/presenters/__init__.py
deleted file mode 100644
index 5ad73fc..0000000
--- a/briar-gtk/briar_gtk/presenters/__init__.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright (c) 2020 Nico Alt
-# SPDX-License-Identifier: AGPL-3.0-only
-# License-Filename: LICENSE.md
-"""
-Presenters (of MVP pattern) reacting to user input and model/data updates
-in Briar GTK
-"""
diff --git a/briar-gtk/briar_gtk/widgets/__init__.py b/briar-gtk/briar_gtk/private_chat/__init__.py
similarity index 53%
rename from briar-gtk/briar_gtk/widgets/__init__.py
rename to briar-gtk/briar_gtk/private_chat/__init__.py
index a328738..12e6a7c 100644
--- a/briar-gtk/briar_gtk/widgets/__init__.py
+++ b/briar-gtk/briar_gtk/private_chat/__init__.py
@@ -1,6 +1,6 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2021 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
"""
-Widgets (small UI chunks) in Briar GTK
+Private chat in Briar GTK
"""
diff --git a/briar-gtk/briar_gtk/widgets/edit_dialog.py b/briar-gtk/briar_gtk/private_chat/edit_dialog.py
similarity index 96%
rename from briar-gtk/briar_gtk/widgets/edit_dialog.py
rename to briar-gtk/briar_gtk/private_chat/edit_dialog.py
index 622c273..759fb74 100644
--- a/briar-gtk/briar_gtk/widgets/edit_dialog.py
+++ b/briar-gtk/briar_gtk/private_chat/edit_dialog.py
@@ -6,7 +6,7 @@ from gettext import gettext as _
from gi.repository import Gtk
-class EditDialog(Gtk.Dialog):
+class EditDialogWidget(Gtk.Dialog):
def __init__(self, parent: "Gtk.Window", flags: "Gtk.DialogFlags",
placeholder: str, text: str = ""):
diff --git a/briar-gtk/briar_gtk/presenters/private_chat.py b/briar-gtk/briar_gtk/private_chat/private_chat_presenter.py
similarity index 98%
rename from briar-gtk/briar_gtk/presenters/private_chat.py
rename to briar-gtk/briar_gtk/private_chat/private_chat_presenter.py
index 4235fe6..16b056f 100644
--- a/briar-gtk/briar_gtk/presenters/private_chat.py
+++ b/briar-gtk/briar_gtk/private_chat/private_chat_presenter.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Nico Alt
+# Copyright (c) 2020-2021 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
@@ -11,7 +11,7 @@ from briar_wrapper.models.contacts import Contacts
from briar_wrapper.models.private_chat import PrivateChat
from briar_gtk.define import APP
-from briar_gtk.widgets.edit_dialog import EditDialog
+from briar_gtk.private_chat.edit_dialog import EditDialogWidget
# pylint: disable=too-many-arguments
@@ -32,7 +32,7 @@ class PrivateChatPresenter:
if self._view.contact_id == 0:
raise Exception("Can't change contact alias with ID 0")
- confirmation_dialog = EditDialog(
+ confirmation_dialog = EditDialogWidget(
parent=APP().window,
flags=Gtk.DialogFlags.MODAL,
placeholder=self._get_contact_name(self._view.contact_id)
diff --git a/briar-gtk/briar_gtk/views/private_chat.py b/briar-gtk/briar_gtk/private_chat/private_chat_view.py
similarity index 96%
rename from briar-gtk/briar_gtk/views/private_chat.py
rename to briar-gtk/briar_gtk/private_chat/private_chat_view.py
index fe5b388..ed0988e 100644
--- a/briar-gtk/briar_gtk/views/private_chat.py
+++ b/briar-gtk/briar_gtk/private_chat/private_chat_view.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
#
@@ -11,8 +11,8 @@ from gi.repository import GLib, Gtk, Handy
from briar_wrapper.models.private_chat import PrivateChat
from briar_gtk.define import APP, RESOURCES_DIR
-from briar_gtk.presenters.private_chat import PrivateChatPresenter
-from briar_gtk.widgets.private_message import PrivateMessageWidget
+from briar_gtk.private_chat.private_chat_presenter import PrivateChatPresenter
+from briar_gtk.private_chat.private_message import PrivateMessageWidget
# pylint: disable=too-many-instance-attributes
diff --git a/briar-gtk/briar_gtk/widgets/private_message.py b/briar-gtk/briar_gtk/private_chat/private_message.py
similarity index 100%
rename from briar-gtk/briar_gtk/widgets/private_message.py
rename to briar-gtk/briar_gtk/private_chat/private_message.py
diff --git a/briar-gtk/briar_gtk/views/__init__.py b/briar-gtk/briar_gtk/views/__init__.py
deleted file mode 100644
index 485f798..0000000
--- a/briar-gtk/briar_gtk/views/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright (c) 2020 Nico Alt
-# SPDX-License-Identifier: AGPL-3.0-only
-# License-Filename: LICENSE.md
-"""
-Views (of MVP pattern) displaying data in Briar GTK
-"""
--
GitLab