diff --git a/briar-gtk/briar_gtk/actions/window.py b/briar-gtk/briar_gtk/actions/window.py index e853349762d92c750b887b95ba848fa52ef2136a..652cd7ededa52e7d7c1cc6e28493b98e07d98afe 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 0000000000000000000000000000000000000000..4cbe4bd2ea2779d14c0036e22078d00e0863d0a3 --- /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 c7480e536e32ec8f30ff5ee1953fa318eb723101..e7c2856b488b6d455884884fa1fb2040556bfd21 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 59a0e3ff4c6e7f2a2201d29af6bc5374f5605141..e66e49705a6050a54dbf6abf0d7205f14a2a2b23 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 d063f2740609f28a8afda1829d519ffdcbe9793b..fab7cce9601cbba3c40806c15be0177b1252b094 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 002b68f74a2c54ea977864dd6f9942c562dee988..74e27494eaebd03bc53f95145ce5902ed87277a0 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