diff --git a/briar-gtk/briar_gtk/containers/__init__.py b/briar-gtk/briar_gtk/containers/__init__.py deleted file mode 100644 index 8d68ea38bbdabd032a629df7b128ff8e2066fe58..0000000000000000000000000000000000000000 --- a/briar-gtk/briar_gtk/containers/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 Nico Alt -# SPDX-License-Identifier: AGPL-3.0-only -# License-Filename: LICENSE.md -""" -Containers in Briar GTK -""" diff --git a/briar-gtk/briar_gtk/containers/startup.py b/briar-gtk/briar_gtk/containers/startup.py index 8da951c337d35c474d483541c169a720ded10120..ce15bbfec31fd8685eb65c11500de113de45e09f 100644 --- a/briar-gtk/briar_gtk/containers/startup.py +++ b/briar-gtk/briar_gtk/containers/startup.py @@ -3,7 +3,7 @@ # License-Filename: LICENSE.md from briar_gtk.container import Container -from briar_gtk.containers.login import LoginContainer +from briar_gtk.views.login import LoginView from briar_gtk.containers.registration import RegistrationContainer from briar_gtk.define import APP @@ -17,6 +17,6 @@ class StartupContainer(Container): def _setup_view(self, window): container = RegistrationContainer(window) if APP().api.has_account(): - container = LoginContainer(window) + container = LoginView(window) self.add(container) diff --git a/briar-gtk/briar_gtk/containers/login.py b/briar-gtk/briar_gtk/views/login.py similarity index 90% rename from briar-gtk/briar_gtk/containers/login.py rename to briar-gtk/briar_gtk/views/login.py index b26b879e6ae8e480ca37717af4e18bfd54596b39..94b5c9853fe7c28fc18bc6e216ce81d6dfa65963 100644 --- a/briar-gtk/briar_gtk/containers/login.py +++ b/briar-gtk/briar_gtk/views/login.py @@ -1,18 +1,17 @@ # Copyright (c) 2019 Nico Alt # SPDX-License-Identifier: AGPL-3.0-only # License-Filename: LICENSE.md - +import os from gettext import gettext as _ -from gi.repository import GLib +from gi.repository import GLib, Gtk 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 +from briar_gtk.define import APP, RESOURCES_DIR -class LoginContainer(Container): +class LoginView(Gtk.Overlay): LOGIN_UI = "login.ui" STACK_NAME = "login_flow_stack" @@ -20,6 +19,7 @@ class LoginContainer(Container): def __init__(self, window): super().__init__() + self.builder = Gtk.Builder() LoginActions(self) self._window = window self._setup_view() @@ -39,6 +39,11 @@ class LoginContainer(Container): self._setup_login_flow_headers() self._setup_enter_listener() + def _add_from_resource(self, ui_filename): + self.builder.add_from_resource( + os.path.join(RESOURCES_DIR, ui_filename) + ) + def _setup_login_flow_stack(self): self.login_flow_stack = self.builder.get_object(self.STACK_NAME) self.login_flow_stack.show_all()