diff --git a/briar-gtk/briar_gtk/containers/startup.py b/briar-gtk/briar_gtk/containers/startup.py index ce15bbfec31fd8685eb65c11500de113de45e09f..0d930c82a2ae6d979eac737e5cf6c74dd515f4dc 100644 --- a/briar-gtk/briar_gtk/containers/startup.py +++ b/briar-gtk/briar_gtk/containers/startup.py @@ -4,7 +4,7 @@ from briar_gtk.container import Container from briar_gtk.views.login import LoginView -from briar_gtk.containers.registration import RegistrationContainer +from briar_gtk.views.registration import RegistrationView from briar_gtk.define import APP @@ -15,7 +15,7 @@ class StartupContainer(Container): self._setup_view(window) def _setup_view(self, window): - container = RegistrationContainer(window) + container = RegistrationView(window) if APP().api.has_account(): container = LoginView(window) diff --git a/briar-gtk/briar_gtk/containers/registration.py b/briar-gtk/briar_gtk/views/registration.py similarity index 94% rename from briar-gtk/briar_gtk/containers/registration.py rename to briar-gtk/briar_gtk/views/registration.py index 0bcd7c05b7db25a9fb2bc0c8ab7246fa72c8b2a7..b9f4208a9b4038183241b02bf64a98abcb8a9efc 100644 --- a/briar-gtk/briar_gtk/containers/registration.py +++ b/briar-gtk/briar_gtk/views/registration.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.registration import RegistrationActions from briar_gtk.actions.prefixes import REGISTRATION_PREFIX -from briar_gtk.container import Container -from briar_gtk.define import APP +from briar_gtk.define import APP, RESOURCES_DIR -class RegistrationContainer(Container): +class RegistrationView(Gtk.Overlay): REGISTRATION_UI = "registration.ui" STACK_NAME = "registration_flow_stack" @@ -20,6 +19,7 @@ class RegistrationContainer(Container): def __init__(self, window): super().__init__() + self.builder = Gtk.Builder() RegistrationActions(self) self._window = window self._setup_view() @@ -70,6 +70,11 @@ class RegistrationContainer(Container): self._setup_registration_flow_headers() self._setup_nickname_enter_listener() + def _add_from_resource(self, ui_filename): + self.builder.add_from_resource( + os.path.join(RESOURCES_DIR, ui_filename) + ) + def _setup_registration_flow_stack(self): self.registration_flow_stack = self.builder.get_object(self.STACK_NAME) self.registration_flow_stack.show_all()