From a871a8d30c5de5161166a533e85d9482b59645a0 Mon Sep 17 00:00:00 2001
From: Nico Alt <nicoalt@posteo.org>
Date: Thu, 31 Dec 2020 12:00:00 +0000
Subject: [PATCH] Create conversations module
---
briar-gtk/briar_gtk/actions/window.py | 4 ++--
briar-gtk/briar_gtk/conversation/__init__.py | 6 ++++++
.../briar_gtk/{widgets => conversation}/about_dialog.py | 4 ++--
.../conversation_presenter.py} | 4 ++--
.../main_window.py => conversation/conversation_view.py} | 4 ++--
briar-gtk/briar_gtk/window.py | 4 ++--
6 files changed, 16 insertions(+), 10 deletions(-)
create mode 100644 briar-gtk/briar_gtk/conversation/__init__.py
rename briar-gtk/briar_gtk/{widgets => conversation}/about_dialog.py (97%)
rename briar-gtk/briar_gtk/{presenters/main_window.py => conversation/conversation_presenter.py} (96%)
rename briar-gtk/briar_gtk/{views/main_window.py => conversation/conversation_view.py} (93%)
diff --git a/briar-gtk/briar_gtk/actions/window.py b/briar-gtk/briar_gtk/actions/window.py
index e853349..652cd7e 100644
--- a/briar-gtk/briar_gtk/actions/window.py
+++ b/briar-gtk/briar_gtk/actions/window.py
@@ -1,5 +1,5 @@
# Copyright (c) 2014-2020 Cedric Bellegarde <cedric.bellegarde@adishatz.org>
-# 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 gi.repository import GLib
from briar_gtk.actions.actions import Actions
from briar_gtk.actions.prefixes import WINDOW_PREFIX
from briar_gtk.define import APP
-from briar_gtk.views.main_window import MainWindowView
+from briar_gtk.conversation.conversation_view import MainWindowView
class WindowActions(Actions):
diff --git a/briar-gtk/briar_gtk/conversation/__init__.py b/briar-gtk/briar_gtk/conversation/__init__.py
new file mode 100644
index 0000000..4cbe4bd
--- /dev/null
+++ b/briar-gtk/briar_gtk/conversation/__init__.py
@@ -0,0 +1,6 @@
+# Copyright (c) 2021 Nico Alt
+# SPDX-License-Identifier: AGPL-3.0-only
+# License-Filename: LICENSE.md
+"""
+Main conversation window containing sidebar and chat in Briar GTK
+"""
diff --git a/briar-gtk/briar_gtk/widgets/about_dialog.py b/briar-gtk/briar_gtk/conversation/about_dialog.py
similarity index 97%
rename from briar-gtk/briar_gtk/widgets/about_dialog.py
rename to briar-gtk/briar_gtk/conversation/about_dialog.py
index c7480e5..e7c2856 100644
--- a/briar-gtk/briar_gtk/widgets/about_dialog.py
+++ b/briar-gtk/briar_gtk/conversation/about_dialog.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
@@ -10,7 +10,7 @@ from gi.repository import Gtk
from briar_gtk.define import APP, RESOURCES_DIR
-class AboutDialogWidget():
+class AboutDialogWidget:
ABOUT_UI = "about_dialog.ui"
diff --git a/briar-gtk/briar_gtk/presenters/main_window.py b/briar-gtk/briar_gtk/conversation/conversation_presenter.py
similarity index 96%
rename from briar-gtk/briar_gtk/presenters/main_window.py
rename to briar-gtk/briar_gtk/conversation/conversation_presenter.py
index 59a0e3f..e66e497 100644
--- a/briar-gtk/briar_gtk/presenters/main_window.py
+++ b/briar-gtk/briar_gtk/conversation/conversation_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
@@ -7,7 +7,7 @@ from briar_gtk.presenters.private_chat import PrivateChatPresenter
from briar_gtk.define import APP
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.conversation.about_dialog import AboutDialogWidget
class MainWindowPresenter:
diff --git a/briar-gtk/briar_gtk/views/main_window.py b/briar-gtk/briar_gtk/conversation/conversation_view.py
similarity index 93%
rename from briar-gtk/briar_gtk/views/main_window.py
rename to briar-gtk/briar_gtk/conversation/conversation_view.py
index d063f27..fab7cce 100644
--- a/briar-gtk/briar_gtk/views/main_window.py
+++ b/briar-gtk/briar_gtk/conversation/conversation_view.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
#
@@ -10,7 +10,7 @@ import os
from gi.repository import Gtk
from briar_gtk.define import RESOURCES_DIR
-from briar_gtk.presenters.main_window import MainWindowPresenter
+from briar_gtk.conversation.conversation_presenter import MainWindowPresenter
class MainWindowView(Gtk.Overlay):
diff --git a/briar-gtk/briar_gtk/window.py b/briar-gtk/briar_gtk/window.py
index 002b68f..74e2749 100644
--- a/briar-gtk/briar_gtk/window.py
+++ b/briar-gtk/briar_gtk/window.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Nico Alt
+# Copyright (c) 2019-2021 Nico Alt
# SPDX-License-Identifier: AGPL-3.0-only
# License-Filename: LICENSE.md
@@ -7,7 +7,7 @@ from gi.repository import Gio, Gtk
from briar_gtk.actions.window import WindowActions
from briar_gtk.add_contact.add_contact_view import AddContactView
-from briar_gtk.views.main_window import MainWindowView
+from briar_gtk.conversation.conversation_view import MainWindowView
from briar_gtk.startup.startup_view import StartupView
from briar_gtk.define import APP, APPLICATION_ID, APPLICATION_NAME
from briar_gtk.define import NOTIFICATION_CONTACT_ADDED
--
GitLab