diff --git a/bottles/frontend/main.py b/bottles/frontend/main.py index eaf17f7ff8..1c3ae2c6af 100644 --- a/bottles/frontend/main.py +++ b/bottles/frontend/main.py @@ -89,7 +89,7 @@ def __init__(self): ) self.__create_action("quit", self.__quit, ["q", "w"]) self.__create_action("about", self.__show_about_dialog) - self.__create_action("import", self.__show_importer_view, ["i"]) + self.__create_action("import", self.__show_importer_page, ["i"]) self.__create_action("preferences", self.__show_preferences, ["comma"]) self.__create_action("help", self.__help, ["F1"]) self.__create_action("new", self.__new_bottle, ["n"]) @@ -293,7 +293,7 @@ def __show_preferences(self, *args): def __new_bottle(self, *args): self.win.show_add_view() - def __show_importer_view(self, widget=False, *args): + def __show_importer_page(self, widget=False, *args): self.win.navigation_view.push(self.win.page_importer) def __show_about_dialog(self, *_args): diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index a3b6e3027b..51a4b2d240 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -31,7 +31,7 @@ details-versioning.ui details-taskmanager.ui preferences.ui - importer.ui + import-page.ui library.ui dialog-launch-options.ui dialog-dll-overrides.ui diff --git a/bottles/frontend/ui/importer.blp b/bottles/frontend/ui/import-page.blp similarity index 97% rename from bottles/frontend/ui/importer.blp rename to bottles/frontend/ui/import-page.blp index 7205714d25..86f7dd3cd1 100644 --- a/bottles/frontend/ui/importer.blp +++ b/bottles/frontend/ui/import-page.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $ImporterView: Adw.NavigationPage { +template $BottlesImportPage: Adw.NavigationPage { title: _("Import"); tag: "import"; diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 0d76312b10..0b0c8a7662 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -37,7 +37,7 @@ blueprints = custom_target('blueprints', 'env-var-entry.blp', 'exclusion-pattern-entry.blp', 'importer-entry.blp', - 'importer.blp', + 'import-page.blp', 'installer-entry.blp', 'library-entry.blp', 'library.blp', diff --git a/bottles/frontend/views/importer.py b/bottles/frontend/views/import_page.py similarity index 96% rename from bottles/frontend/views/importer.py rename to bottles/frontend/views/import_page.py index 8a4da7d6b9..794ca6bc76 100644 --- a/bottles/frontend/views/importer.py +++ b/bottles/frontend/views/import_page.py @@ -1,6 +1,6 @@ -# importer.py +# import_page.py # -# Copyright 2022 brombinmirko +# Copyright 2025 The Bottles Contributors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -26,9 +26,9 @@ from bottles.frontend.widgets.importer import ImporterEntry -@Gtk.Template(resource_path="/com/usebottles/bottles/importer.ui") -class ImporterView(Adw.NavigationPage): - __gtype_name__ = "ImporterView" +@Gtk.Template(resource_path="/com/usebottles/bottles/import-page.ui") +class BottlesImportPage(Adw.NavigationPage): + __gtype_name__ = "BottlesImportPage" # region Widgets list_prefixes = Gtk.Template.Child() diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index b347432003..9c8641dac1 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -8,7 +8,7 @@ bottles_sources = [ 'library.py', 'details.py', 'preferences.py', - 'importer.py', + 'import_page.py', 'loading.py', 'bottle_details_page.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index 8bc8f423f6..0e388eda8c 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -37,7 +37,7 @@ from bottles.frontend.params import APP_ID, BASE_ID, PROFILE from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.views.details import DetailsView -from bottles.frontend.views.importer import ImporterView +from bottles.frontend.views.import_page import BottlesImportPage from bottles.frontend.views.library import LibraryView from bottles.frontend.views.overview_list_page import BottlesOverviewListPage from bottles.frontend.views.loading import LoadingView @@ -223,7 +223,7 @@ def set_manager(result: Manager, error=None): # Pages self.page_details = DetailsView(self) self.page_list = BottlesOverviewListPage(self, arg_bottle=self.arg_bottle) - self.page_importer = ImporterView(self) + self.page_importer = BottlesImportPage(self) self.page_library = LibraryView(self) self.navigation_view.add(self.page_details)