From 367c4f2c6330af4abd63cccf459c2518490eb423 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:10:48 -0500 Subject: [PATCH 01/47] bottle-row: Rename to BottleRow --- bottles/frontend/ui/bottle-row.blp | 2 +- bottles/frontend/views/list.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bottles/frontend/ui/bottle-row.blp b/bottles/frontend/ui/bottle-row.blp index 2598ed5283..ae91069348 100644 --- a/bottles/frontend/ui/bottle-row.blp +++ b/bottles/frontend/ui/bottle-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $BottlesBottleRow: Adw.ActionRow { +template $BottleRow: Adw.ActionRow { activatable: true; use-markup: false; diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/list.py index 54a717877e..82c450586c 100644 --- a/bottles/frontend/views/list.py +++ b/bottles/frontend/views/list.py @@ -30,8 +30,8 @@ @Gtk.Template(resource_path="/com/usebottles/bottles/bottle-row.ui") -class BottlesBottleRow(Adw.ActionRow): - __gtype_name__ = "BottlesBottleRow" +class BottleRow(Adw.ActionRow): + __gtype_name__ = "BottleRow" Adw.init() @@ -191,7 +191,7 @@ def update_bottles_list(self, *args) -> None: self.bottle_status.set_visible(is_empty_local_bottles) for name, config in local_bottles.items(): - _entry = BottlesBottleRow(self.window, config) + _entry = BottleRow(self.window, config) self.__bottles[config.Path] = _entry if config.Environment != "Steam": From 5e2d977b073680691a274b40c4f63a7b0fbc36e4 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:11:50 -0500 Subject: [PATCH 02/47] new-bottle-dialog: Rename to NewBottleDialog --- bottles/frontend/ui/new-bottle-dialog.blp | 2 +- bottles/frontend/views/new_bottle_dialog.py | 4 ++-- bottles/frontend/windows/window.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bottles/frontend/ui/new-bottle-dialog.blp b/bottles/frontend/ui/new-bottle-dialog.blp index 8f958f3396..654edb6bc5 100644 --- a/bottles/frontend/ui/new-bottle-dialog.blp +++ b/bottles/frontend/ui/new-bottle-dialog.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $BottlesNewBottleDialog: Adw.Dialog { +template $NewBottleDialog: Adw.Dialog { content-width: 500; content-height: 500; title: _("Create New Bottle"); diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py index a8b007d4a1..e5c259304d 100644 --- a/bottles/frontend/views/new_bottle_dialog.py +++ b/bottles/frontend/views/new_bottle_dialog.py @@ -47,8 +47,8 @@ class BottlesCheckRow(Adw.ActionRow): @Gtk.Template(resource_path="/com/usebottles/bottles/new-bottle-dialog.ui") -class BottlesNewBottleDialog(Adw.Dialog): - __gtype_name__ = "BottlesNewBottleDialog" +class NewBottleDialog(Adw.Dialog): + __gtype_name__ = "NewBottleDialog" # region Widgets entry_name = Gtk.Template.Child() diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index bddd3f3425..ac24c55b69 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -41,7 +41,7 @@ from bottles.frontend.views.library import LibraryView from bottles.frontend.views.list import BottleView from bottles.frontend.views.loading import LoadingView -from bottles.frontend.views.new_bottle_dialog import BottlesNewBottleDialog +from bottles.frontend.views.new_bottle_dialog import NewBottleDialog from bottles.frontend.views.preferences import PreferencesWindow from bottles.frontend.windows.crash import CrashReportDialog from bottles.frontend.windows.depscheck import DependenciesCheckDialog @@ -328,7 +328,7 @@ def show_onboard_view(self, widget=False): onboard_window.present() def show_add_view(self, widget=False): - new_bottle_dialog = BottlesNewBottleDialog() + new_bottle_dialog = NewBottleDialog() new_bottle_dialog.present(self) def show_list_view(self, widget=False): From ec702ea8a8726b76237cc97786b011a2033367c1 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:13:30 -0500 Subject: [PATCH 03/47] check-row: Rename to CheckRow --- bottles/frontend/ui/check-row.blp | 2 +- bottles/frontend/ui/new-bottle-dialog.blp | 6 +++--- bottles/frontend/views/new_bottle_dialog.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bottles/frontend/ui/check-row.blp b/bottles/frontend/ui/check-row.blp index c4ce6d96ef..b4dda3bf3c 100644 --- a/bottles/frontend/ui/check-row.blp +++ b/bottles/frontend/ui/check-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $BottlesCheckRow: Adw.ActionRow { +template $CheckRow: Adw.ActionRow { activatable-widget: check_button; active: bind check_button.active bidirectional; diff --git a/bottles/frontend/ui/new-bottle-dialog.blp b/bottles/frontend/ui/new-bottle-dialog.blp index 654edb6bc5..d13cc8e894 100644 --- a/bottles/frontend/ui/new-bottle-dialog.blp +++ b/bottles/frontend/ui/new-bottle-dialog.blp @@ -67,7 +67,7 @@ template $NewBottleDialog: Adw.Dialog { "boxed-list", ] - $BottlesCheckRow application { + $CheckRow application { title: _("_Application"); environment: "application"; subtitle: _("Optimized for productivity software"); @@ -76,7 +76,7 @@ template $NewBottleDialog: Adw.Dialog { active: true; } - $BottlesCheckRow { + $CheckRow { title: _("_Gaming"); environment: "gaming"; subtitle: _("Optimized for games, game engines, and 3D apps"); @@ -85,7 +85,7 @@ template $NewBottleDialog: Adw.Dialog { group: application; } - $BottlesCheckRow custom { + $CheckRow custom { title: _("C_ustom"); environment: "custom"; subtitle: _("A clean state intended for specific use cases"); diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/views/new_bottle_dialog.py index e5c259304d..82fafa2d26 100644 --- a/bottles/frontend/views/new_bottle_dialog.py +++ b/bottles/frontend/views/new_bottle_dialog.py @@ -27,10 +27,10 @@ @Gtk.Template(resource_path="/com/usebottles/bottles/check-row.ui") -class BottlesCheckRow(Adw.ActionRow): +class CheckRow(Adw.ActionRow): """An `AdwActionRow` with a designated `GtkCheckButton` as prefix.""" - __gtype_name__ = "BottlesCheckRow" + __gtype_name__ = "CheckRow" check_button = Gtk.Template.Child() @@ -39,7 +39,7 @@ class BottlesCheckRow(Adw.ActionRow): # Add row’s check button to the group group = GObject.Property( - # FIXME: Supposed to be a BottlesCheckRow widget type. + # FIXME: Supposed to be a CheckRow widget type. type=Adw.ActionRow, default=None, setter=lambda self, group: self.check_button.set_group(group.check_button), From 47adf3d65303521b8d85f3a062c75dfe0c10c381 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:18:01 -0500 Subject: [PATCH 04/47] component-entry-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...{component-entry.blp => component-entry-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/preferences.py | 13 ++++++++----- .../{component.py => component_entry_row.py} | 10 +++++----- bottles/frontend/widgets/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 18 insertions(+), 15 deletions(-) rename bottles/frontend/ui/{component-entry.blp => component-entry-row.blp} (96%) rename bottles/frontend/widgets/{component.py => component_entry_row.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 2e9eb7c9d3..acea4e6d36 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -18,7 +18,7 @@ installer-entry.ui dll-override-entry.ui env-var-entry.ui - component-entry.ui + component-entry-row.ui drive-entry.ui library-entry.ui local-resource-entry.ui diff --git a/bottles/frontend/ui/component-entry.blp b/bottles/frontend/ui/component-entry-row.blp similarity index 96% rename from bottles/frontend/ui/component-entry.blp rename to bottles/frontend/ui/component-entry-row.blp index 99236c4d66..a01ced4c53 100644 --- a/bottles/frontend/ui/component-entry.blp +++ b/bottles/frontend/ui/component-entry-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $ComponentEntry: Adw.ActionRow { +template $ComponentEntryRow: Adw.ActionRow { title: _("Component version"); Spinner spinner { diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 6670427d10..59bdd4028e 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -2,7 +2,7 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.proje gnome = import('gnome') blueprints = custom_target('blueprints', input: files( - 'component-entry.blp', + 'component-entry-row.blp', 'check-row.blp', 'dependency-entry.blp', 'details-bottle.blp', diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/views/preferences.py index 7ffb609ada..aa214672cd 100644 --- a/bottles/frontend/views/preferences.py +++ b/bottles/frontend/views/preferences.py @@ -26,7 +26,10 @@ from bottles.backend.state import EventManager, Events from bottles.backend.utils.threading import RunAsync from bottles.backend.utils.generic import sort_by_version -from bottles.frontend.widgets.component import ComponentEntry, ComponentExpander +from bottles.frontend.widgets.component_entry_row import ( + ComponentEntryRow, + ComponentExpander, +) @Gtk.Template(resource_path="/com/usebottles/bottles/preferences.ui") @@ -305,7 +308,7 @@ def __populate_component_list( for component in supported_component_items: if not self.__display_unstable_candidate(component): continue - _entry = ComponentEntry(self.window, component, component_type) + _entry = ComponentEntryRow(self.window, component, component_type) list_component.add(_entry) self.__registry.append(_entry) @@ -355,7 +358,7 @@ def __populate_runners_helper( if not self.__display_unstable_candidate(supported_runner): continue - _entry = ComponentEntry(self.window, supported_runner, runner_type) + _entry = ComponentEntryRow(self.window, supported_runner, runner_type) for identifiable_runner in identifiable_runners_struct: if _runner_name.startswith(identifiable_runner["prefix"]): while ( @@ -369,7 +372,7 @@ def __populate_runners_helper( == identifiable_runner["offline_runners"][0][0] ): offline_runner = identifiable_runner["offline_runners"].pop(0) - _offline_entry = ComponentEntry( + _offline_entry = ComponentEntryRow( self.window, offline_runner, runner_type ) identifiable_runner["expander"].add_row(_offline_entry) @@ -382,7 +385,7 @@ def __populate_runners_helper( for identifiable_runner in identifiable_runners_struct: while identifiable_runner["offline_runners"]: offline_runner = identifiable_runner["offline_runners"].pop(0) - _offline_entry = ComponentEntry( + _offline_entry = ComponentEntryRow( self.window, offline_runner, runner_type ) identifiable_runner["expander"].add_row(_offline_entry) diff --git a/bottles/frontend/widgets/component.py b/bottles/frontend/widgets/component_entry_row.py similarity index 97% rename from bottles/frontend/widgets/component.py rename to bottles/frontend/widgets/component_entry_row.py index 1bc32e510b..5b7766b6a8 100644 --- a/bottles/frontend/widgets/component.py +++ b/bottles/frontend/widgets/component_entry_row.py @@ -1,6 +1,6 @@ -# component.py +# component_entry_row.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 @@ -29,9 +29,9 @@ logging = Logger() -@Gtk.Template(resource_path="/com/usebottles/bottles/component-entry.ui") -class ComponentEntry(Adw.ActionRow): - __gtype_name__ = "ComponentEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/component-entry-row.ui") +class ComponentEntryRow(Adw.ActionRow): + __gtype_name__ = "ComponentEntryRow" __gsignals__ = { "component-installed": (GObject.SIGNAL_RUN_FIRST, None, ()), "component-error": (GObject.SIGNAL_RUN_FIRST, None, ()), diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index 184f6e13f6..a30dda8377 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -9,7 +9,7 @@ bottles_sources = [ 'installer.py', 'program.py', 'state.py', - 'component.py', + 'component_entry_row.py', 'library.py', ] diff --git a/po/POTFILES b/po/POTFILES index 6f9bca14dd..14f67b2182 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -6,7 +6,7 @@ bottles/backend/managers/versioning.py bottles/frontend/main.py bottles/frontend/operation.py bottles/frontend/ui/about.blp -bottles/frontend/ui/component-entry.blp +bottles/frontend/ui/component-entry-row.blp bottles/frontend/ui/dependency-entry.blp bottles/frontend/ui/details-bottle.blp bottles/frontend/ui/details-dependencies.blp From e41d6d329353f3d1b8807b11cd4cccfb41773685 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:23:41 -0500 Subject: [PATCH 05/47] dependency-entry-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../{dependency-entry.blp => dependency-entry-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_dependencies.py | 4 ++-- .../widgets/{dependency.py => dependency_entry_row.py} | 10 +++++----- bottles/frontend/widgets/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename bottles/frontend/ui/{dependency-entry.blp => dependency-entry-row.blp} (97%) rename bottles/frontend/widgets/{dependency.py => dependency_entry_row.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index acea4e6d36..6623c1543b 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -11,7 +11,7 @@ bottle-row.ui check-row.ui task-entry.ui - dependency-entry.ui + dependency-entry-row.ui program-entry.ui importer-entry.ui state-entry.ui diff --git a/bottles/frontend/ui/dependency-entry.blp b/bottles/frontend/ui/dependency-entry-row.blp similarity index 97% rename from bottles/frontend/ui/dependency-entry.blp rename to bottles/frontend/ui/dependency-entry-row.blp index b7bbe5473f..a2920677a4 100644 --- a/bottles/frontend/ui/dependency-entry.blp +++ b/bottles/frontend/ui/dependency-entry-row.blp @@ -38,7 +38,7 @@ Popover pop_actions { } } -template $DependencyEntry: Adw.ActionRow { +template $DependencyEntryRow: Adw.ActionRow { title: _("Dependency name"); activatable-widget: btn_install; subtitle: _("Dependency description"); diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 59bdd4028e..cb016489ff 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -4,7 +4,7 @@ blueprints = custom_target('blueprints', input: files( 'component-entry-row.blp', 'check-row.blp', - 'dependency-entry.blp', + 'dependency-entry-row.blp', 'details-bottle.blp', 'details-dependencies.blp', 'details-installers.blp', diff --git a/bottles/frontend/views/bottle_dependencies.py b/bottles/frontend/views/bottle_dependencies.py index f96b3bf29d..fb88732ffa 100644 --- a/bottles/frontend/views/bottle_dependencies.py +++ b/bottles/frontend/views/bottle_dependencies.py @@ -25,7 +25,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.common import open_doc_url from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.dependency import DependencyEntry +from bottles.frontend.widgets.dependency_entry_row import DependencyEntryRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-dependencies.ui") @@ -107,7 +107,7 @@ def update(self, _widget=False, config: Optional[BottleConfig] = None): self.stack.set_visible_child_name("page_loading") def new_dependency(dependency, plain=False): - entry = DependencyEntry( + entry = DependencyEntryRow( window=self.window, config=self.config, dependency=dependency, diff --git a/bottles/frontend/widgets/dependency.py b/bottles/frontend/widgets/dependency_entry_row.py similarity index 97% rename from bottles/frontend/widgets/dependency.py rename to bottles/frontend/widgets/dependency_entry_row.py index 226e915a5e..3595926c75 100644 --- a/bottles/frontend/widgets/dependency.py +++ b/bottles/frontend/widgets/dependency_entry_row.py @@ -1,6 +1,6 @@ -# dependency.py +# dependency_entry_row.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 @@ -28,9 +28,9 @@ from bottles.frontend.windows.generic import SourceDialog -@Gtk.Template(resource_path="/com/usebottles/bottles/dependency-entry.ui") -class DependencyEntry(Adw.ActionRow): - __gtype_name__ = "DependencyEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/dependency-entry-row.ui") +class DependencyEntryRow(Adw.ActionRow): + __gtype_name__ = "DependencyEntryRow" # region Widgets label_category = Gtk.Template.Child() diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index a30dda8377..b763a20fe2 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -3,7 +3,7 @@ widgetsdir = join_paths(pkgdatadir, 'bottles/frontend/widgets') bottles_sources = [ '__init__.py', - 'dependency.py', + 'dependency_entry_row.py', 'executable.py', 'importer.py', 'installer.py', diff --git a/po/POTFILES b/po/POTFILES index 14f67b2182..d11774d144 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -7,7 +7,7 @@ bottles/frontend/main.py bottles/frontend/operation.py bottles/frontend/ui/about.blp bottles/frontend/ui/component-entry-row.blp -bottles/frontend/ui/dependency-entry.blp +bottles/frontend/ui/dependency-entry-row.blp bottles/frontend/ui/details-bottle.blp bottles/frontend/ui/details-dependencies.blp bottles/frontend/ui/details-installers.blp From a6d74e725d4f5a1a60da235e7236d6992d25e7e5 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:35:46 -0500 Subject: [PATCH 06/47] bottle-details-view: Rename files and class name --- .../ui/{details.blp => bottle-details-view.blp} | 2 +- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../views/{details.py => bottle_details_view.py} | 12 ++++++------ bottles/frontend/views/meson.build | 2 +- bottles/frontend/windows/window.py | 4 ++-- po/POTFILES | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) rename bottles/frontend/ui/{details.blp => bottle-details-view.blp} (97%) rename bottles/frontend/views/{details.py => bottle_details_view.py} (96%) diff --git a/bottles/frontend/ui/details.blp b/bottles/frontend/ui/bottle-details-view.blp similarity index 97% rename from bottles/frontend/ui/details.blp rename to bottles/frontend/ui/bottle-details-view.blp index 395efb7710..5c4797a0ad 100644 --- a/bottles/frontend/ui/details.blp +++ b/bottles/frontend/ui/bottle-details-view.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $Details: Adw.Bin { +template $BottleDetailsView: Adw.Bin { Adw.Leaflet leaflet { can-navigate-back: true; can-unfold: false; diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 6623c1543b..4a11de35b3 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -23,7 +23,7 @@ library-entry.ui local-resource-entry.ui exclusion-pattern-entry.ui - details.ui + bottle-details-view.ui details-bottle.ui details-dependencies.ui details-installers.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index cb016489ff..9d06830919 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -10,7 +10,7 @@ blueprints = custom_target('blueprints', 'details-installers.blp', 'details-taskmanager.blp', 'details-versioning.blp', - 'details.blp', + 'bottle-details-view.blp', 'dialog-bottle-picker.blp', 'dialog-crash-report.blp', 'dialog-deps-check.blp', diff --git a/bottles/frontend/views/details.py b/bottles/frontend/views/bottle_details_view.py similarity index 96% rename from bottles/frontend/views/details.py rename to bottles/frontend/views/bottle_details_view.py index b2bf6091c8..b5fc5d6129 100644 --- a/bottles/frontend/views/details.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -1,6 +1,6 @@ -# details.py +# bottle_details_view.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 @@ -34,14 +34,14 @@ from bottles.frontend.views.bottle_taskmanager import TaskManagerView -@Gtk.Template(resource_path="/com/usebottles/bottles/details.ui") -class DetailsView(Adw.Bin): +@Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-view.ui") +class BottleDetailsView(Adw.Bin): """ This class is the starting point for all the pages concerning the bottle (details, preferences, dependencies ..). """ - __gtype_name__ = "Details" + __gtype_name__ = "BottleDetailsView" __pages = {} # region Widgets @@ -98,7 +98,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): def set_title(self, title, subtitle: str = ""): """ - This function is used to set the title of the DetailsView + This function is used to set the title of the BottleDetailsView headerbar. """ self.content_title.set_title(title) diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index bfadaffe0f..e032322a0f 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -6,7 +6,7 @@ bottles_sources = [ 'new_bottle_dialog.py', 'list.py', 'library.py', - 'details.py', + 'bottle_details_view.py', 'preferences.py', 'importer.py', 'loading.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index ac24c55b69..3881853619 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -36,7 +36,7 @@ from bottles.frontend.operation import TaskSyncer 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.bottle_details_view import BottleDetailsView from bottles.frontend.views.importer import ImporterView from bottles.frontend.views.library import LibraryView from bottles.frontend.views.list import BottleView @@ -220,7 +220,7 @@ def set_manager(result: Manager, error=None): self.show_onboard_view() # Pages - self.page_details = DetailsView(self) + self.page_details = BottleDetailsView(self) self.page_list = BottleView(self, arg_bottle=self.arg_bottle) self.page_importer = ImporterView(self) self.page_library = LibraryView(self) diff --git a/po/POTFILES b/po/POTFILES index d11774d144..cf7621d0db 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -14,7 +14,7 @@ bottles/frontend/ui/details-installers.blp bottles/frontend/ui/details-preferences.blp bottles/frontend/ui/details-taskmanager.blp bottles/frontend/ui/details-versioning.blp -bottles/frontend/ui/details.blp +bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/dialog-bottle-picker.blp bottles/frontend/ui/dialog-crash-report.blp bottles/frontend/ui/dialog-deps-check.blp @@ -56,7 +56,7 @@ bottles/frontend/ui/window.blp bottles/frontend/views/bottle_details.py bottles/frontend/views/bottle_preferences.py bottles/frontend/views/bottle_versioning.py -bottles/frontend/views/details.py +bottles/frontend/views/bottle_details_view.py bottles/frontend/views/importer.py bottles/frontend/views/list.py bottles/frontend/views/loading.py From 783f57f56422b7bd29a26d9e7eb5ebdbf3cec451 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:46:46 -0500 Subject: [PATCH 07/47] bottle-details-page: Rename files and class name --- .../ui/{details-bottle.blp => bottle-details-page.blp} | 2 +- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../{bottle_details.py => bottle_details_page.py} | 10 +++++----- bottles/frontend/views/bottle_details_view.py | 4 ++-- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{details-bottle.blp => bottle-details-page.blp} (99%) rename bottles/frontend/views/{bottle_details.py => bottle_details_page.py} (99%) diff --git a/bottles/frontend/ui/details-bottle.blp b/bottles/frontend/ui/bottle-details-page.blp similarity index 99% rename from bottles/frontend/ui/details-bottle.blp rename to bottles/frontend/ui/bottle-details-page.blp index 3ad98f94fc..670faec879 100644 --- a/bottles/frontend/ui/details-bottle.blp +++ b/bottles/frontend/ui/bottle-details-page.blp @@ -140,7 +140,7 @@ Popover popover_exec_settings { } } -template $DetailsBottle: Adw.PreferencesPage { +template $BottleDetailsPage: Adw.PreferencesPage { Overlay drop_overlay { visible: false; diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 4a11de35b3..d07b4ee3eb 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -24,7 +24,7 @@ local-resource-entry.ui exclusion-pattern-entry.ui bottle-details-view.ui - details-bottle.ui + bottle-details-page.ui details-dependencies.ui details-installers.ui details-preferences.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 9d06830919..310286eea3 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -5,7 +5,7 @@ blueprints = custom_target('blueprints', 'component-entry-row.blp', 'check-row.blp', 'dependency-entry-row.blp', - 'details-bottle.blp', + 'bottle-details-page.blp', 'details-dependencies.blp', 'details-installers.blp', 'details-taskmanager.blp', diff --git a/bottles/frontend/views/bottle_details.py b/bottles/frontend/views/bottle_details_page.py similarity index 99% rename from bottles/frontend/views/bottle_details.py rename to bottles/frontend/views/bottle_details_page.py index c7f49ae0d0..57cd03a383 100644 --- a/bottles/frontend/views/bottle_details.py +++ b/bottles/frontend/views/bottle_details_page.py @@ -1,6 +1,6 @@ -# bottle_details.py +# bottle_details_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 @@ -46,9 +46,9 @@ from bottles.frontend.windows.upgradeversioning import UpgradeVersioningDialog -@Gtk.Template(resource_path="/com/usebottles/bottles/details-bottle.ui") -class BottleView(Adw.PreferencesPage): - __gtype_name__ = "DetailsBottle" +@Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-page.ui") +class BottleDetailsPage(Adw.PreferencesPage): + __gtype_name__ = "BottleDetailsPage" __registry = [] # region Widgets diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index b5fc5d6129..7a795ce413 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -26,7 +26,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.views.bottle_details import BottleView +from bottles.frontend.views.bottle_details_page import BottleDetailsPage from bottles.frontend.views.bottle_installers import InstallersView from bottles.frontend.views.bottle_dependencies import DependenciesView from bottles.frontend.views.bottle_preferences import PreferencesView @@ -75,7 +75,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.config = config self.queue = QueueManager(add_fn=self.lock_back, end_fn=self.unlock_back) - self.view_bottle = BottleView(self, config) + self.view_bottle = BottleDetailsPage(self, config) self.view_installers = InstallersView(self, config) self.view_dependencies = DependenciesView(self, config) self.view_preferences = PreferencesView(self, config) diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index e032322a0f..5e113414f1 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -11,7 +11,7 @@ bottles_sources = [ 'importer.py', 'loading.py', - 'bottle_details.py', + 'bottle_details_page.py', 'bottle_installers.py', 'bottle_dependencies.py', 'bottle_preferences.py', diff --git a/po/POTFILES b/po/POTFILES index cf7621d0db..195b35caba 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -8,7 +8,7 @@ bottles/frontend/operation.py bottles/frontend/ui/about.blp bottles/frontend/ui/component-entry-row.blp bottles/frontend/ui/dependency-entry-row.blp -bottles/frontend/ui/details-bottle.blp +bottles/frontend/ui/bottle-details-page.blp bottles/frontend/ui/details-dependencies.blp bottles/frontend/ui/details-installers.blp bottles/frontend/ui/details-preferences.blp @@ -53,7 +53,7 @@ bottles/frontend/ui/program-entry.blp bottles/frontend/ui/state-entry.blp bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp -bottles/frontend/views/bottle_details.py +bottles/frontend/views/bottle_details_page.py bottles/frontend/views/bottle_preferences.py bottles/frontend/views/bottle_versioning.py bottles/frontend/views/bottle_details_view.py From 6fc8c1f2ae13111edc685140d34471ff67590452 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 09:55:07 -0500 Subject: [PATCH 08/47] details-preferences-page: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...ls-preferences.blp => details-preferences-page.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_view.py | 4 ++-- ...ttle_preferences.py => details_preferences_page.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{details-preferences.blp => details-preferences-page.blp} (99%) rename bottles/frontend/views/{bottle_preferences.py => details_preferences_page.py} (99%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index d07b4ee3eb..984ab42c92 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -27,7 +27,7 @@ bottle-details-page.ui details-dependencies.ui details-installers.ui - details-preferences.ui + details-preferences-page.ui details-versioning.ui details-taskmanager.ui preferences.ui diff --git a/bottles/frontend/ui/details-preferences.blp b/bottles/frontend/ui/details-preferences-page.blp similarity index 99% rename from bottles/frontend/ui/details-preferences.blp rename to bottles/frontend/ui/details-preferences-page.blp index d92d861f57..58db442ef2 100644 --- a/bottles/frontend/ui/details-preferences.blp +++ b/bottles/frontend/ui/details-preferences-page.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $DetailsPreferences: Adw.PreferencesPage { +template $DetailsPreferencesPage: Adw.PreferencesPage { Adw.PreferencesGroup group_details { Adw.EntryRow entry_name { title: _("Name"); diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 310286eea3..0c3b8801b8 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -52,7 +52,7 @@ blueprints = custom_target('blueprints', 'state-entry.blp', 'task-entry.blp', 'window.blp', - 'details-preferences.blp', + 'details-preferences-page.blp', 'help-overlay.blp', ), output: '.', diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index 7a795ce413..d88b8b2b5f 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -29,7 +29,7 @@ from bottles.frontend.views.bottle_details_page import BottleDetailsPage from bottles.frontend.views.bottle_installers import InstallersView from bottles.frontend.views.bottle_dependencies import DependenciesView -from bottles.frontend.views.bottle_preferences import PreferencesView +from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage from bottles.frontend.views.bottle_versioning import VersioningView from bottles.frontend.views.bottle_taskmanager import TaskManagerView @@ -78,7 +78,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.view_bottle = BottleDetailsPage(self, config) self.view_installers = InstallersView(self, config) self.view_dependencies = DependenciesView(self, config) - self.view_preferences = PreferencesView(self, config) + self.view_preferences = DetailsPreferencesPage(self, config) self.view_versioning = VersioningView(self, config) self.view_taskmanager = TaskManagerView(self, config) diff --git a/bottles/frontend/views/bottle_preferences.py b/bottles/frontend/views/details_preferences_page.py similarity index 99% rename from bottles/frontend/views/bottle_preferences.py rename to bottles/frontend/views/details_preferences_page.py index 754576baed..77a65cc439 100644 --- a/bottles/frontend/views/bottle_preferences.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -1,6 +1,6 @@ -# bottle_preferences.py +# details_preferences_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 @@ -60,9 +60,9 @@ # noinspection PyUnusedLocal -@Gtk.Template(resource_path="/com/usebottles/bottles/details-preferences.ui") -class PreferencesView(Adw.PreferencesPage): - __gtype_name__ = "DetailsPreferences" +@Gtk.Template(resource_path="/com/usebottles/bottles/details-preferences-page.ui") +class DetailsPreferencesPage(Adw.PreferencesPage): + __gtype_name__ = "DetailsPreferencesPage" # region Widgets btn_manage_gamescope = Gtk.Template.Child() diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index 5e113414f1..b1b5e8b99c 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -14,7 +14,7 @@ bottles_sources = [ 'bottle_details_page.py', 'bottle_installers.py', 'bottle_dependencies.py', - 'bottle_preferences.py', + 'details_preferences_page.py', 'bottle_versioning.py', 'bottle_taskmanager.py' ] diff --git a/po/POTFILES b/po/POTFILES index 195b35caba..ef3153b29f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -11,7 +11,7 @@ bottles/frontend/ui/dependency-entry-row.blp bottles/frontend/ui/bottle-details-page.blp bottles/frontend/ui/details-dependencies.blp bottles/frontend/ui/details-installers.blp -bottles/frontend/ui/details-preferences.blp +bottles/frontend/ui/details-preferences-page.blp bottles/frontend/ui/details-taskmanager.blp bottles/frontend/ui/details-versioning.blp bottles/frontend/ui/bottle-details-view.blp @@ -54,7 +54,7 @@ bottles/frontend/ui/state-entry.blp bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp bottles/frontend/views/bottle_details_page.py -bottles/frontend/views/bottle_preferences.py +bottles/frontend/views/details_preferences_page.py bottles/frontend/views/bottle_versioning.py bottles/frontend/views/bottle_details_view.py bottles/frontend/views/importer.py From fb7bfbac3a8371a5a55f37b749e2f7ea5b778c61 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 14:53:23 -0500 Subject: [PATCH 09/47] details-task-manager-view: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...s-taskmanager.blp => details-task-manager-view.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_view.py | 4 ++-- ...tle_taskmanager.py => details_task_manager_view.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename bottles/frontend/ui/{details-taskmanager.blp => details-task-manager-view.blp} (88%) rename bottles/frontend/views/{bottle_taskmanager.py => details_task_manager_view.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 984ab42c92..2ce0639f32 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -29,7 +29,7 @@ details-installers.ui details-preferences-page.ui details-versioning.ui - details-taskmanager.ui + details-task-manager-view.ui preferences.ui importer.ui library.ui diff --git a/bottles/frontend/ui/details-taskmanager.blp b/bottles/frontend/ui/details-task-manager-view.blp similarity index 88% rename from bottles/frontend/ui/details-taskmanager.blp rename to bottles/frontend/ui/details-task-manager-view.blp index ec78ea5649..ffe6f192dc 100644 --- a/bottles/frontend/ui/details-taskmanager.blp +++ b/bottles/frontend/ui/details-task-manager-view.blp @@ -1,6 +1,6 @@ using Gtk 4.0; -template $TaskManagerView: ScrolledWindow { +template $DetailsTaskManagerView: ScrolledWindow { TreeView treeview_processes { enable-grid-lines: horizontal; diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 0c3b8801b8..4fddb0b19b 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -8,7 +8,7 @@ blueprints = custom_target('blueprints', 'bottle-details-page.blp', 'details-dependencies.blp', 'details-installers.blp', - 'details-taskmanager.blp', + 'details-task-manager-view.blp', 'details-versioning.blp', 'bottle-details-view.blp', 'dialog-bottle-picker.blp', diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index d88b8b2b5f..85a14b1b19 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -31,7 +31,7 @@ from bottles.frontend.views.bottle_dependencies import DependenciesView from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage from bottles.frontend.views.bottle_versioning import VersioningView -from bottles.frontend.views.bottle_taskmanager import TaskManagerView +from bottles.frontend.views.details_task_manager_view import DetailsTaskManagerView @Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-view.ui") @@ -80,7 +80,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.view_dependencies = DependenciesView(self, config) self.view_preferences = DetailsPreferencesPage(self, config) self.view_versioning = VersioningView(self, config) - self.view_taskmanager = TaskManagerView(self, config) + self.view_taskmanager = DetailsTaskManagerView(self, config) self.btn_back.connect("clicked", self.go_back) self.btn_back_sidebar.connect("clicked", self.go_back_sidebar) diff --git a/bottles/frontend/views/bottle_taskmanager.py b/bottles/frontend/views/details_task_manager_view.py similarity index 96% rename from bottles/frontend/views/bottle_taskmanager.py rename to bottles/frontend/views/details_task_manager_view.py index 012ab11c6b..f2d6d25a7b 100644 --- a/bottles/frontend/views/bottle_taskmanager.py +++ b/bottles/frontend/views/details_task_manager_view.py @@ -1,6 +1,6 @@ -# taskmanager.py +# details_task_manager_view.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.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/details-taskmanager.ui") -class TaskManagerView(Gtk.ScrolledWindow): - __gtype_name__ = "TaskManagerView" +@Gtk.Template(resource_path="/com/usebottles/bottles/details-task-manager-view.ui") +class DetailsTaskManagerView(Gtk.ScrolledWindow): + __gtype_name__ = "DetailsTaskManagerView" # region Widgets treeview_processes = Gtk.Template.Child() diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index b1b5e8b99c..929e8ceecf 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -16,7 +16,7 @@ bottles_sources = [ 'bottle_dependencies.py', 'details_preferences_page.py', 'bottle_versioning.py', - 'bottle_taskmanager.py' + 'details_task_manager_view.py' ] install_data(bottles_sources, install_dir: viewsdir) diff --git a/po/POTFILES b/po/POTFILES index ef3153b29f..73a6733d83 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -12,7 +12,7 @@ bottles/frontend/ui/bottle-details-page.blp bottles/frontend/ui/details-dependencies.blp bottles/frontend/ui/details-installers.blp bottles/frontend/ui/details-preferences-page.blp -bottles/frontend/ui/details-taskmanager.blp +bottles/frontend/ui/details-task-manager-view.blp bottles/frontend/ui/details-versioning.blp bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/dialog-bottle-picker.blp From a4d5642b9c28026927059b4176a5b2c263bb890e Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 14:57:34 -0500 Subject: [PATCH 10/47] details-versioning-page: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...ails-versioning.blp => details-versioning-page.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_view.py | 4 ++-- ...bottle_versioning.py => details_versioning_page.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{details-versioning.blp => details-versioning-page.blp} (96%) rename bottles/frontend/views/{bottle_versioning.py => details_versioning_page.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 2ce0639f32..a15b956ad3 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -28,7 +28,7 @@ details-dependencies.ui details-installers.ui details-preferences-page.ui - details-versioning.ui + details-versioning-page.ui details-task-manager-view.ui preferences.ui importer.ui diff --git a/bottles/frontend/ui/details-versioning.blp b/bottles/frontend/ui/details-versioning-page.blp similarity index 96% rename from bottles/frontend/ui/details-versioning.blp rename to bottles/frontend/ui/details-versioning-page.blp index 11458e8e96..99bc65a74b 100644 --- a/bottles/frontend/ui/details-versioning.blp +++ b/bottles/frontend/ui/details-versioning-page.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $DetailsVersioning: Adw.PreferencesPage { +template $DetailsVersioningPage: Adw.PreferencesPage { Adw.PreferencesPage pref_page { Adw.PreferencesGroup { ListBox list_states { diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 4fddb0b19b..ebf643b64c 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -9,7 +9,7 @@ blueprints = custom_target('blueprints', 'details-dependencies.blp', 'details-installers.blp', 'details-task-manager-view.blp', - 'details-versioning.blp', + 'details-versioning-page.blp', 'bottle-details-view.blp', 'dialog-bottle-picker.blp', 'dialog-crash-report.blp', diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index 85a14b1b19..6d448c8b5c 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -30,7 +30,7 @@ from bottles.frontend.views.bottle_installers import InstallersView from bottles.frontend.views.bottle_dependencies import DependenciesView from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage -from bottles.frontend.views.bottle_versioning import VersioningView +from bottles.frontend.views.details_versioning_page import DetailsVersioningPage from bottles.frontend.views.details_task_manager_view import DetailsTaskManagerView @@ -79,7 +79,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.view_installers = InstallersView(self, config) self.view_dependencies = DependenciesView(self, config) self.view_preferences = DetailsPreferencesPage(self, config) - self.view_versioning = VersioningView(self, config) + self.view_versioning = DetailsVersioningPage(self, config) self.view_taskmanager = DetailsTaskManagerView(self, config) self.btn_back.connect("clicked", self.go_back) diff --git a/bottles/frontend/views/bottle_versioning.py b/bottles/frontend/views/details_versioning_page.py similarity index 96% rename from bottles/frontend/views/bottle_versioning.py rename to bottles/frontend/views/details_versioning_page.py index 4c2539a176..946a620684 100644 --- a/bottles/frontend/views/bottle_versioning.py +++ b/bottles/frontend/views/details_versioning_page.py @@ -1,6 +1,6 @@ -# bottle_versioning.py +# details_versioning_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 @@ -27,9 +27,9 @@ from bottles.frontend.widgets.state import StateEntry -@Gtk.Template(resource_path="/com/usebottles/bottles/details-versioning.ui") -class VersioningView(Adw.PreferencesPage): - __gtype_name__ = "DetailsVersioning" +@Gtk.Template(resource_path="/com/usebottles/bottles/details-versioning-page.ui") +class DetailsVersioningPage(Adw.PreferencesPage): + __gtype_name__ = "DetailsVersioningPage" __registry = [] # region Widgets diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index 929e8ceecf..403cddf5d0 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -15,7 +15,7 @@ bottles_sources = [ 'bottle_installers.py', 'bottle_dependencies.py', 'details_preferences_page.py', - 'bottle_versioning.py', + 'details_versioning_page.py', 'details_task_manager_view.py' ] diff --git a/po/POTFILES b/po/POTFILES index 73a6733d83..ecc9d310a5 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -13,7 +13,7 @@ bottles/frontend/ui/details-dependencies.blp bottles/frontend/ui/details-installers.blp bottles/frontend/ui/details-preferences-page.blp bottles/frontend/ui/details-task-manager-view.blp -bottles/frontend/ui/details-versioning.blp +bottles/frontend/ui/details-versioning-page.blp bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/dialog-bottle-picker.blp bottles/frontend/ui/dialog-crash-report.blp @@ -55,7 +55,7 @@ bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp bottles/frontend/views/bottle_details_page.py bottles/frontend/views/details_preferences_page.py -bottles/frontend/views/bottle_versioning.py +bottles/frontend/views/details_versioning_page.py bottles/frontend/views/bottle_details_view.py bottles/frontend/views/importer.py bottles/frontend/views/list.py From fc459aec9d0307ed3d4a4b4b769cbd1f635f4e7f Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:00:30 -0500 Subject: [PATCH 11/47] bottle-picker-dialog: Rename files --- bottles/frontend/main.py | 2 +- .../{dialog-bottle-picker.blp => bottle-picker-dialog.blp} | 0 bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../windows/{bottlepicker.py => bottle_picker_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-bottle-picker.blp => bottle-picker-dialog.blp} (100%) rename bottles/frontend/windows/{bottlepicker.py => bottle_picker_dialog.py} (94%) diff --git a/bottles/frontend/main.py b/bottles/frontend/main.py index 31ed3cd3ea..3df92f69be 100644 --- a/bottles/frontend/main.py +++ b/bottles/frontend/main.py @@ -217,7 +217,7 @@ def __process_uri(self, uri): return 0 try: - from bottles.frontend.windows.bottlepicker import BottlePickerDialog + from bottles.frontend.windows.bottle_picker_dialog import BottlePickerDialog dialog = BottlePickerDialog(application=self, arg_exe=uri) dialog.present() diff --git a/bottles/frontend/ui/dialog-bottle-picker.blp b/bottles/frontend/ui/bottle-picker-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-bottle-picker.blp rename to bottles/frontend/ui/bottle-picker-dialog.blp diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index a15b956ad3..9e77f6bbc3 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -48,7 +48,7 @@ dialog-journal.ui dialog-sandbox.ui dialog-installer.ui - dialog-bottle-picker.ui + bottle-picker-dialog.ui dialog-proton-alert.ui dialog-deps-check.ui dialog-exclusion-patterns.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index ebf643b64c..4c019deddf 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -11,7 +11,7 @@ blueprints = custom_target('blueprints', 'details-task-manager-view.blp', 'details-versioning-page.blp', 'bottle-details-view.blp', - 'dialog-bottle-picker.blp', + 'bottle-picker-dialog.blp', 'dialog-crash-report.blp', 'dialog-deps-check.blp', 'dialog-dll-overrides.blp', diff --git a/bottles/frontend/windows/bottlepicker.py b/bottles/frontend/windows/bottle_picker_dialog.py similarity index 94% rename from bottles/frontend/windows/bottlepicker.py rename to bottles/frontend/windows/bottle_picker_dialog.py index 89047f74fa..9332fc9327 100644 --- a/bottles/frontend/windows/bottlepicker.py +++ b/bottles/frontend/windows/bottle_picker_dialog.py @@ -1,6 +1,6 @@ -# bottlepicker.py +# bottle_picker_dialog.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 @@ -31,7 +31,7 @@ def __init__(self, config: BottleConfig): self.set_title(config.Name) -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-bottle-picker.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/bottle-picker-dialog.ui") class BottlePickerDialog(Adw.ApplicationWindow): """This class should not be called from the application GUI, only from CLI.""" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index ab7578824e..a9b33f6d13 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -19,7 +19,7 @@ bottles_sources = [ 'display.py', 'generic_cli.py', 'journal.py', - 'bottlepicker.py', + 'bottle_picker_dialog.py', 'protonalert.py', 'sandbox.py', 'installer.py', diff --git a/po/POTFILES b/po/POTFILES index ecc9d310a5..1ac308d1e1 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -15,7 +15,7 @@ bottles/frontend/ui/details-preferences-page.blp bottles/frontend/ui/details-task-manager-view.blp bottles/frontend/ui/details-versioning-page.blp bottles/frontend/ui/bottle-details-view.blp -bottles/frontend/ui/dialog-bottle-picker.blp +bottles/frontend/ui/bottle-picker-dialog.blp bottles/frontend/ui/dialog-crash-report.blp bottles/frontend/ui/dialog-deps-check.blp bottles/frontend/ui/dialog-dll-overrides.blp From 1da8deae65ccad6ff3d54676d44004c4fddb77ea Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:04:05 -0500 Subject: [PATCH 12/47] crash-report-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{dialog-crash-report.blp => crash-report-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- .../frontend/windows/{crash.py => crash_report_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-crash-report.blp => crash-report-dialog.blp} (100%) rename bottles/frontend/windows/{crash.py => crash_report_dialog.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 9e77f6bbc3..33b0f72c6d 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -36,7 +36,7 @@ dialog-launch-options.ui dialog-dll-overrides.ui dialog-env-vars.ui - dialog-crash-report.ui + crash-report-dialog.ui dialog-duplicate.ui dialog-rename.ui dialog-gamescope.ui diff --git a/bottles/frontend/ui/dialog-crash-report.blp b/bottles/frontend/ui/crash-report-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-crash-report.blp rename to bottles/frontend/ui/crash-report-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 4c019deddf..2c641ad4a3 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -12,7 +12,7 @@ blueprints = custom_target('blueprints', 'details-versioning-page.blp', 'bottle-details-view.blp', 'bottle-picker-dialog.blp', - 'dialog-crash-report.blp', + 'crash-report-dialog.blp', 'dialog-deps-check.blp', 'dialog-dll-overrides.blp', 'dialog-drives.blp', diff --git a/bottles/frontend/windows/crash.py b/bottles/frontend/windows/crash_report_dialog.py similarity index 97% rename from bottles/frontend/windows/crash.py rename to bottles/frontend/windows/crash_report_dialog.py index 351f0f3d1b..f7cfc7ea29 100644 --- a/bottles/frontend/windows/crash.py +++ b/bottles/frontend/windows/crash_report_dialog.py @@ -1,6 +1,6 @@ -# crash.py +# crash_report_dialog.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 @@ -45,7 +45,7 @@ def __on_btn_report_clicked(button, report): webbrowser.open(report["html_url"]) -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-crash-report.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/crash-report-dialog.ui") class CrashReportDialog(Adw.Window): __gtype_name__ = "CrashReportDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index a9b33f6d13..34635aeb3b 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -3,7 +3,7 @@ dialogsdir = join_paths(pkgdatadir, 'bottles/frontend/windows') bottles_sources = [ '__init__.py', - 'crash.py', + 'crash_report_dialog.py', 'dlloverrides.py', 'duplicate.py', 'envvars.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index 3881853619..aa43bb0733 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -43,7 +43,7 @@ from bottles.frontend.views.loading import LoadingView from bottles.frontend.views.new_bottle_dialog import NewBottleDialog from bottles.frontend.views.preferences import PreferencesWindow -from bottles.frontend.windows.crash import CrashReportDialog +from bottles.frontend.windows.crash_report_dialog import CrashReportDialog from bottles.frontend.windows.depscheck import DependenciesCheckDialog from bottles.frontend.windows.onboard import OnboardDialog diff --git a/po/POTFILES b/po/POTFILES index 1ac308d1e1..5ecfd1cf95 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -16,7 +16,7 @@ bottles/frontend/ui/details-task-manager-view.blp bottles/frontend/ui/details-versioning-page.blp bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/bottle-picker-dialog.blp -bottles/frontend/ui/dialog-crash-report.blp +bottles/frontend/ui/crash-report-dialog.blp bottles/frontend/ui/dialog-deps-check.blp bottles/frontend/ui/dialog-dll-overrides.blp bottles/frontend/ui/dialog-drives.blp @@ -69,7 +69,7 @@ bottles/frontend/widgets/installer.py bottles/frontend/widgets/library.py bottles/frontend/widgets/program.py bottles/frontend/widgets/state.py -bottles/frontend/windows/crash.py +bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display.py bottles/frontend/windows/dlloverrides.py bottles/frontend/windows/drives.py From e87a21172c055da76ffe99eb08f9346f01a78901 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:15:02 -0500 Subject: [PATCH 13/47] details-dependencies-view: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...-dependencies.blp => details-dependencies-view.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_view.py | 4 ++-- ...le_dependencies.py => details_dependencies_view.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename bottles/frontend/ui/{details-dependencies.blp => details-dependencies-view.blp} (97%) rename bottles/frontend/views/{bottle_dependencies.py => details_dependencies_view.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 33b0f72c6d..d7bdfcfebd 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -25,7 +25,7 @@ exclusion-pattern-entry.ui bottle-details-view.ui bottle-details-page.ui - details-dependencies.ui + details-dependencies-view.ui details-installers.ui details-preferences-page.ui details-versioning-page.ui diff --git a/bottles/frontend/ui/details-dependencies.blp b/bottles/frontend/ui/details-dependencies-view.blp similarity index 97% rename from bottles/frontend/ui/details-dependencies.blp rename to bottles/frontend/ui/details-dependencies-view.blp index 7565f545d4..6524212f1a 100644 --- a/bottles/frontend/ui/details-dependencies.blp +++ b/bottles/frontend/ui/details-dependencies-view.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $DetailsDependencies: Adw.Bin { +template $DetailsDependenciesView: Adw.Bin { Box { orientation: vertical; diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 2c641ad4a3..ea27c69621 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -6,7 +6,7 @@ blueprints = custom_target('blueprints', 'check-row.blp', 'dependency-entry-row.blp', 'bottle-details-page.blp', - 'details-dependencies.blp', + 'details-dependencies-view.blp', 'details-installers.blp', 'details-task-manager-view.blp', 'details-versioning-page.blp', diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index 6d448c8b5c..f55fa51378 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -28,7 +28,7 @@ from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.views.bottle_details_page import BottleDetailsPage from bottles.frontend.views.bottle_installers import InstallersView -from bottles.frontend.views.bottle_dependencies import DependenciesView +from bottles.frontend.views.details_dependencies_view import DetailsDependenciesView from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage from bottles.frontend.views.details_versioning_page import DetailsVersioningPage from bottles.frontend.views.details_task_manager_view import DetailsTaskManagerView @@ -77,7 +77,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.view_bottle = BottleDetailsPage(self, config) self.view_installers = InstallersView(self, config) - self.view_dependencies = DependenciesView(self, config) + self.view_dependencies = DetailsDependenciesView(self, config) self.view_preferences = DetailsPreferencesPage(self, config) self.view_versioning = DetailsVersioningPage(self, config) self.view_taskmanager = DetailsTaskManagerView(self, config) diff --git a/bottles/frontend/views/bottle_dependencies.py b/bottles/frontend/views/details_dependencies_view.py similarity index 96% rename from bottles/frontend/views/bottle_dependencies.py rename to bottles/frontend/views/details_dependencies_view.py index fb88732ffa..e93bcea5c8 100644 --- a/bottles/frontend/views/bottle_dependencies.py +++ b/bottles/frontend/views/details_dependencies_view.py @@ -1,6 +1,6 @@ -# bottle_installers.py +# details_dependencies_view.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 @@ -28,9 +28,9 @@ from bottles.frontend.widgets.dependency_entry_row import DependencyEntryRow -@Gtk.Template(resource_path="/com/usebottles/bottles/details-dependencies.ui") -class DependenciesView(Adw.Bin): - __gtype_name__ = "DetailsDependencies" +@Gtk.Template(resource_path="/com/usebottles/bottles/details-dependencies-view.ui") +class DetailsDependenciesView(Adw.Bin): + __gtype_name__ = "DetailsDependenciesView" __registry = [] # region Widgets diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index 403cddf5d0..b90899b56d 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -13,7 +13,7 @@ bottles_sources = [ 'bottle_details_page.py', 'bottle_installers.py', - 'bottle_dependencies.py', + 'details_dependencies_view.py', 'details_preferences_page.py', 'details_versioning_page.py', 'details_task_manager_view.py' diff --git a/po/POTFILES b/po/POTFILES index 5ecfd1cf95..f1ec9d71ec 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -9,7 +9,7 @@ bottles/frontend/ui/about.blp bottles/frontend/ui/component-entry-row.blp bottles/frontend/ui/dependency-entry-row.blp bottles/frontend/ui/bottle-details-page.blp -bottles/frontend/ui/details-dependencies.blp +bottles/frontend/ui/details-dependencies-view.blp bottles/frontend/ui/details-installers.blp bottles/frontend/ui/details-preferences-page.blp bottles/frontend/ui/details-task-manager-view.blp From f7572c3e564eacdcdc401a72772e788588ab234d Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:17:47 -0500 Subject: [PATCH 14/47] details-installers-view: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...ails-installers.blp => details-installers-view.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_view.py | 4 ++-- ...bottle_installers.py => details_installers_view.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename bottles/frontend/ui/{details-installers.blp => details-installers-view.blp} (97%) rename bottles/frontend/views/{bottle_installers.py => details_installers_view.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index d7bdfcfebd..bd84ecf954 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -26,7 +26,7 @@ bottle-details-view.ui bottle-details-page.ui details-dependencies-view.ui - details-installers.ui + details-installers-view.ui details-preferences-page.ui details-versioning-page.ui details-task-manager-view.ui diff --git a/bottles/frontend/ui/details-installers.blp b/bottles/frontend/ui/details-installers-view.blp similarity index 97% rename from bottles/frontend/ui/details-installers.blp rename to bottles/frontend/ui/details-installers-view.blp index 26de77fd26..c4dec9dcb5 100644 --- a/bottles/frontend/ui/details-installers.blp +++ b/bottles/frontend/ui/details-installers-view.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $DetailsInstallers: Adw.Bin { +template $DetailsInstallersView: Adw.Bin { Box { orientation: vertical; diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index ea27c69621..3f65f39a59 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -7,7 +7,7 @@ blueprints = custom_target('blueprints', 'dependency-entry-row.blp', 'bottle-details-page.blp', 'details-dependencies-view.blp', - 'details-installers.blp', + 'details-installers-view.blp', 'details-task-manager-view.blp', 'details-versioning-page.blp', 'bottle-details-view.blp', diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/views/bottle_details_view.py index f55fa51378..92285f2e80 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/views/bottle_details_view.py @@ -27,7 +27,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.views.bottle_details_page import BottleDetailsPage -from bottles.frontend.views.bottle_installers import InstallersView +from bottles.frontend.views.details_installers_view import DetailsInstallersView from bottles.frontend.views.details_dependencies_view import DetailsDependenciesView from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage from bottles.frontend.views.details_versioning_page import DetailsVersioningPage @@ -76,7 +76,7 @@ def __init__(self, window, config: Optional[BottleConfig] = None, **kwargs): self.queue = QueueManager(add_fn=self.lock_back, end_fn=self.unlock_back) self.view_bottle = BottleDetailsPage(self, config) - self.view_installers = InstallersView(self, config) + self.view_installers = DetailsInstallersView(self, config) self.view_dependencies = DetailsDependenciesView(self, config) self.view_preferences = DetailsPreferencesPage(self, config) self.view_versioning = DetailsVersioningPage(self, config) diff --git a/bottles/frontend/views/bottle_installers.py b/bottles/frontend/views/details_installers_view.py similarity index 96% rename from bottles/frontend/views/bottle_installers.py rename to bottles/frontend/views/details_installers_view.py index 8d83ca00ab..16513653cf 100644 --- a/bottles/frontend/views/bottle_installers.py +++ b/bottles/frontend/views/details_installers_view.py @@ -1,6 +1,6 @@ -# bottle_installers.py +# details_installers_view.py # -# Copyright 2022 brombinmirko +# Copyright 2025 The Bottle 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.installer import InstallerEntry -@Gtk.Template(resource_path="/com/usebottles/bottles/details-installers.ui") -class InstallersView(Adw.Bin): - __gtype_name__ = "DetailsInstallers" +@Gtk.Template(resource_path="/com/usebottles/bottles/details-installers-view.ui") +class DetailsInstallersView(Adw.Bin): + __gtype_name__ = "DetailsInstallersView" __registry = [] # region Widgets diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index b90899b56d..a2dbe3e8e8 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -12,7 +12,7 @@ bottles_sources = [ 'loading.py', 'bottle_details_page.py', - 'bottle_installers.py', + 'details_installers_view.py', 'details_dependencies_view.py', 'details_preferences_page.py', 'details_versioning_page.py', diff --git a/po/POTFILES b/po/POTFILES index f1ec9d71ec..3387a6eb96 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -10,7 +10,7 @@ bottles/frontend/ui/component-entry-row.blp bottles/frontend/ui/dependency-entry-row.blp bottles/frontend/ui/bottle-details-page.blp bottles/frontend/ui/details-dependencies-view.blp -bottles/frontend/ui/details-installers.blp +bottles/frontend/ui/details-installers-view.blp bottles/frontend/ui/details-preferences-page.blp bottles/frontend/ui/details-task-manager-view.blp bottles/frontend/ui/details-versioning-page.blp From f95f07375b69c09b2b6dfbddbc10465e8b4825a4 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:22:04 -0500 Subject: [PATCH 15/47] dependencies-check-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...{dialog-deps-check.blp => dependencies-check-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- .../windows/{depscheck.py => dependencies_check_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-deps-check.blp => dependencies-check-dialog.blp} (100%) rename bottles/frontend/windows/{depscheck.py => dependencies_check_dialog.py} (87%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index bd84ecf954..09987112f4 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -50,7 +50,7 @@ dialog-installer.ui bottle-picker-dialog.ui dialog-proton-alert.ui - dialog-deps-check.ui + dependencies-check-dialog.ui dialog-exclusion-patterns.ui dialog-upgrade-versioning.ui dialog-vmtouch.ui diff --git a/bottles/frontend/ui/dialog-deps-check.blp b/bottles/frontend/ui/dependencies-check-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-deps-check.blp rename to bottles/frontend/ui/dependencies-check-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 3f65f39a59..e6bd8e141f 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -13,7 +13,7 @@ blueprints = custom_target('blueprints', 'bottle-details-view.blp', 'bottle-picker-dialog.blp', 'crash-report-dialog.blp', - 'dialog-deps-check.blp', + 'dependencies-check-dialog.blp', 'dialog-dll-overrides.blp', 'dialog-drives.blp', 'dialog-duplicate.blp', diff --git a/bottles/frontend/windows/depscheck.py b/bottles/frontend/windows/dependencies_check_dialog.py similarity index 87% rename from bottles/frontend/windows/depscheck.py rename to bottles/frontend/windows/dependencies_check_dialog.py index 9e4b7186bc..e8653b9302 100644 --- a/bottles/frontend/windows/depscheck.py +++ b/bottles/frontend/windows/dependencies_check_dialog.py @@ -1,6 +1,6 @@ -# depscheck.py +# dependencies_check_dialog.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 @@ -18,7 +18,7 @@ from gi.repository import Gtk, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-deps-check.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/dependencies-check-dialog.ui") class DependenciesCheckDialog(Adw.Window): __gtype_name__ = "DependenciesCheckDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 34635aeb3b..9e35bcac3d 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -23,7 +23,7 @@ bottles_sources = [ 'protonalert.py', 'sandbox.py', 'installer.py', - 'depscheck.py', + 'dependencies_check_dialog.py', 'exclusionpatterns.py', 'upgradeversioning.py', 'vmtouch.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index aa43bb0733..8465f86850 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -44,7 +44,7 @@ from bottles.frontend.views.new_bottle_dialog import NewBottleDialog from bottles.frontend.views.preferences import PreferencesWindow from bottles.frontend.windows.crash_report_dialog import CrashReportDialog -from bottles.frontend.windows.depscheck import DependenciesCheckDialog +from bottles.frontend.windows.dependencies_check_dialog import DependenciesCheckDialog from bottles.frontend.windows.onboard import OnboardDialog logging = Logger() diff --git a/po/POTFILES b/po/POTFILES index 3387a6eb96..f26fae3abb 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -17,7 +17,7 @@ bottles/frontend/ui/details-versioning-page.blp bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/bottle-picker-dialog.blp bottles/frontend/ui/crash-report-dialog.blp -bottles/frontend/ui/dialog-deps-check.blp +bottles/frontend/ui/dependencies-check-dialog.blp bottles/frontend/ui/dialog-dll-overrides.blp bottles/frontend/ui/dialog-drives.blp bottles/frontend/ui/dialog-duplicate.blp From ab72674475c8e6101cdcb65d70df99145eed3978 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:25:33 -0500 Subject: [PATCH 16/47] display-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../frontend/ui/{dialog-display.blp => display-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/{display.py => display_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-display.blp => display-dialog.blp} (100%) rename bottles/frontend/windows/{display.py => display_dialog.py} (98%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 09987112f4..60090cacba 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -43,7 +43,7 @@ dialog-vkbasalt.ui dialog-fsr.ui dialog-mangohud.ui - dialog-display.ui + display-dialog.ui dialog-drives.ui dialog-journal.ui dialog-sandbox.ui diff --git a/bottles/frontend/ui/dialog-display.blp b/bottles/frontend/ui/display-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-display.blp rename to bottles/frontend/ui/display-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index e6bd8e141f..c840ddb9bf 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -28,7 +28,7 @@ blueprints = custom_target('blueprints', 'dialog-sandbox.blp', 'dialog-upgrade-versioning.blp', 'dialog-vkbasalt.blp', - 'dialog-display.blp', + 'display-dialog.blp', 'dialog-vmtouch.blp', 'dialog-fsr.blp', 'dialog-mangohud.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 77a65cc439..8a40b71635 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -43,7 +43,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.regkeys import RegKeys from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.windows.display import DisplayDialog +from bottles.frontend.windows.display_dialog import DisplayDialog from bottles.frontend.windows.dlloverrides import DLLOverridesDialog from bottles.frontend.windows.drives import DrivesDialog from bottles.frontend.windows.envvars import EnvironmentVariablesDialog diff --git a/bottles/frontend/windows/display.py b/bottles/frontend/windows/display_dialog.py similarity index 98% rename from bottles/frontend/windows/display.py rename to bottles/frontend/windows/display_dialog.py index 2948d913b1..0d6ce73806 100644 --- a/bottles/frontend/windows/display.py +++ b/bottles/frontend/windows/display_dialog.py @@ -1,6 +1,6 @@ -# display.py +# display_dialog.py # -# Copyright 2022 Bottles Developers +# 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 @@ -30,7 +30,7 @@ renderers = ["gl", "gdi", "vulkan"] -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-display.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/display-dialog.ui") class DisplayDialog(Adw.Window): __gtype_name__ = "DisplayDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 9e35bcac3d..5ea4065ae9 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -16,7 +16,7 @@ bottles_sources = [ 'vkbasalt.py', 'fsr.py', 'mangohud.py', - 'display.py', + 'display_dialog.py', 'generic_cli.py', 'journal.py', 'bottle_picker_dialog.py', diff --git a/po/POTFILES b/po/POTFILES index f26fae3abb..57278c2d9f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -70,7 +70,7 @@ bottles/frontend/widgets/library.py bottles/frontend/widgets/program.py bottles/frontend/widgets/state.py bottles/frontend/windows/crash_report_dialog.py -bottles/frontend/windows/display.py +bottles/frontend/windows/display_dialog.py bottles/frontend/windows/dlloverrides.py bottles/frontend/windows/drives.py bottles/frontend/windows/envvars.py From 7a4b2dfc96076c9be48716a9dd2705a708ab07f3 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:27:43 -0500 Subject: [PATCH 17/47] dll-overrides-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../{dialog-dll-overrides.blp => dll-overrides-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 2 +- .../windows/{dlloverrides.py => dll_overrides_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-dll-overrides.blp => dll-overrides-dialog.blp} (100%) rename bottles/frontend/windows/{dlloverrides.py => dll_overrides_dialog.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 60090cacba..1d9840ceb0 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -34,7 +34,7 @@ importer.ui library.ui dialog-launch-options.ui - dialog-dll-overrides.ui + dll-overrides-dialog.ui dialog-env-vars.ui crash-report-dialog.ui dialog-duplicate.ui diff --git a/bottles/frontend/ui/dialog-dll-overrides.blp b/bottles/frontend/ui/dll-overrides-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-dll-overrides.blp rename to bottles/frontend/ui/dll-overrides-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index c840ddb9bf..f91c1869ac 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -14,7 +14,7 @@ blueprints = custom_target('blueprints', 'bottle-picker-dialog.blp', 'crash-report-dialog.blp', 'dependencies-check-dialog.blp', - 'dialog-dll-overrides.blp', + 'dll-overrides-dialog.blp', 'dialog-drives.blp', 'dialog-duplicate.blp', 'dialog-env-vars.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 8a40b71635..70f162a34d 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -44,7 +44,7 @@ from bottles.backend.wine.regkeys import RegKeys from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.windows.display_dialog import DisplayDialog -from bottles.frontend.windows.dlloverrides import DLLOverridesDialog +from bottles.frontend.windows.dll_overrides_dialog import DLLOverridesDialog from bottles.frontend.windows.drives import DrivesDialog from bottles.frontend.windows.envvars import EnvironmentVariablesDialog from bottles.frontend.windows.exclusionpatterns import ExclusionPatternsDialog diff --git a/bottles/frontend/windows/dlloverrides.py b/bottles/frontend/windows/dll_overrides_dialog.py similarity index 97% rename from bottles/frontend/windows/dlloverrides.py rename to bottles/frontend/windows/dll_overrides_dialog.py index 5cf47082e7..0229554a14 100644 --- a/bottles/frontend/windows/dlloverrides.py +++ b/bottles/frontend/windows/dll_overrides_dialog.py @@ -1,6 +1,6 @@ -# dlloverrides.py +# dll_overrides_dialog.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 @@ -81,7 +81,7 @@ def __remove_override(self, *_args): self.get_parent().remove(self) -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-dll-overrides.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/dll-overrides-dialog.ui") class DLLOverridesDialog(Adw.PreferencesWindow): __gtype_name__ = "DLLOverridesDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 5ea4065ae9..8dda72df18 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -4,7 +4,7 @@ dialogsdir = join_paths(pkgdatadir, 'bottles/frontend/windows') bottles_sources = [ '__init__.py', 'crash_report_dialog.py', - 'dlloverrides.py', + 'dll_overrides_dialog.py', 'duplicate.py', 'envvars.py', 'generic.py', diff --git a/po/POTFILES b/po/POTFILES index 57278c2d9f..52f29f8a8f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -18,7 +18,7 @@ bottles/frontend/ui/bottle-details-view.blp bottles/frontend/ui/bottle-picker-dialog.blp bottles/frontend/ui/crash-report-dialog.blp bottles/frontend/ui/dependencies-check-dialog.blp -bottles/frontend/ui/dialog-dll-overrides.blp +bottles/frontend/ui/dll-overrides-dialog.blp bottles/frontend/ui/dialog-drives.blp bottles/frontend/ui/dialog-duplicate.blp bottles/frontend/ui/dialog-env-vars.blp @@ -71,7 +71,7 @@ bottles/frontend/widgets/program.py bottles/frontend/widgets/state.py bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display_dialog.py -bottles/frontend/windows/dlloverrides.py +bottles/frontend/windows/dll_overrides_dialog.py bottles/frontend/windows/drives.py bottles/frontend/windows/envvars.py bottles/frontend/windows/exclusionpatterns.py From 27b79991e698eb72cb258788a78d6a07bbba23c8 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:30:21 -0500 Subject: [PATCH 18/47] drives-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../frontend/ui/{dialog-drives.blp => drives-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 1 + bottles/frontend/windows/{drives.py => drives_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-drives.blp => drives-dialog.blp} (100%) rename bottles/frontend/windows/{drives.py => drives_dialog.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 1d9840ceb0..b4c538c356 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -44,7 +44,7 @@ dialog-fsr.ui dialog-mangohud.ui display-dialog.ui - dialog-drives.ui + drives-dialog.ui dialog-journal.ui dialog-sandbox.ui dialog-installer.ui diff --git a/bottles/frontend/ui/dialog-drives.blp b/bottles/frontend/ui/drives-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-drives.blp rename to bottles/frontend/ui/drives-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index f91c1869ac..f3c58268ca 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -15,7 +15,7 @@ blueprints = custom_target('blueprints', 'crash-report-dialog.blp', 'dependencies-check-dialog.blp', 'dll-overrides-dialog.blp', - 'dialog-drives.blp', + 'drives-dialog.blp', 'dialog-duplicate.blp', 'dialog-env-vars.blp', 'dialog-exclusion-patterns.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 70f162a34d..3673afb64f 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -45,6 +45,7 @@ from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.windows.display_dialog import DisplayDialog from bottles.frontend.windows.dll_overrides_dialog import DLLOverridesDialog +from bottles.frontend.windows.drives_dialog import DrivesDialog from bottles.frontend.windows.drives import DrivesDialog from bottles.frontend.windows.envvars import EnvironmentVariablesDialog from bottles.frontend.windows.exclusionpatterns import ExclusionPatternsDialog diff --git a/bottles/frontend/windows/drives.py b/bottles/frontend/windows/drives_dialog.py similarity index 97% rename from bottles/frontend/windows/drives.py rename to bottles/frontend/windows/drives_dialog.py index 1cbc929502..c2752caa02 100644 --- a/bottles/frontend/windows/drives.py +++ b/bottles/frontend/windows/drives_dialog.py @@ -1,6 +1,6 @@ -# drive.py +# drives_dialog.py # -# Copyright 2022 brombinmirko +# Copyright 2025 The Bottle 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 @@ -84,7 +84,7 @@ def __remove(self, *_args): self.parent.add_combo_letter(self.drive[0]) -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-drives.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/drives-dialog.ui") class DrivesDialog(Adw.Window): __gtype_name__ = "DrivesDialog" __alphabet = string.ascii_uppercase diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 8dda72df18..b7c52c9438 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -11,7 +11,7 @@ bottles_sources = [ 'launchoptions.py', 'onboard.py', 'rename.py', - 'drives.py', + 'drives_dialog.py', 'gamescope.py', 'vkbasalt.py', 'fsr.py', diff --git a/po/POTFILES b/po/POTFILES index 52f29f8a8f..c7a0789853 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -19,7 +19,7 @@ bottles/frontend/ui/bottle-picker-dialog.blp bottles/frontend/ui/crash-report-dialog.blp bottles/frontend/ui/dependencies-check-dialog.blp bottles/frontend/ui/dll-overrides-dialog.blp -bottles/frontend/ui/dialog-drives.blp +bottles/frontend/ui/drives-dialog.blp bottles/frontend/ui/dialog-duplicate.blp bottles/frontend/ui/dialog-env-vars.blp bottles/frontend/ui/dialog-exclusion-patterns.blp @@ -72,7 +72,7 @@ bottles/frontend/widgets/state.py bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display_dialog.py bottles/frontend/windows/dll_overrides_dialog.py -bottles/frontend/windows/drives.py +bottles/frontend/windows/drives_dialog.py bottles/frontend/windows/envvars.py bottles/frontend/windows/exclusionpatterns.py bottles/frontend/windows/generic.py From 775150b0e6cc92ecfeaf01a3e1f94dbb13a93c66 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 15:32:49 -0500 Subject: [PATCH 19/47] duplicate-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{dialog-duplicate.blp => duplicate-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/bottle_details_page.py | 2 +- .../frontend/windows/{duplicate.py => duplicate_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-duplicate.blp => duplicate-dialog.blp} (100%) rename bottles/frontend/windows/{duplicate.py => duplicate_dialog.py} (95%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index b4c538c356..6bf024cc9a 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -37,7 +37,7 @@ dll-overrides-dialog.ui dialog-env-vars.ui crash-report-dialog.ui - dialog-duplicate.ui + duplicate-dialog.ui dialog-rename.ui dialog-gamescope.ui dialog-vkbasalt.ui diff --git a/bottles/frontend/ui/dialog-duplicate.blp b/bottles/frontend/ui/duplicate-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-duplicate.blp rename to bottles/frontend/ui/duplicate-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index f3c58268ca..85494d0978 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -16,7 +16,7 @@ blueprints = custom_target('blueprints', 'dependencies-check-dialog.blp', 'dll-overrides-dialog.blp', 'drives-dialog.blp', - 'dialog-duplicate.blp', + 'duplicate-dialog.blp', 'dialog-env-vars.blp', 'dialog-exclusion-patterns.blp', 'dialog-gamescope.blp', diff --git a/bottles/frontend/views/bottle_details_page.py b/bottles/frontend/views/bottle_details_page.py index 57cd03a383..62f237fc4b 100644 --- a/bottles/frontend/views/bottle_details_page.py +++ b/bottles/frontend/views/bottle_details_page.py @@ -42,7 +42,7 @@ from bottles.frontend.utils.filters import add_executable_filters, add_all_filters from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.widgets.program import ProgramEntry -from bottles.frontend.windows.duplicate import DuplicateDialog +from bottles.frontend.windows.duplicate_dialog import DuplicateDialog from bottles.frontend.windows.upgradeversioning import UpgradeVersioningDialog diff --git a/bottles/frontend/windows/duplicate.py b/bottles/frontend/windows/duplicate_dialog.py similarity index 95% rename from bottles/frontend/windows/duplicate.py rename to bottles/frontend/windows/duplicate_dialog.py index 9f69e9cd55..31c70539bb 100644 --- a/bottles/frontend/windows/duplicate.py +++ b/bottles/frontend/windows/duplicate_dialog.py @@ -1,6 +1,6 @@ -# duplicate.py +# duplicate_dialog.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 @@ -24,7 +24,7 @@ from bottles.frontend.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-duplicate.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/duplicate-dialog.ui") class DuplicateDialog(Adw.Window): __gtype_name__ = "DuplicateDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index b7c52c9438..a345f08a9c 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -5,7 +5,7 @@ bottles_sources = [ '__init__.py', 'crash_report_dialog.py', 'dll_overrides_dialog.py', - 'duplicate.py', + 'duplicate_dialog.py', 'envvars.py', 'generic.py', 'launchoptions.py', diff --git a/po/POTFILES b/po/POTFILES index c7a0789853..cbf89a4998 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -20,7 +20,7 @@ bottles/frontend/ui/crash-report-dialog.blp bottles/frontend/ui/dependencies-check-dialog.blp bottles/frontend/ui/dll-overrides-dialog.blp bottles/frontend/ui/drives-dialog.blp -bottles/frontend/ui/dialog-duplicate.blp +bottles/frontend/ui/duplicate-dialog.blp bottles/frontend/ui/dialog-env-vars.blp bottles/frontend/ui/dialog-exclusion-patterns.blp bottles/frontend/ui/dialog-gamescope.blp From a16dad8f24c27e3d075fb4764a17eb672f6626cb Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:27:40 -0500 Subject: [PATCH 20/47] exclusion-patterns-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...exclusion-patterns.blp => exclusion-patterns-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 3 +-- .../{exclusionpatterns.py => exclusion_patterns_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 10 deletions(-) rename bottles/frontend/ui/{dialog-exclusion-patterns.blp => exclusion-patterns-dialog.blp} (100%) rename bottles/frontend/windows/{exclusionpatterns.py => exclusion_patterns_dialog.py} (95%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 6bf024cc9a..12148b88e5 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -51,7 +51,7 @@ bottle-picker-dialog.ui dialog-proton-alert.ui dependencies-check-dialog.ui - dialog-exclusion-patterns.ui + exclusion-patterns-dialog.ui dialog-upgrade-versioning.ui dialog-vmtouch.ui onboard.ui diff --git a/bottles/frontend/ui/dialog-exclusion-patterns.blp b/bottles/frontend/ui/exclusion-patterns-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-exclusion-patterns.blp rename to bottles/frontend/ui/exclusion-patterns-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 85494d0978..13a78edc6c 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -18,7 +18,7 @@ blueprints = custom_target('blueprints', 'drives-dialog.blp', 'duplicate-dialog.blp', 'dialog-env-vars.blp', - 'dialog-exclusion-patterns.blp', + 'exclusion-patterns-dialog.blp', 'dialog-gamescope.blp', 'dialog-installer.blp', 'dialog-journal.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 3673afb64f..4d2483eaf7 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -46,9 +46,8 @@ from bottles.frontend.windows.display_dialog import DisplayDialog from bottles.frontend.windows.dll_overrides_dialog import DLLOverridesDialog from bottles.frontend.windows.drives_dialog import DrivesDialog -from bottles.frontend.windows.drives import DrivesDialog from bottles.frontend.windows.envvars import EnvironmentVariablesDialog -from bottles.frontend.windows.exclusionpatterns import ExclusionPatternsDialog +from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog from bottles.frontend.windows.fsr import FsrDialog from bottles.frontend.windows.gamescope import GamescopeDialog from bottles.frontend.windows.mangohud import MangoHudDialog diff --git a/bottles/frontend/windows/exclusionpatterns.py b/bottles/frontend/windows/exclusion_patterns_dialog.py similarity index 95% rename from bottles/frontend/windows/exclusionpatterns.py rename to bottles/frontend/windows/exclusion_patterns_dialog.py index 2c7bcdac79..9e57dc8b92 100644 --- a/bottles/frontend/windows/exclusionpatterns.py +++ b/bottles/frontend/windows/exclusion_patterns_dialog.py @@ -1,6 +1,6 @@ -# envvars.py +# exclusion_patterns_dialog.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 @@ -57,7 +57,7 @@ def __remove(self, *_args): self.parent.group_patterns.remove(self) -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-exclusion-patterns.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/exclusion-patterns-dialog.ui") class ExclusionPatternsDialog(Adw.Window): __gtype_name__ = "ExclusionPatternsDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index a345f08a9c..0175355e02 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -24,7 +24,7 @@ bottles_sources = [ 'sandbox.py', 'installer.py', 'dependencies_check_dialog.py', - 'exclusionpatterns.py', + 'exclusion_patterns_dialog.py', 'upgradeversioning.py', 'vmtouch.py', 'window.py', diff --git a/po/POTFILES b/po/POTFILES index cbf89a4998..d0bcdfd3bd 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -22,7 +22,7 @@ bottles/frontend/ui/dll-overrides-dialog.blp bottles/frontend/ui/drives-dialog.blp bottles/frontend/ui/duplicate-dialog.blp bottles/frontend/ui/dialog-env-vars.blp -bottles/frontend/ui/dialog-exclusion-patterns.blp +bottles/frontend/ui/exclusion-patterns-dialog.blp bottles/frontend/ui/dialog-gamescope.blp bottles/frontend/ui/dialog-installer.blp bottles/frontend/ui/dialog-journal.blp @@ -74,7 +74,7 @@ bottles/frontend/windows/display_dialog.py bottles/frontend/windows/dll_overrides_dialog.py bottles/frontend/windows/drives_dialog.py bottles/frontend/windows/envvars.py -bottles/frontend/windows/exclusionpatterns.py +bottles/frontend/windows/exclusion_patterns_dialog.py bottles/frontend/windows/generic.py bottles/frontend/windows/installer.py bottles/frontend/windows/launchoptions.py From 9e9ed81590f0a55d435f3bff114ca98198c79d51 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:38:20 -0500 Subject: [PATCH 21/47] gamescope-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{dialog-gamescope.blp => gamescope-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 2 +- .../frontend/windows/{gamescope.py => gamescope_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-gamescope.blp => gamescope-dialog.blp} (100%) rename bottles/frontend/windows/{gamescope.py => gamescope_dialog.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 12148b88e5..d145daeb6f 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -39,7 +39,7 @@ crash-report-dialog.ui duplicate-dialog.ui dialog-rename.ui - dialog-gamescope.ui + gamescope-dialog.ui dialog-vkbasalt.ui dialog-fsr.ui dialog-mangohud.ui diff --git a/bottles/frontend/ui/dialog-gamescope.blp b/bottles/frontend/ui/gamescope-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-gamescope.blp rename to bottles/frontend/ui/gamescope-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 13a78edc6c..c5001895f9 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -19,7 +19,7 @@ blueprints = custom_target('blueprints', 'duplicate-dialog.blp', 'dialog-env-vars.blp', 'exclusion-patterns-dialog.blp', - 'dialog-gamescope.blp', + 'gamescope-dialog.blp', 'dialog-installer.blp', 'dialog-journal.blp', 'dialog-launch-options.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 4d2483eaf7..b53ae0cb3e 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -49,7 +49,7 @@ from bottles.frontend.windows.envvars import EnvironmentVariablesDialog from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog from bottles.frontend.windows.fsr import FsrDialog -from bottles.frontend.windows.gamescope import GamescopeDialog +from bottles.frontend.windows.gamescope_dialog import GamescopeDialog from bottles.frontend.windows.mangohud import MangoHudDialog from bottles.frontend.windows.protonalert import ProtonAlertDialog from bottles.frontend.windows.sandbox import SandboxDialog diff --git a/bottles/frontend/windows/gamescope.py b/bottles/frontend/windows/gamescope_dialog.py similarity index 96% rename from bottles/frontend/windows/gamescope.py rename to bottles/frontend/windows/gamescope_dialog.py index 2e917411c6..f467160dba 100644 --- a/bottles/frontend/windows/gamescope.py +++ b/bottles/frontend/windows/gamescope_dialog.py @@ -1,6 +1,6 @@ -# gamescope.py +# gamescope_dialog.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 @@ -18,7 +18,7 @@ from gi.repository import Gtk, GLib, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-gamescope.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/gamescope-dialog.ui") class GamescopeDialog(Adw.Window): __gtype_name__ = "GamescopeDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 0175355e02..8bb2c39adb 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -12,7 +12,7 @@ bottles_sources = [ 'onboard.py', 'rename.py', 'drives_dialog.py', - 'gamescope.py', + 'gamescope_dialog.py', 'vkbasalt.py', 'fsr.py', 'mangohud.py', diff --git a/po/POTFILES b/po/POTFILES index d0bcdfd3bd..9b772671ab 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -23,7 +23,7 @@ bottles/frontend/ui/drives-dialog.blp bottles/frontend/ui/duplicate-dialog.blp bottles/frontend/ui/dialog-env-vars.blp bottles/frontend/ui/exclusion-patterns-dialog.blp -bottles/frontend/ui/dialog-gamescope.blp +bottles/frontend/ui/gamescope-dialog.blp bottles/frontend/ui/dialog-installer.blp bottles/frontend/ui/dialog-journal.blp bottles/frontend/ui/dialog-launch-options.blp From a6df665d57baf8e8c0feb1290aa6f65a597d5e56 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:41:53 -0500 Subject: [PATCH 22/47] exclusion-pattern-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...ion-pattern-entry.blp => exclusion-pattern-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/windows/exclusion_patterns_dialog.py | 10 +++++----- po/POTFILES | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{exclusion-pattern-entry.blp => exclusion-pattern-row.blp} (77%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index d145daeb6f..68465d612a 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -22,7 +22,7 @@ drive-entry.ui library-entry.ui local-resource-entry.ui - exclusion-pattern-entry.ui + exclusion-pattern-row.ui bottle-details-view.ui bottle-details-page.ui details-dependencies-view.ui diff --git a/bottles/frontend/ui/exclusion-pattern-entry.blp b/bottles/frontend/ui/exclusion-pattern-row.blp similarity index 77% rename from bottles/frontend/ui/exclusion-pattern-entry.blp rename to bottles/frontend/ui/exclusion-pattern-row.blp index ec6f8c1639..7965fd6588 100644 --- a/bottles/frontend/ui/exclusion-pattern-entry.blp +++ b/bottles/frontend/ui/exclusion-pattern-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $ExclusionPatternEntry: Adw.ActionRow { +template $ExclusionPatternRow: Adw.ActionRow { title: _("Value"); Button btn_remove { diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index c5001895f9..e51e49ffbd 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -35,7 +35,7 @@ blueprints = custom_target('blueprints', 'dll-override-entry.blp', 'drive-entry.blp', 'env-var-entry.blp', - 'exclusion-pattern-entry.blp', + 'exclusion-pattern-row.blp', 'importer-entry.blp', 'importer.blp', 'installer-entry.blp', diff --git a/bottles/frontend/windows/exclusion_patterns_dialog.py b/bottles/frontend/windows/exclusion_patterns_dialog.py index 9e57dc8b92..e406a8c954 100644 --- a/bottles/frontend/windows/exclusion_patterns_dialog.py +++ b/bottles/frontend/windows/exclusion_patterns_dialog.py @@ -20,9 +20,9 @@ from gi.repository import Gtk, GLib, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/exclusion-pattern-entry.ui") -class ExclusionPatternEntry(Adw.ActionRow): - __gtype_name__ = "ExclusionPatternEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/exclusion-pattern-row.ui") +class ExclusionPatternRow(Adw.ActionRow): + __gtype_name__ = "ExclusionPatternRow" # region Widgets btn_remove = Gtk.Template.Child() @@ -91,7 +91,7 @@ def __save_var(self, *_args): key="Versioning_Exclusion_Patterns", value=self.config.Versioning_Exclusion_Patterns + [pattern], ) - _entry = ExclusionPatternEntry(self, pattern) + _entry = ExclusionPatternRow(self, pattern) GLib.idle_add(self.group_patterns.add, _entry) self.entry_name.set_text("") @@ -107,5 +107,5 @@ def __populate_patterns_list(self): self.group_patterns.set_description("") for pattern in patterns: - _entry = ExclusionPatternEntry(self, pattern) + _entry = ExclusionPatternRow(self, pattern) GLib.idle_add(self.group_patterns.add, _entry) diff --git a/po/POTFILES b/po/POTFILES index 9b772671ab..1c79caa28f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -36,7 +36,7 @@ bottles/frontend/ui/dialog-vkbasalt.blp bottles/frontend/ui/dll-override-entry.blp bottles/frontend/ui/drive-entry.blp bottles/frontend/ui/env-var-entry.blp -bottles/frontend/ui/exclusion-pattern-entry.blp +bottles/frontend/ui/exclusion-pattern-row.blp bottles/frontend/ui/importer-entry.blp bottles/frontend/ui/importer.blp bottles/frontend/ui/installer-entry.blp From da5dac2a663fa3a5c35427c8214c914e5bc78d5a Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:45:56 -0500 Subject: [PATCH 23/47] fsr-dialog: Rename files and add to POTFILES --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/{dialog-fsr.blp => fsr-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/{fsr.py => fsr_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 ++ 7 files changed, 9 insertions(+), 7 deletions(-) rename bottles/frontend/ui/{dialog-fsr.blp => fsr-dialog.blp} (100%) rename bottles/frontend/windows/{fsr.py => fsr_dialog.py} (95%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 68465d612a..6a9cf6863c 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -41,7 +41,7 @@ dialog-rename.ui gamescope-dialog.ui dialog-vkbasalt.ui - dialog-fsr.ui + fsr-dialog.ui dialog-mangohud.ui display-dialog.ui drives-dialog.ui diff --git a/bottles/frontend/ui/dialog-fsr.blp b/bottles/frontend/ui/fsr-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-fsr.blp rename to bottles/frontend/ui/fsr-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index e51e49ffbd..78288a30ce 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -30,7 +30,7 @@ blueprints = custom_target('blueprints', 'dialog-vkbasalt.blp', 'display-dialog.blp', 'dialog-vmtouch.blp', - 'dialog-fsr.blp', + 'fsr-dialog.blp', 'dialog-mangohud.blp', 'dll-override-entry.blp', 'drive-entry.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index b53ae0cb3e..09b8cde138 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -48,7 +48,7 @@ from bottles.frontend.windows.drives_dialog import DrivesDialog from bottles.frontend.windows.envvars import EnvironmentVariablesDialog from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog -from bottles.frontend.windows.fsr import FsrDialog +from bottles.frontend.windows.fsr_dialog import FsrDialog from bottles.frontend.windows.gamescope_dialog import GamescopeDialog from bottles.frontend.windows.mangohud import MangoHudDialog from bottles.frontend.windows.protonalert import ProtonAlertDialog diff --git a/bottles/frontend/windows/fsr.py b/bottles/frontend/windows/fsr_dialog.py similarity index 95% rename from bottles/frontend/windows/fsr.py rename to bottles/frontend/windows/fsr_dialog.py index 1c7ce23c43..e35d83d1bf 100644 --- a/bottles/frontend/windows/fsr.py +++ b/bottles/frontend/windows/fsr_dialog.py @@ -1,6 +1,6 @@ -# vkbasalt.py +# fsr_dialog.py # -# Copyright 2022 Bottles Contributors +# 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 @@ -23,7 +23,7 @@ logging = Logger() -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-fsr.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/fsr-dialog.ui") class FsrDialog(Adw.Window): __gtype_name__ = "FsrDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 8bb2c39adb..30614edb58 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -14,7 +14,7 @@ bottles_sources = [ 'drives_dialog.py', 'gamescope_dialog.py', 'vkbasalt.py', - 'fsr.py', + 'fsr_dialog.py', 'mangohud.py', 'display_dialog.py', 'generic_cli.py', diff --git a/po/POTFILES b/po/POTFILES index 1c79caa28f..653b240d55 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -53,6 +53,7 @@ bottles/frontend/ui/program-entry.blp bottles/frontend/ui/state-entry.blp bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp +bottles/frontend/ui/fsr-dialog.blp bottles/frontend/views/bottle_details_page.py bottles/frontend/views/details_preferences_page.py bottles/frontend/views/details_versioning_page.py @@ -80,6 +81,7 @@ bottles/frontend/windows/installer.py bottles/frontend/windows/launchoptions.py bottles/frontend/windows/main_window.py bottles/frontend/windows/vkbasalt.py +bottles/frontend/windows/fsr_dialog.py data/com.usebottles.bottles.desktop.in.in data/com.usebottles.bottles.gschema.xml data/com.usebottles.bottles.metainfo.xml.in From 2978560cda1760fa2d3ce52e39eb309a5857dcda Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:56:16 -0500 Subject: [PATCH 24/47] importer-view: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/{importer.blp => importer-view.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/{importer.py => importer_view.py} | 6 +++--- bottles/frontend/views/meson.build | 2 +- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{importer.blp => importer-view.blp} (100%) rename bottles/frontend/views/{importer.py => importer_view.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 6a9cf6863c..523eb1c764 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -31,7 +31,7 @@ details-versioning-page.ui details-task-manager-view.ui preferences.ui - importer.ui + importer-view.ui library.ui dialog-launch-options.ui dll-overrides-dialog.ui diff --git a/bottles/frontend/ui/importer.blp b/bottles/frontend/ui/importer-view.blp similarity index 100% rename from bottles/frontend/ui/importer.blp rename to bottles/frontend/ui/importer-view.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 78288a30ce..c563159f36 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-row.blp', 'importer-entry.blp', - 'importer.blp', + 'importer-view.blp', 'installer-entry.blp', 'library-entry.blp', 'library.blp', diff --git a/bottles/frontend/views/importer.py b/bottles/frontend/views/importer_view.py similarity index 97% rename from bottles/frontend/views/importer.py rename to bottles/frontend/views/importer_view.py index 4a28573610..552781996c 100644 --- a/bottles/frontend/views/importer.py +++ b/bottles/frontend/views/importer_view.py @@ -1,6 +1,6 @@ -# importer.py +# importer_view.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,7 +26,7 @@ from bottles.frontend.widgets.importer import ImporterEntry -@Gtk.Template(resource_path="/com/usebottles/bottles/importer.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/importer-view.ui") class ImporterView(Adw.Bin): __gtype_name__ = "ImporterView" diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index a2dbe3e8e8..38ec9d5fb7 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -8,7 +8,7 @@ bottles_sources = [ 'library.py', 'bottle_details_view.py', 'preferences.py', - 'importer.py', + 'importer_view.py', 'loading.py', 'bottle_details_page.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index 8465f86850..1733887861 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.bottle_details_view import BottleDetailsView -from bottles.frontend.views.importer import ImporterView +from bottles.frontend.views.importer_view import ImporterView from bottles.frontend.views.library import LibraryView from bottles.frontend.views.list import BottleView from bottles.frontend.views.loading import LoadingView diff --git a/po/POTFILES b/po/POTFILES index 653b240d55..2ce32e3425 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -38,7 +38,7 @@ bottles/frontend/ui/drive-entry.blp bottles/frontend/ui/env-var-entry.blp bottles/frontend/ui/exclusion-pattern-row.blp bottles/frontend/ui/importer-entry.blp -bottles/frontend/ui/importer.blp +bottles/frontend/ui/importer-view.blp bottles/frontend/ui/installer-entry.blp bottles/frontend/ui/library-entry.blp bottles/frontend/ui/library.blp @@ -58,7 +58,7 @@ bottles/frontend/views/bottle_details_page.py bottles/frontend/views/details_preferences_page.py bottles/frontend/views/details_versioning_page.py bottles/frontend/views/bottle_details_view.py -bottles/frontend/views/importer.py +bottles/frontend/views/importer_view.py bottles/frontend/views/list.py bottles/frontend/views/loading.py bottles/frontend/views/new.py From ce74986b06653d2ba565ae3771d6b825847249ec Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 18:59:37 -0500 Subject: [PATCH 25/47] importer-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{importer-entry.blp => importer-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/importer_view.py | 4 ++-- .../frontend/widgets/{importer.py => importer_row.py} | 10 +++++----- bottles/frontend/widgets/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{importer-entry.blp => importer-row.blp} (96%) rename bottles/frontend/widgets/{importer.py => importer_row.py} (92%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 523eb1c764..050a72d85c 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -13,7 +13,7 @@ task-entry.ui dependency-entry-row.ui program-entry.ui - importer-entry.ui + importer-row.ui state-entry.ui installer-entry.ui dll-override-entry.ui diff --git a/bottles/frontend/ui/importer-entry.blp b/bottles/frontend/ui/importer-row.blp similarity index 96% rename from bottles/frontend/ui/importer-entry.blp rename to bottles/frontend/ui/importer-row.blp index 2c42347b6f..609124e57a 100644 --- a/bottles/frontend/ui/importer-entry.blp +++ b/bottles/frontend/ui/importer-row.blp @@ -16,7 +16,7 @@ Popover pop_actions { } } -template $ImporterEntry: Adw.ActionRow { +template $ImporterRow: Adw.ActionRow { /* Translators: A Wine prefix is a separate environment (C:\ drive) for the Wine program */ title: _("Wine prefix name"); diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index c563159f36..55a5863670 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -36,7 +36,7 @@ blueprints = custom_target('blueprints', 'drive-entry.blp', 'env-var-entry.blp', 'exclusion-pattern-row.blp', - 'importer-entry.blp', + 'importer-row.blp', 'importer-view.blp', 'installer-entry.blp', 'library-entry.blp', diff --git a/bottles/frontend/views/importer_view.py b/bottles/frontend/views/importer_view.py index 552781996c..dfc50ecf18 100644 --- a/bottles/frontend/views/importer_view.py +++ b/bottles/frontend/views/importer_view.py @@ -23,7 +23,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.filters import add_yaml_filters, add_all_filters from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.importer import ImporterEntry +from bottles.frontend.widgets.importer_row import ImporterRow @Gtk.Template(resource_path="/com/usebottles/bottles/importer-view.ui") @@ -77,7 +77,7 @@ def update(result, error=False): self.list_prefixes.remove(_w) for prefix in result.data.get("wineprefixes"): - self.list_prefixes.append(ImporterEntry(self, prefix)) + self.list_prefixes.append(ImporterRow(self, prefix)) widget.set_sensitive(False) diff --git a/bottles/frontend/widgets/importer.py b/bottles/frontend/widgets/importer_row.py similarity index 92% rename from bottles/frontend/widgets/importer.py rename to bottles/frontend/widgets/importer_row.py index f3e7004a9b..3fec3da5e4 100644 --- a/bottles/frontend/widgets/importer.py +++ b/bottles/frontend/widgets/importer_row.py @@ -1,6 +1,6 @@ -# importer.py +# importer_row.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 @@ -24,9 +24,9 @@ from bottles.frontend.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/importer-entry.ui") -class ImporterEntry(Adw.ActionRow): - __gtype_name__ = "ImporterEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/importer-row.ui") +class ImporterRow(Adw.ActionRow): + __gtype_name__ = "ImporterRow" # region Widgets label_manager = Gtk.Template.Child() diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index b763a20fe2..69ce2cd338 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -5,7 +5,7 @@ bottles_sources = [ '__init__.py', 'dependency_entry_row.py', 'executable.py', - 'importer.py', + 'importer_row.py', 'installer.py', 'program.py', 'state.py', diff --git a/po/POTFILES b/po/POTFILES index 2ce32e3425..497ca89bea 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -37,7 +37,7 @@ bottles/frontend/ui/dll-override-entry.blp bottles/frontend/ui/drive-entry.blp bottles/frontend/ui/env-var-entry.blp bottles/frontend/ui/exclusion-pattern-row.blp -bottles/frontend/ui/importer-entry.blp +bottles/frontend/ui/importer-row.blp bottles/frontend/ui/importer-view.blp bottles/frontend/ui/installer-entry.blp bottles/frontend/ui/library-entry.blp @@ -65,7 +65,7 @@ bottles/frontend/views/new.py bottles/frontend/views/preferences.py bottles/frontend/widgets/component.py bottles/frontend/widgets/dependency.py -bottles/frontend/widgets/importer.py +bottles/frontend/widgets/importer_row.py bottles/frontend/widgets/installer.py bottles/frontend/widgets/library.py bottles/frontend/widgets/program.py From 1652c4251c884d7bdf296b463ea212493642d456 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:02:43 -0500 Subject: [PATCH 26/47] installer-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{installer-entry.blp => installer-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_installers_view.py | 4 ++-- .../widgets/{installer.py => installer_row.py} | 10 +++++----- bottles/frontend/widgets/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{installer-entry.blp => installer-row.blp} (96%) rename bottles/frontend/widgets/{installer.py => installer_row.py} (94%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 050a72d85c..ad2fab6d5f 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -15,7 +15,7 @@ program-entry.ui importer-row.ui state-entry.ui - installer-entry.ui + installer-row.ui dll-override-entry.ui env-var-entry.ui component-entry-row.ui diff --git a/bottles/frontend/ui/installer-entry.blp b/bottles/frontend/ui/installer-row.blp similarity index 96% rename from bottles/frontend/ui/installer-entry.blp rename to bottles/frontend/ui/installer-row.blp index 3af12b0f92..50f530d431 100644 --- a/bottles/frontend/ui/installer-entry.blp +++ b/bottles/frontend/ui/installer-row.blp @@ -29,7 +29,7 @@ Popover pop_actions { } } -template $InstallerEntry: Adw.ActionRow { +template $InstallerRow: Adw.ActionRow { activatable-widget: btn_install; title: _("Installer name"); subtitle: _("Installer description"); diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 55a5863670..293af4d986 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -38,7 +38,7 @@ blueprints = custom_target('blueprints', 'exclusion-pattern-row.blp', 'importer-row.blp', 'importer-view.blp', - 'installer-entry.blp', + 'installer-row.blp', 'library-entry.blp', 'library.blp', 'bottle-row.blp', diff --git a/bottles/frontend/views/details_installers_view.py b/bottles/frontend/views/details_installers_view.py index 16513653cf..cb74fd620d 100644 --- a/bottles/frontend/views/details_installers_view.py +++ b/bottles/frontend/views/details_installers_view.py @@ -23,7 +23,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.common import open_doc_url -from bottles.frontend.widgets.installer import InstallerEntry +from bottles.frontend.widgets.installer_row import InstallerRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-installers-view.ui") @@ -93,7 +93,7 @@ def update(self, widget=False, config=None): self.list_installers.set_sensitive(False) def new_installer(_installer): - entry = InstallerEntry( + entry = InstallerRow( window=self.window, config=self.config, installer=_installer ) self.list_installers.append(entry) diff --git a/bottles/frontend/widgets/installer.py b/bottles/frontend/widgets/installer_row.py similarity index 94% rename from bottles/frontend/widgets/installer.py rename to bottles/frontend/widgets/installer_row.py index cc36452cfd..cf001399cb 100644 --- a/bottles/frontend/widgets/installer.py +++ b/bottles/frontend/widgets/installer_row.py @@ -1,6 +1,6 @@ -# installer.py +# installer_row.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 @@ -23,9 +23,9 @@ from bottles.frontend.windows.installer import InstallerDialog -@Gtk.Template(resource_path="/com/usebottles/bottles/installer-entry.ui") -class InstallerEntry(Adw.ActionRow): - __gtype_name__ = "InstallerEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/installer-row.ui") +class InstallerRow(Adw.ActionRow): + __gtype_name__ = "InstallerRow" # region Widgets btn_install = Gtk.Template.Child() diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index 69ce2cd338..941db29d82 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -6,7 +6,7 @@ bottles_sources = [ 'dependency_entry_row.py', 'executable.py', 'importer_row.py', - 'installer.py', + 'installer_row.py', 'program.py', 'state.py', 'component_entry_row.py', diff --git a/po/POTFILES b/po/POTFILES index 497ca89bea..dd34e12022 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -39,7 +39,7 @@ bottles/frontend/ui/env-var-entry.blp bottles/frontend/ui/exclusion-pattern-row.blp bottles/frontend/ui/importer-row.blp bottles/frontend/ui/importer-view.blp -bottles/frontend/ui/installer-entry.blp +bottles/frontend/ui/installer-row.blp bottles/frontend/ui/library-entry.blp bottles/frontend/ui/library.blp bottles/frontend/ui/bottle-row.blp @@ -66,7 +66,7 @@ bottles/frontend/views/preferences.py bottles/frontend/widgets/component.py bottles/frontend/widgets/dependency.py bottles/frontend/widgets/importer_row.py -bottles/frontend/widgets/installer.py +bottles/frontend/widgets/installer_row.py bottles/frontend/widgets/library.py bottles/frontend/widgets/program.py bottles/frontend/widgets/state.py From ba2d7aca80d70fa578ca06d99844a6e26738af20 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:06:17 -0500 Subject: [PATCH 27/47] library-view: Rename files and add to POTFILES --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/{library.blp => library-view.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/{library.py => library_view.py} | 6 +++--- bottles/frontend/views/meson.build | 2 +- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{library.blp => library-view.blp} (100%) rename bottles/frontend/views/{library.py => library_view.py} (95%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index ad2fab6d5f..717ad68aa3 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -32,7 +32,7 @@ details-task-manager-view.ui preferences.ui importer-view.ui - library.ui + library-view.ui dialog-launch-options.ui dll-overrides-dialog.ui dialog-env-vars.ui diff --git a/bottles/frontend/ui/library.blp b/bottles/frontend/ui/library-view.blp similarity index 100% rename from bottles/frontend/ui/library.blp rename to bottles/frontend/ui/library-view.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 293af4d986..39db4c2cac 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -40,7 +40,7 @@ blueprints = custom_target('blueprints', 'importer-view.blp', 'installer-row.blp', 'library-entry.blp', - 'library.blp', + 'library-view.blp', 'bottle-row.blp', 'list.blp', 'loading.blp', diff --git a/bottles/frontend/views/library.py b/bottles/frontend/views/library_view.py similarity index 95% rename from bottles/frontend/views/library.py rename to bottles/frontend/views/library_view.py index bebea15a10..45cbf5ad80 100644 --- a/bottles/frontend/views/library.py +++ b/bottles/frontend/views/library_view.py @@ -1,6 +1,6 @@ -# library.py +# library_view.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 @@ -25,7 +25,7 @@ from bottles.frontend.widgets.library import LibraryEntry -@Gtk.Template(resource_path="/com/usebottles/bottles/library.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/library-view.ui") class LibraryView(Adw.Bin): __gtype_name__ = "LibraryView" diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index 38ec9d5fb7..b851146465 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -5,7 +5,7 @@ bottles_sources = [ '__init__.py', 'new_bottle_dialog.py', 'list.py', - 'library.py', + 'library_view.py', 'bottle_details_view.py', 'preferences.py', 'importer_view.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index 1733887861..eb33db17df 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -38,7 +38,7 @@ from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.views.bottle_details_view import BottleDetailsView from bottles.frontend.views.importer_view import ImporterView -from bottles.frontend.views.library import LibraryView +from bottles.frontend.views.library_view import LibraryView from bottles.frontend.views.list import BottleView from bottles.frontend.views.loading import LoadingView from bottles.frontend.views.new_bottle_dialog import NewBottleDialog diff --git a/po/POTFILES b/po/POTFILES index dd34e12022..2459ef216f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -41,7 +41,7 @@ bottles/frontend/ui/importer-row.blp bottles/frontend/ui/importer-view.blp bottles/frontend/ui/installer-row.blp bottles/frontend/ui/library-entry.blp -bottles/frontend/ui/library.blp +bottles/frontend/ui/library-view.blp bottles/frontend/ui/bottle-row.blp bottles/frontend/ui/list.blp bottles/frontend/ui/loading.blp @@ -63,6 +63,7 @@ bottles/frontend/views/list.py bottles/frontend/views/loading.py bottles/frontend/views/new.py bottles/frontend/views/preferences.py +bottles/frontend/views/library_view.py bottles/frontend/widgets/component.py bottles/frontend/widgets/dependency.py bottles/frontend/widgets/importer_row.py From 33781abd5d64f4378dcd943c85e0a1d13379b403 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:10:41 -0500 Subject: [PATCH 28/47] bottles-list-view: Rename files and class name --- .../frontend/ui/{list.blp => bottles-list-view.blp} | 2 +- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/views/{list.py => bottles_list_view.py} | 10 +++++----- bottles/frontend/views/meson.build | 2 +- bottles/frontend/windows/window.py | 4 ++-- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{list.blp => bottles-list-view.blp} (97%) rename bottles/frontend/views/{list.py => bottles_list_view.py} (97%) diff --git a/bottles/frontend/ui/list.blp b/bottles/frontend/ui/bottles-list-view.blp similarity index 97% rename from bottles/frontend/ui/list.blp rename to bottles/frontend/ui/bottles-list-view.blp index 104c27dd51..299ca52141 100644 --- a/bottles/frontend/ui/list.blp +++ b/bottles/frontend/ui/bottles-list-view.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $BottleView: Adw.Bin { +template $BottlesListView: Adw.Bin { ScrolledWindow { Box { hexpand: true; diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 717ad68aa3..753c269ba2 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -6,7 +6,7 @@ help-overlay.ui window.ui new-bottle-dialog.ui - list.ui + bottles-list-view.ui loading.ui bottle-row.ui check-row.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 39db4c2cac..fac40168d2 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -42,7 +42,7 @@ blueprints = custom_target('blueprints', 'library-entry.blp', 'library-view.blp', 'bottle-row.blp', - 'list.blp', + 'bottles-list-view.blp', 'loading.blp', 'local-resource-entry.blp', 'new-bottle-dialog.blp', diff --git a/bottles/frontend/views/list.py b/bottles/frontend/views/bottles_list_view.py similarity index 97% rename from bottles/frontend/views/list.py rename to bottles/frontend/views/bottles_list_view.py index 82c450586c..171f81628d 100644 --- a/bottles/frontend/views/list.py +++ b/bottles/frontend/views/bottles_list_view.py @@ -1,6 +1,6 @@ -# list.py +# bottles_list_view.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 @@ -123,9 +123,9 @@ def disable(self): self.set_visible(False) -@Gtk.Template(resource_path="/com/usebottles/bottles/list.ui") -class BottleView(Adw.Bin): - __gtype_name__ = "BottleView" +@Gtk.Template(resource_path="/com/usebottles/bottles/bottles-list-view.ui") +class BottlesListView(Adw.Bin): + __gtype_name__ = "BottlesListView" __bottles = {} # region Widgets diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index b851146465..281e9a4cea 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -4,7 +4,7 @@ viewsdir = join_paths(pkgdatadir, 'bottles/frontend/views') bottles_sources = [ '__init__.py', 'new_bottle_dialog.py', - 'list.py', + 'bottles_list_view.py', 'library_view.py', 'bottle_details_view.py', 'preferences.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index eb33db17df..dfe9080716 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -39,7 +39,7 @@ from bottles.frontend.views.bottle_details_view import BottleDetailsView from bottles.frontend.views.importer_view import ImporterView from bottles.frontend.views.library_view import LibraryView -from bottles.frontend.views.list import BottleView +from bottles.frontend.views.bottles_list_view import BottlesListView from bottles.frontend.views.loading import LoadingView from bottles.frontend.views.new_bottle_dialog import NewBottleDialog from bottles.frontend.views.preferences import PreferencesWindow @@ -221,7 +221,7 @@ def set_manager(result: Manager, error=None): # Pages self.page_details = BottleDetailsView(self) - self.page_list = BottleView(self, arg_bottle=self.arg_bottle) + self.page_list = BottlesListView(self, arg_bottle=self.arg_bottle) self.page_importer = ImporterView(self) self.page_library = LibraryView(self) diff --git a/po/POTFILES b/po/POTFILES index 2459ef216f..0e89acda10 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -43,7 +43,7 @@ bottles/frontend/ui/installer-row.blp bottles/frontend/ui/library-entry.blp bottles/frontend/ui/library-view.blp bottles/frontend/ui/bottle-row.blp -bottles/frontend/ui/list.blp +bottles/frontend/ui/bottles-list-view.blp bottles/frontend/ui/loading.blp bottles/frontend/ui/local-resource-entry.blp bottles/frontend/ui/new.blp @@ -59,7 +59,7 @@ bottles/frontend/views/details_preferences_page.py bottles/frontend/views/details_versioning_page.py bottles/frontend/views/bottle_details_view.py bottles/frontend/views/importer_view.py -bottles/frontend/views/list.py +bottles/frontend/views/bottles_list_view.py bottles/frontend/views/loading.py bottles/frontend/views/new.py bottles/frontend/views/preferences.py From 606956c567c9827fb1a6f11f695e04e0fb6e5f55 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:13:11 -0500 Subject: [PATCH 29/47] loading-view: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/{loading.blp => loading-view.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/{loading.py => loading_view.py} | 6 +++--- bottles/frontend/views/meson.build | 2 +- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{loading.blp => loading-view.blp} (100%) rename bottles/frontend/views/{loading.py => loading_view.py} (93%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 753c269ba2..fdfaa1d60d 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -7,7 +7,7 @@ window.ui new-bottle-dialog.ui bottles-list-view.ui - loading.ui + loading-view.ui bottle-row.ui check-row.ui task-entry.ui diff --git a/bottles/frontend/ui/loading.blp b/bottles/frontend/ui/loading-view.blp similarity index 100% rename from bottles/frontend/ui/loading.blp rename to bottles/frontend/ui/loading-view.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index fac40168d2..1d2091bee8 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -43,7 +43,7 @@ blueprints = custom_target('blueprints', 'library-view.blp', 'bottle-row.blp', 'bottles-list-view.blp', - 'loading.blp', + 'loading-view.blp', 'local-resource-entry.blp', 'new-bottle-dialog.blp', 'onboard.blp', diff --git a/bottles/frontend/views/loading.py b/bottles/frontend/views/loading_view.py similarity index 93% rename from bottles/frontend/views/loading.py rename to bottles/frontend/views/loading_view.py index 7d165eb3f4..36c44d585f 100644 --- a/bottles/frontend/views/loading.py +++ b/bottles/frontend/views/loading_view.py @@ -1,6 +1,6 @@ -# loading.py +# loading_view.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 @@ -25,7 +25,7 @@ from bottles.frontend.params import APP_ID -@Gtk.Template(resource_path="/com/usebottles/bottles/loading.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/loading-view.ui") class LoadingView(Adw.Bin): __gtype_name__ = "LoadingView" __fetched = 0 diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build index 281e9a4cea..f856cda06a 100644 --- a/bottles/frontend/views/meson.build +++ b/bottles/frontend/views/meson.build @@ -9,7 +9,7 @@ bottles_sources = [ 'bottle_details_view.py', 'preferences.py', 'importer_view.py', - 'loading.py', + 'loading_view.py', 'bottle_details_page.py', 'details_installers_view.py', diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index dfe9080716..4dc23d83b0 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -40,7 +40,7 @@ from bottles.frontend.views.importer_view import ImporterView from bottles.frontend.views.library_view import LibraryView from bottles.frontend.views.bottles_list_view import BottlesListView -from bottles.frontend.views.loading import LoadingView +from bottles.frontend.views.loading_view import LoadingView from bottles.frontend.views.new_bottle_dialog import NewBottleDialog from bottles.frontend.views.preferences import PreferencesWindow from bottles.frontend.windows.crash_report_dialog import CrashReportDialog diff --git a/po/POTFILES b/po/POTFILES index 0e89acda10..716e9c425e 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -44,7 +44,7 @@ bottles/frontend/ui/library-entry.blp bottles/frontend/ui/library-view.blp bottles/frontend/ui/bottle-row.blp bottles/frontend/ui/bottles-list-view.blp -bottles/frontend/ui/loading.blp +bottles/frontend/ui/loading-view.blp bottles/frontend/ui/local-resource-entry.blp bottles/frontend/ui/new.blp bottles/frontend/ui/onboard.blp @@ -60,7 +60,7 @@ bottles/frontend/views/details_versioning_page.py bottles/frontend/views/bottle_details_view.py bottles/frontend/views/importer_view.py bottles/frontend/views/bottles_list_view.py -bottles/frontend/views/loading.py +bottles/frontend/views/loading_view.py bottles/frontend/views/new.py bottles/frontend/views/preferences.py bottles/frontend/views/library_view.py From 2d0cfeb6a024b0826fde9fc49dd4e496c6499818 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:18:51 -0500 Subject: [PATCH 30/47] local-resource-row: Rename class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../{local-resource-entry.blp => local-resource-row.blp} | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/windows/installer.py | 8 ++++---- po/POTFILES | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{local-resource-entry.blp => local-resource-row.blp} (83%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index fdfaa1d60d..bb01ac283b 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -21,7 +21,7 @@ component-entry-row.ui drive-entry.ui library-entry.ui - local-resource-entry.ui + local-resource-row.ui exclusion-pattern-row.ui bottle-details-view.ui bottle-details-page.ui diff --git a/bottles/frontend/ui/local-resource-entry.blp b/bottles/frontend/ui/local-resource-row.blp similarity index 83% rename from bottles/frontend/ui/local-resource-entry.blp rename to bottles/frontend/ui/local-resource-row.blp index 9af5a3ba34..7ee81f6845 100644 --- a/bottles/frontend/ui/local-resource-entry.blp +++ b/bottles/frontend/ui/local-resource-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $LocalResourceEntry: Adw.ActionRow { +template $LocalResourceRow: Adw.ActionRow { subtitle: _("This resource is missing."); Button btn_path { diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 1d2091bee8..b7c2413113 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -44,7 +44,7 @@ blueprints = custom_target('blueprints', 'bottle-row.blp', 'bottles-list-view.blp', 'loading-view.blp', - 'local-resource-entry.blp', + 'local-resource-row.blp', 'new-bottle-dialog.blp', 'onboard.blp', 'preferences.blp', diff --git a/bottles/frontend/windows/installer.py b/bottles/frontend/windows/installer.py index 23343c9a2d..dc520466e6 100644 --- a/bottles/frontend/windows/installer.py +++ b/bottles/frontend/windows/installer.py @@ -24,9 +24,9 @@ from bottles.frontend.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/local-resource-entry.ui") -class LocalResourceEntry(Adw.ActionRow): - __gtype_name__ = "LocalResourceEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/local-resource-row.ui") +class LocalResourceRow(Adw.ActionRow): + __gtype_name__ = "LocalResourceRow" # region Widgets btn_path = Gtk.Template.Child() @@ -157,7 +157,7 @@ def __check_resources(self, *_args): return for resource in self.__local_resources: - _entry = LocalResourceEntry(self, resource) + _entry = LocalResourceRow(self, resource) GLib.idle_add(self.group_resources.add, _entry) self.btn_proceed.set_visible(True) diff --git a/po/POTFILES b/po/POTFILES index 716e9c425e..094bda80b7 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -45,7 +45,7 @@ bottles/frontend/ui/library-view.blp bottles/frontend/ui/bottle-row.blp bottles/frontend/ui/bottles-list-view.blp bottles/frontend/ui/loading-view.blp -bottles/frontend/ui/local-resource-entry.blp +bottles/frontend/ui/local-resource-row.blp bottles/frontend/ui/new.blp bottles/frontend/ui/onboard.blp bottles/frontend/ui/preferences.blp From 03bbe64117f23fd7e433225be10ca0e88fef72ca Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:30:32 -0500 Subject: [PATCH 31/47] onboard-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/ui/{onboard.blp => onboard-dialog.blp} | 0 bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/{onboard.py => onboard_dialog.py} | 6 +++--- bottles/frontend/windows/window.py | 2 +- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{onboard.blp => onboard-dialog.blp} (100%) rename bottles/frontend/windows/{onboard.py => onboard_dialog.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index bb01ac283b..4c902199c2 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -54,6 +54,6 @@ exclusion-patterns-dialog.ui dialog-upgrade-versioning.ui dialog-vmtouch.ui - onboard.ui + onboard-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index b7c2413113..52e509dffd 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -46,7 +46,7 @@ blueprints = custom_target('blueprints', 'loading-view.blp', 'local-resource-row.blp', 'new-bottle-dialog.blp', - 'onboard.blp', + 'onboard-dialog.blp', 'preferences.blp', 'program-entry.blp', 'state-entry.blp', diff --git a/bottles/frontend/ui/onboard.blp b/bottles/frontend/ui/onboard-dialog.blp similarity index 100% rename from bottles/frontend/ui/onboard.blp rename to bottles/frontend/ui/onboard-dialog.blp diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 30614edb58..843854605d 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -9,7 +9,7 @@ bottles_sources = [ 'envvars.py', 'generic.py', 'launchoptions.py', - 'onboard.py', + 'onboard_dialog.py', 'rename.py', 'drives_dialog.py', 'gamescope_dialog.py', diff --git a/bottles/frontend/windows/onboard.py b/bottles/frontend/windows/onboard_dialog.py similarity index 97% rename from bottles/frontend/windows/onboard.py rename to bottles/frontend/windows/onboard_dialog.py index 7a56ef71dc..076e36a812 100644 --- a/bottles/frontend/windows/onboard.py +++ b/bottles/frontend/windows/onboard_dialog.py @@ -1,6 +1,6 @@ -# onboard.py +# onboard_dialog.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 @@ -24,7 +24,7 @@ from bottles.frontend.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/onboard.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/onboard-dialog.ui") class OnboardDialog(Adw.Window): __gtype_name__ = "OnboardDialog" __installing = False diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/windows/window.py index 4dc23d83b0..eb85e427b9 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/windows/window.py @@ -45,7 +45,7 @@ from bottles.frontend.views.preferences import PreferencesWindow from bottles.frontend.windows.crash_report_dialog import CrashReportDialog from bottles.frontend.windows.dependencies_check_dialog import DependenciesCheckDialog -from bottles.frontend.windows.onboard import OnboardDialog +from bottles.frontend.windows.onboard_dialog import OnboardDialog logging = Logger() diff --git a/po/POTFILES b/po/POTFILES index 094bda80b7..e9f84cb65a 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -47,7 +47,7 @@ bottles/frontend/ui/bottles-list-view.blp bottles/frontend/ui/loading-view.blp bottles/frontend/ui/local-resource-row.blp bottles/frontend/ui/new.blp -bottles/frontend/ui/onboard.blp +bottles/frontend/ui/onboard-dialog.blp bottles/frontend/ui/preferences.blp bottles/frontend/ui/program-entry.blp bottles/frontend/ui/state-entry.blp From 683e5863621f1eb19139f619a06f4995b6fa0556 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:45:21 -0500 Subject: [PATCH 32/47] program-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/ui/{program-entry.blp => program-row.blp} | 2 +- bottles/frontend/views/bottle_details_page.py | 4 ++-- bottles/frontend/widgets/meson.build | 2 +- .../frontend/widgets/{program.py => program_row.py} | 10 +++++----- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{program-entry.blp => program-row.blp} (98%) rename bottles/frontend/widgets/{program.py => program_row.py} (98%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 4c902199c2..b2e72e698c 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -12,7 +12,7 @@ check-row.ui task-entry.ui dependency-entry-row.ui - program-entry.ui + program-row.ui importer-row.ui state-entry.ui installer-row.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 52e509dffd..893bf67307 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -48,7 +48,7 @@ blueprints = custom_target('blueprints', 'new-bottle-dialog.blp', 'onboard-dialog.blp', 'preferences.blp', - 'program-entry.blp', + 'program-row.blp', 'state-entry.blp', 'task-entry.blp', 'window.blp', diff --git a/bottles/frontend/ui/program-entry.blp b/bottles/frontend/ui/program-row.blp similarity index 98% rename from bottles/frontend/ui/program-entry.blp rename to bottles/frontend/ui/program-row.blp index 9bb02f4ec2..7c51a6e95b 100644 --- a/bottles/frontend/ui/program-entry.blp +++ b/bottles/frontend/ui/program-row.blp @@ -77,7 +77,7 @@ Popover pop_actions { } } -template $ProgramEntry: Adw.ActionRow { +template $ProgramRow: Adw.ActionRow { title: _("Program name"); Box { diff --git a/bottles/frontend/views/bottle_details_page.py b/bottles/frontend/views/bottle_details_page.py index 62f237fc4b..39b39065bf 100644 --- a/bottles/frontend/views/bottle_details_page.py +++ b/bottles/frontend/views/bottle_details_page.py @@ -41,7 +41,7 @@ from bottles.frontend.utils.common import open_doc_url from bottles.frontend.utils.filters import add_executable_filters, add_all_filters from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.program import ProgramEntry +from bottles.frontend.widgets.program_row import ProgramRow from bottles.frontend.windows.duplicate_dialog import DuplicateDialog from bottles.frontend.windows.upgradeversioning import UpgradeVersioningDialog @@ -308,7 +308,7 @@ def new_program( check_boot = wineserver_status self.add_program( - ProgramEntry( + ProgramRow( self.window, self.config, _program, diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index 941db29d82..21a7a6cb5f 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -7,7 +7,7 @@ bottles_sources = [ 'executable.py', 'importer_row.py', 'installer_row.py', - 'program.py', + 'program_row.py', 'state.py', 'component_entry_row.py', 'library.py', diff --git a/bottles/frontend/widgets/program.py b/bottles/frontend/widgets/program_row.py similarity index 98% rename from bottles/frontend/widgets/program.py rename to bottles/frontend/widgets/program_row.py index 2b0e43b382..3158d02f12 100644 --- a/bottles/frontend/widgets/program.py +++ b/bottles/frontend/widgets/program_row.py @@ -1,6 +1,6 @@ -# program.py +# program_row.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 @@ -34,9 +34,9 @@ # noinspection PyUnusedLocal -@Gtk.Template(resource_path="/com/usebottles/bottles/program-entry.ui") -class ProgramEntry(Adw.ActionRow): - __gtype_name__ = "ProgramEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/program-row.ui") +class ProgramRow(Adw.ActionRow): + __gtype_name__ = "ProgramRow" # region Widgets btn_menu = Gtk.Template.Child() diff --git a/po/POTFILES b/po/POTFILES index e9f84cb65a..990307b491 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -49,7 +49,7 @@ bottles/frontend/ui/local-resource-row.blp bottles/frontend/ui/new.blp bottles/frontend/ui/onboard-dialog.blp bottles/frontend/ui/preferences.blp -bottles/frontend/ui/program-entry.blp +bottles/frontend/ui/program-row.blp bottles/frontend/ui/state-entry.blp bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp @@ -69,7 +69,7 @@ bottles/frontend/widgets/dependency.py bottles/frontend/widgets/importer_row.py bottles/frontend/widgets/installer_row.py bottles/frontend/widgets/library.py -bottles/frontend/widgets/program.py +bottles/frontend/widgets/program_row.py bottles/frontend/widgets/state.py bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display_dialog.py From e1ce4ea68f99bd273b6ac5ddccb526af78c922d3 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:48:10 -0500 Subject: [PATCH 33/47] state-row: Rename files and class name --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- bottles/frontend/ui/{state-entry.blp => state-row.blp} | 2 +- bottles/frontend/views/details_versioning_page.py | 4 ++-- bottles/frontend/widgets/meson.build | 2 +- bottles/frontend/widgets/{state.py => state_row.py} | 10 +++++----- po/POTFILES | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) rename bottles/frontend/ui/{state-entry.blp => state-row.blp} (91%) rename bottles/frontend/widgets/{state.py => state_row.py} (95%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index b2e72e698c..9a9e3edc84 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -14,7 +14,7 @@ dependency-entry-row.ui program-row.ui importer-row.ui - state-entry.ui + state-row.ui installer-row.ui dll-override-entry.ui env-var-entry.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 893bf67307..66057a7278 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -49,7 +49,7 @@ blueprints = custom_target('blueprints', 'onboard-dialog.blp', 'preferences.blp', 'program-row.blp', - 'state-entry.blp', + 'state-row.blp', 'task-entry.blp', 'window.blp', 'details-preferences-page.blp', diff --git a/bottles/frontend/ui/state-entry.blp b/bottles/frontend/ui/state-row.blp similarity index 91% rename from bottles/frontend/ui/state-entry.blp rename to bottles/frontend/ui/state-row.blp index ef3efee084..8358e50282 100644 --- a/bottles/frontend/ui/state-entry.blp +++ b/bottles/frontend/ui/state-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $StateEntry: Adw.ActionRow { +template $StateRow: Adw.ActionRow { activatable-widget: btn_restore; /* Translators: id as identification */ diff --git a/bottles/frontend/views/details_versioning_page.py b/bottles/frontend/views/details_versioning_page.py index 946a620684..661852d3f9 100644 --- a/bottles/frontend/views/details_versioning_page.py +++ b/bottles/frontend/views/details_versioning_page.py @@ -24,7 +24,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.utils.common import open_doc_url from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.state import StateEntry +from bottles.frontend.widgets.state_row import StateRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-versioning-page.ui") @@ -92,7 +92,7 @@ def update(self, widget=None, config=None, states=None, active=0): ) def new_state(_state, active): - entry = StateEntry( + entry = StateRow( parent=self, config=self.config, state=_state, active=active ) self.__registry.append(entry) diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build index 21a7a6cb5f..db12efc56d 100644 --- a/bottles/frontend/widgets/meson.build +++ b/bottles/frontend/widgets/meson.build @@ -8,7 +8,7 @@ bottles_sources = [ 'importer_row.py', 'installer_row.py', 'program_row.py', - 'state.py', + 'state_row.py', 'component_entry_row.py', 'library.py', ] diff --git a/bottles/frontend/widgets/state.py b/bottles/frontend/widgets/state_row.py similarity index 95% rename from bottles/frontend/widgets/state.py rename to bottles/frontend/widgets/state_row.py index ee016c3960..6f3c0f26fa 100644 --- a/bottles/frontend/widgets/state.py +++ b/bottles/frontend/widgets/state_row.py @@ -1,6 +1,6 @@ -# state.py +# state_row.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 @@ -24,9 +24,9 @@ from bottles.frontend.utils.gtk import GtkUtils -@Gtk.Template(resource_path="/com/usebottles/bottles/state-entry.ui") -class StateEntry(Adw.ActionRow): - __gtype_name__ = "StateEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/state-row.ui") +class StateRow(Adw.ActionRow): + __gtype_name__ = "StateRow" # region Widgets btn_restore = Gtk.Template.Child() diff --git a/po/POTFILES b/po/POTFILES index 990307b491..d919fc530c 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -50,7 +50,7 @@ bottles/frontend/ui/new.blp bottles/frontend/ui/onboard-dialog.blp bottles/frontend/ui/preferences.blp bottles/frontend/ui/program-row.blp -bottles/frontend/ui/state-entry.blp +bottles/frontend/ui/state-row.blp bottles/frontend/ui/task-entry.blp bottles/frontend/ui/window.blp bottles/frontend/ui/fsr-dialog.blp @@ -70,7 +70,7 @@ bottles/frontend/widgets/importer_row.py bottles/frontend/widgets/installer_row.py bottles/frontend/widgets/library.py bottles/frontend/widgets/program_row.py -bottles/frontend/widgets/state.py +bottles/frontend/widgets/state_row.py bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display_dialog.py bottles/frontend/windows/dll_overrides_dialog.py From ba874c391aeb728880c7aa863d89455b57af3c0d Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Sun, 12 Jan 2025 19:50:15 -0500 Subject: [PATCH 34/47] task-row: Rename file and class name --- bottles/frontend/operation.py | 14 +++++++------- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/ui/{task-entry.blp => task-row.blp} | 2 +- po/POTFILES | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) rename bottles/frontend/ui/{task-entry.blp => task-row.blp} (93%) diff --git a/bottles/frontend/operation.py b/bottles/frontend/operation.py index e681277f06..8ed298cc9e 100644 --- a/bottles/frontend/operation.py +++ b/bottles/frontend/operation.py @@ -23,9 +23,9 @@ from bottles.backend.state import TaskManager -@Gtk.Template(resource_path="/com/usebottles/bottles/task-entry.ui") -class TaskEntry(Adw.ActionRow): - __gtype_name__ = "TaskEntry" +@Gtk.Template(resource_path="/com/usebottles/bottles/task-row.ui") +class TaskRow(Adw.ActionRow): + __gtype_name__ = "TaskRow" # region Widgets btn_cancel = Gtk.Template.Child() @@ -52,14 +52,14 @@ def update(self, subtitle: str): class TaskSyncer: """Keep task list updated with backend TaskManager""" - _TASK_WIDGETS: Dict[UUID, TaskEntry] = {} + _TASK_WIDGETS: Dict[UUID, TaskRow] = {} def __init__(self, window): self.window = window - def _new_widget(self, title, cancellable=True) -> TaskEntry: - """create TaskEntry widget & add to task list""" - task_entry = TaskEntry(self.window, title, cancellable) + def _new_widget(self, title, cancellable=True) -> TaskRow: + """create TaskRow widget & add to task list""" + task_entry = TaskRow(self.window, title, cancellable) self.window.page_details.list_tasks.append(task_entry) return task_entry diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 9a9e3edc84..280160c12a 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -10,7 +10,7 @@ loading-view.ui bottle-row.ui check-row.ui - task-entry.ui + task-row.ui dependency-entry-row.ui program-row.ui importer-row.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 66057a7278..a35cd669f4 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -50,7 +50,7 @@ blueprints = custom_target('blueprints', 'preferences.blp', 'program-row.blp', 'state-row.blp', - 'task-entry.blp', + 'task-row.blp', 'window.blp', 'details-preferences-page.blp', 'help-overlay.blp', diff --git a/bottles/frontend/ui/task-entry.blp b/bottles/frontend/ui/task-row.blp similarity index 93% rename from bottles/frontend/ui/task-entry.blp rename to bottles/frontend/ui/task-row.blp index 1fe4d4fe52..c4da07a148 100644 --- a/bottles/frontend/ui/task-entry.blp +++ b/bottles/frontend/ui/task-row.blp @@ -1,7 +1,7 @@ using Gtk 4.0; using Adw 1; -template $TaskEntry: Adw.ActionRow { +template $TaskRow: Adw.ActionRow { Box { spacing: 10; diff --git a/po/POTFILES b/po/POTFILES index d919fc530c..315df15e9b 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -51,7 +51,7 @@ bottles/frontend/ui/onboard-dialog.blp bottles/frontend/ui/preferences.blp bottles/frontend/ui/program-row.blp bottles/frontend/ui/state-row.blp -bottles/frontend/ui/task-entry.blp +bottles/frontend/ui/task-row.blp bottles/frontend/ui/window.blp bottles/frontend/ui/fsr-dialog.blp bottles/frontend/views/bottle_details_page.py From 0237e2466b4bb1032299fed6f5c458a432a5908e Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:26:23 -0500 Subject: [PATCH 35/47] environment-variables-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...dialog-env-vars.blp => environment-variables-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 4 +++- .../windows/{envvars.py => environment_variables_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 11 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-env-vars.blp => environment-variables-dialog.blp} (100%) rename bottles/frontend/windows/{envvars.py => environment_variables_dialog.py} (97%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 280160c12a..a8b6dea1e6 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -35,7 +35,7 @@ library-view.ui dialog-launch-options.ui dll-overrides-dialog.ui - dialog-env-vars.ui + environment-variables-dialog.ui crash-report-dialog.ui duplicate-dialog.ui dialog-rename.ui diff --git a/bottles/frontend/ui/dialog-env-vars.blp b/bottles/frontend/ui/environment-variables-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-env-vars.blp rename to bottles/frontend/ui/environment-variables-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index a35cd669f4..b0d9dfdf40 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -17,7 +17,7 @@ blueprints = custom_target('blueprints', 'dll-overrides-dialog.blp', 'drives-dialog.blp', 'duplicate-dialog.blp', - 'dialog-env-vars.blp', + 'environment-variables-dialog.blp', 'exclusion-patterns-dialog.blp', 'gamescope-dialog.blp', 'dialog-installer.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 09b8cde138..07082dc3f6 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -46,7 +46,9 @@ from bottles.frontend.windows.display_dialog import DisplayDialog from bottles.frontend.windows.dll_overrides_dialog import DLLOverridesDialog from bottles.frontend.windows.drives_dialog import DrivesDialog -from bottles.frontend.windows.envvars import EnvironmentVariablesDialog +from bottles.frontend.windows.environment_variables_dialog import ( + EnvironmentVariablesDialog, +) from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog from bottles.frontend.windows.fsr_dialog import FsrDialog from bottles.frontend.windows.gamescope_dialog import GamescopeDialog diff --git a/bottles/frontend/windows/envvars.py b/bottles/frontend/windows/environment_variables_dialog.py similarity index 97% rename from bottles/frontend/windows/envvars.py rename to bottles/frontend/windows/environment_variables_dialog.py index 85815f1433..8ca9de3657 100644 --- a/bottles/frontend/windows/envvars.py +++ b/bottles/frontend/windows/environment_variables_dialog.py @@ -1,6 +1,6 @@ -# envvars.py +# environment_variables_dialog.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 @@ -122,7 +122,7 @@ def __validate(self, *_args): self.add_css_class("error") -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-env-vars.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/environment-variables-dialog.ui") class EnvironmentVariablesDialog(Adw.Dialog): __gtype_name__ = "EnvironmentVariablesDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 843854605d..87c27c82bd 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -6,7 +6,7 @@ bottles_sources = [ 'crash_report_dialog.py', 'dll_overrides_dialog.py', 'duplicate_dialog.py', - 'envvars.py', + 'environment_variables_dialog.py', 'generic.py', 'launchoptions.py', 'onboard_dialog.py', diff --git a/po/POTFILES b/po/POTFILES index 315df15e9b..76acb3650d 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -21,7 +21,7 @@ bottles/frontend/ui/dependencies-check-dialog.blp bottles/frontend/ui/dll-overrides-dialog.blp bottles/frontend/ui/drives-dialog.blp bottles/frontend/ui/duplicate-dialog.blp -bottles/frontend/ui/dialog-env-vars.blp +bottles/frontend/ui/environment-variables-dialog.blp bottles/frontend/ui/exclusion-patterns-dialog.blp bottles/frontend/ui/gamescope-dialog.blp bottles/frontend/ui/dialog-installer.blp @@ -75,7 +75,7 @@ bottles/frontend/windows/crash_report_dialog.py bottles/frontend/windows/display_dialog.py bottles/frontend/windows/dll_overrides_dialog.py bottles/frontend/windows/drives_dialog.py -bottles/frontend/windows/envvars.py +bottles/frontend/windows/environment_variables_dialog.py bottles/frontend/windows/exclusion_patterns_dialog.py bottles/frontend/windows/generic.py bottles/frontend/windows/installer.py From 49cc12861f5611b84aab3f495b7e59490a9a8953 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:29:08 -0500 Subject: [PATCH 36/47] installer-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{dialog-installer.blp => installer-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/widgets/installer_row.py | 2 +- .../frontend/windows/{installer.py => installer_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-installer.blp => installer-dialog.blp} (100%) rename bottles/frontend/windows/{installer.py => installer_dialog.py} (98%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index a8b6dea1e6..d1678257c5 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -47,7 +47,7 @@ drives-dialog.ui dialog-journal.ui dialog-sandbox.ui - dialog-installer.ui + installer-dialog.ui bottle-picker-dialog.ui dialog-proton-alert.ui dependencies-check-dialog.ui diff --git a/bottles/frontend/ui/dialog-installer.blp b/bottles/frontend/ui/installer-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-installer.blp rename to bottles/frontend/ui/installer-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index b0d9dfdf40..01edd062a2 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -20,7 +20,7 @@ blueprints = custom_target('blueprints', 'environment-variables-dialog.blp', 'exclusion-patterns-dialog.blp', 'gamescope-dialog.blp', - 'dialog-installer.blp', + 'installer-dialog.blp', 'dialog-journal.blp', 'dialog-launch-options.blp', 'dialog-proton-alert.blp', diff --git a/bottles/frontend/widgets/installer_row.py b/bottles/frontend/widgets/installer_row.py index cf001399cb..6860dff9dc 100644 --- a/bottles/frontend/widgets/installer_row.py +++ b/bottles/frontend/widgets/installer_row.py @@ -20,7 +20,7 @@ import webbrowser from bottles.frontend.windows.generic import SourceDialog -from bottles.frontend.windows.installer import InstallerDialog +from bottles.frontend.windows.installer_dialog import InstallerDialog @Gtk.Template(resource_path="/com/usebottles/bottles/installer-row.ui") diff --git a/bottles/frontend/windows/installer.py b/bottles/frontend/windows/installer_dialog.py similarity index 98% rename from bottles/frontend/windows/installer.py rename to bottles/frontend/windows/installer_dialog.py index dc520466e6..9479c214e8 100644 --- a/bottles/frontend/windows/installer.py +++ b/bottles/frontend/windows/installer_dialog.py @@ -1,6 +1,6 @@ -# installer.py +# installer_dialog.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 @@ -70,7 +70,7 @@ def set_path(_dialog, response): dialog.show() -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-installer.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/installer-dialog.ui") class InstallerDialog(Adw.Window): __gtype_name__ = "InstallerDialog" __sections = {} diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 87c27c82bd..fddf5e2fa6 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -22,7 +22,7 @@ bottles_sources = [ 'bottle_picker_dialog.py', 'protonalert.py', 'sandbox.py', - 'installer.py', + 'installer_dialog.py', 'dependencies_check_dialog.py', 'exclusion_patterns_dialog.py', 'upgradeversioning.py', diff --git a/po/POTFILES b/po/POTFILES index 76acb3650d..44aabe74e0 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -24,7 +24,7 @@ bottles/frontend/ui/duplicate-dialog.blp bottles/frontend/ui/environment-variables-dialog.blp bottles/frontend/ui/exclusion-patterns-dialog.blp bottles/frontend/ui/gamescope-dialog.blp -bottles/frontend/ui/dialog-installer.blp +bottles/frontend/ui/installer-dialog.blp bottles/frontend/ui/dialog-journal.blp bottles/frontend/ui/dialog-launch-options.blp bottles/frontend/ui/dialog-proton-alert.blp @@ -78,7 +78,7 @@ bottles/frontend/windows/drives_dialog.py bottles/frontend/windows/environment_variables_dialog.py bottles/frontend/windows/exclusion_patterns_dialog.py bottles/frontend/windows/generic.py -bottles/frontend/windows/installer.py +bottles/frontend/windows/installer_dialog.py bottles/frontend/windows/launchoptions.py bottles/frontend/windows/main_window.py bottles/frontend/windows/vkbasalt.py From 28e89f7dce8be4e15f04a5ab579f9b54f6ec82b7 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:31:54 -0500 Subject: [PATCH 37/47] journal-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../frontend/ui/{dialog-journal.blp => journal-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/windows/{journal.py => journal_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename bottles/frontend/ui/{dialog-journal.blp => journal-dialog.blp} (100%) rename bottles/frontend/windows/{journal.py => journal_dialog.py} (96%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index d1678257c5..db55e07e8f 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -45,7 +45,7 @@ dialog-mangohud.ui display-dialog.ui drives-dialog.ui - dialog-journal.ui + journal-dialog.ui dialog-sandbox.ui installer-dialog.ui bottle-picker-dialog.ui diff --git a/bottles/frontend/ui/dialog-journal.blp b/bottles/frontend/ui/journal-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-journal.blp rename to bottles/frontend/ui/journal-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 01edd062a2..d8a83f4aaa 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -21,7 +21,7 @@ blueprints = custom_target('blueprints', 'exclusion-patterns-dialog.blp', 'gamescope-dialog.blp', 'installer-dialog.blp', - 'dialog-journal.blp', + 'journal-dialog.blp', 'dialog-launch-options.blp', 'dialog-proton-alert.blp', 'dialog-rename.blp', diff --git a/bottles/frontend/windows/journal.py b/bottles/frontend/windows/journal_dialog.py similarity index 96% rename from bottles/frontend/windows/journal.py rename to bottles/frontend/windows/journal_dialog.py index 9199d1bae4..5540bc307e 100644 --- a/bottles/frontend/windows/journal.py +++ b/bottles/frontend/windows/journal_dialog.py @@ -1,6 +1,6 @@ -# journal.py +# journal_dialog.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 @@ -20,7 +20,7 @@ from bottles.backend.managers.journal import JournalManager, JournalSeverity -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-journal.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/journal-dialog.ui") class JournalDialog(Adw.Window): __gtype_name__ = "JournalDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index fddf5e2fa6..0270ba873d 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -18,7 +18,7 @@ bottles_sources = [ 'mangohud.py', 'display_dialog.py', 'generic_cli.py', - 'journal.py', + 'journal_dialog.py', 'bottle_picker_dialog.py', 'protonalert.py', 'sandbox.py', diff --git a/po/POTFILES b/po/POTFILES index 44aabe74e0..580aafcb63 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -25,7 +25,7 @@ bottles/frontend/ui/environment-variables-dialog.blp bottles/frontend/ui/exclusion-patterns-dialog.blp bottles/frontend/ui/gamescope-dialog.blp bottles/frontend/ui/installer-dialog.blp -bottles/frontend/ui/dialog-journal.blp +bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/dialog-launch-options.blp bottles/frontend/ui/dialog-proton-alert.blp bottles/frontend/ui/dialog-rename.blp From 567f4303824d066db35839da544dc27cf2d274bd Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:34:36 -0500 Subject: [PATCH 38/47] launch-options-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- ...{dialog-launch-options.blp => launch-options-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/widgets/program_row.py | 2 +- .../windows/{launchoptions.py => launch_options_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-launch-options.blp => launch-options-dialog.blp} (100%) rename bottles/frontend/windows/{launchoptions.py => launch_options_dialog.py} (99%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index db55e07e8f..5b9a0afe7f 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -33,7 +33,7 @@ preferences.ui importer-view.ui library-view.ui - dialog-launch-options.ui + launch-options-dialog.ui dll-overrides-dialog.ui environment-variables-dialog.ui crash-report-dialog.ui diff --git a/bottles/frontend/ui/dialog-launch-options.blp b/bottles/frontend/ui/launch-options-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-launch-options.blp rename to bottles/frontend/ui/launch-options-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index d8a83f4aaa..7e851b12e6 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -22,7 +22,7 @@ blueprints = custom_target('blueprints', 'gamescope-dialog.blp', 'installer-dialog.blp', 'journal-dialog.blp', - 'dialog-launch-options.blp', + 'launch-options-dialog.blp', 'dialog-proton-alert.blp', 'dialog-rename.blp', 'dialog-sandbox.blp', diff --git a/bottles/frontend/widgets/program_row.py b/bottles/frontend/widgets/program_row.py index 3158d02f12..1241fac11b 100644 --- a/bottles/frontend/widgets/program_row.py +++ b/bottles/frontend/widgets/program_row.py @@ -29,7 +29,7 @@ from bottles.backend.wine.uninstaller import Uninstaller from bottles.backend.wine.winedbg import WineDbg from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.windows.launchoptions import LaunchOptionsDialog +from bottles.frontend.windows.launch_options_dialog import LaunchOptionsDialog from bottles.frontend.windows.rename import RenameDialog diff --git a/bottles/frontend/windows/launchoptions.py b/bottles/frontend/windows/launch_options_dialog.py similarity index 99% rename from bottles/frontend/windows/launchoptions.py rename to bottles/frontend/windows/launch_options_dialog.py index 1b1550d013..2fbbbc9594 100644 --- a/bottles/frontend/windows/launchoptions.py +++ b/bottles/frontend/windows/launch_options_dialog.py @@ -1,6 +1,6 @@ -# launchoptions.py +# launch_options_dialog.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 @@ -24,7 +24,7 @@ logging = Logger() -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-launch-options.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/launch-options-dialog.ui") class LaunchOptionsDialog(Adw.Window): __gtype_name__ = "LaunchOptionsDialog" __gsignals__ = { diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 0270ba873d..86a07a85e5 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -8,7 +8,7 @@ bottles_sources = [ 'duplicate_dialog.py', 'environment_variables_dialog.py', 'generic.py', - 'launchoptions.py', + 'launch_options_dialog.py', 'onboard_dialog.py', 'rename.py', 'drives_dialog.py', diff --git a/po/POTFILES b/po/POTFILES index 580aafcb63..ecd2399c9f 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -26,7 +26,7 @@ bottles/frontend/ui/exclusion-patterns-dialog.blp bottles/frontend/ui/gamescope-dialog.blp bottles/frontend/ui/installer-dialog.blp bottles/frontend/ui/journal-dialog.blp -bottles/frontend/ui/dialog-launch-options.blp +bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/dialog-proton-alert.blp bottles/frontend/ui/dialog-rename.blp bottles/frontend/ui/dialog-run-args.blp @@ -79,7 +79,7 @@ bottles/frontend/windows/environment_variables_dialog.py bottles/frontend/windows/exclusion_patterns_dialog.py bottles/frontend/windows/generic.py bottles/frontend/windows/installer_dialog.py -bottles/frontend/windows/launchoptions.py +bottles/frontend/windows/launch_options_dialog.py bottles/frontend/windows/main_window.py bottles/frontend/windows/vkbasalt.py bottles/frontend/windows/fsr_dialog.py From 3307815230eb5f01ce35e242df84f07060f4cd45 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:40:53 -0500 Subject: [PATCH 39/47] mangohud-dialog: Rename files and add to POTFILES --- bottles/frontend/ui/bottles.gresource.xml | 2 +- .../ui/{dialog-mangohud.blp => mangohud-dialog.blp} | 0 bottles/frontend/ui/meson.build | 2 +- bottles/frontend/views/details_preferences_page.py | 2 +- .../frontend/windows/{mangohud.py => mangohud_dialog.py} | 6 +++--- bottles/frontend/windows/meson.build | 2 +- po/POTFILES | 2 ++ 7 files changed, 9 insertions(+), 7 deletions(-) rename bottles/frontend/ui/{dialog-mangohud.blp => mangohud-dialog.blp} (100%) rename bottles/frontend/windows/{mangohud.py => mangohud_dialog.py} (93%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 5b9a0afe7f..94ad4f021c 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -42,7 +42,7 @@ gamescope-dialog.ui dialog-vkbasalt.ui fsr-dialog.ui - dialog-mangohud.ui + mangohud-dialog.ui display-dialog.ui drives-dialog.ui journal-dialog.ui diff --git a/bottles/frontend/ui/dialog-mangohud.blp b/bottles/frontend/ui/mangohud-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-mangohud.blp rename to bottles/frontend/ui/mangohud-dialog.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 7e851b12e6..cea7093c0d 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -31,7 +31,7 @@ blueprints = custom_target('blueprints', 'display-dialog.blp', 'dialog-vmtouch.blp', 'fsr-dialog.blp', - 'dialog-mangohud.blp', + 'mangohud-dialog.blp', 'dll-override-entry.blp', 'drive-entry.blp', 'env-var-entry.blp', diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 07082dc3f6..e6adf416e9 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -52,7 +52,7 @@ from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog from bottles.frontend.windows.fsr_dialog import FsrDialog from bottles.frontend.windows.gamescope_dialog import GamescopeDialog -from bottles.frontend.windows.mangohud import MangoHudDialog +from bottles.frontend.windows.mangohud_dialog import MangoHudDialog from bottles.frontend.windows.protonalert import ProtonAlertDialog from bottles.frontend.windows.sandbox import SandboxDialog from bottles.frontend.windows.vkbasalt import VkBasaltDialog diff --git a/bottles/frontend/windows/mangohud.py b/bottles/frontend/windows/mangohud_dialog.py similarity index 93% rename from bottles/frontend/windows/mangohud.py rename to bottles/frontend/windows/mangohud_dialog.py index 77e47df06e..7690c2ac53 100644 --- a/bottles/frontend/windows/mangohud.py +++ b/bottles/frontend/windows/mangohud_dialog.py @@ -1,6 +1,6 @@ -# mangohud.py +# mangohud_dialog.py # -# Copyright 2022 Bottles Contributors +# 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 @@ -21,7 +21,7 @@ logging = Logger() -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-mangohud.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/mangohud-dialog.ui") class MangoHudDialog(Adw.Window): __gtype_name__ = "MangoHudDialog" diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 86a07a85e5..4e3db1630b 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -15,7 +15,7 @@ bottles_sources = [ 'gamescope_dialog.py', 'vkbasalt.py', 'fsr_dialog.py', - 'mangohud.py', + 'mangohud_dialog.py', 'display_dialog.py', 'generic_cli.py', 'journal_dialog.py', diff --git a/po/POTFILES b/po/POTFILES index ecd2399c9f..cde4c95b15 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -33,6 +33,7 @@ bottles/frontend/ui/dialog-run-args.blp bottles/frontend/ui/dialog-sandbox.blp bottles/frontend/ui/dialog-upgrade-versioning.blp bottles/frontend/ui/dialog-vkbasalt.blp +bottles/frontend/ui/mangohud-dialog.blp bottles/frontend/ui/dll-override-entry.blp bottles/frontend/ui/drive-entry.blp bottles/frontend/ui/env-var-entry.blp @@ -83,6 +84,7 @@ bottles/frontend/windows/launch_options_dialog.py bottles/frontend/windows/main_window.py bottles/frontend/windows/vkbasalt.py bottles/frontend/windows/fsr_dialog.py +bottles/frontend/windows/mangohud_dialog.py data/com.usebottles.bottles.desktop.in.in data/com.usebottles.bottles.gschema.xml data/com.usebottles.bottles.metainfo.xml.in From 0321c6a99b69526fa7bfdc1b5202b9e77619dcd1 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:42:52 -0500 Subject: [PATCH 40/47] proton-alert-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../ui/{dialog-proton-alert.blp => proton-alert-dialog.blp} | 0 bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/meson.build | 2 +- .../windows/{protonalert.py => proton_alert_dialog.py} | 6 +++--- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-proton-alert.blp => proton-alert-dialog.blp} (100%) rename bottles/frontend/windows/{protonalert.py => proton_alert_dialog.py} (91%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 94ad4f021c..d1551d59cc 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -49,7 +49,7 @@ dialog-sandbox.ui installer-dialog.ui bottle-picker-dialog.ui - dialog-proton-alert.ui + proton-alert-dialog.ui dependencies-check-dialog.ui exclusion-patterns-dialog.ui dialog-upgrade-versioning.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index cea7093c0d..092355596e 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -23,7 +23,7 @@ blueprints = custom_target('blueprints', 'installer-dialog.blp', 'journal-dialog.blp', 'launch-options-dialog.blp', - 'dialog-proton-alert.blp', + 'proton-alert-dialog.blp', 'dialog-rename.blp', 'dialog-sandbox.blp', 'dialog-upgrade-versioning.blp', diff --git a/bottles/frontend/ui/dialog-proton-alert.blp b/bottles/frontend/ui/proton-alert-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-proton-alert.blp rename to bottles/frontend/ui/proton-alert-dialog.blp diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index e6adf416e9..c921442791 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -53,7 +53,7 @@ from bottles.frontend.windows.fsr_dialog import FsrDialog from bottles.frontend.windows.gamescope_dialog import GamescopeDialog from bottles.frontend.windows.mangohud_dialog import MangoHudDialog -from bottles.frontend.windows.protonalert import ProtonAlertDialog +from bottles.frontend.windows.proton_alert_dialog import ProtonAlertDialog from bottles.frontend.windows.sandbox import SandboxDialog from bottles.frontend.windows.vkbasalt import VkBasaltDialog from bottles.frontend.windows.vmtouch import VmtouchDialog diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 4e3db1630b..a52ab86291 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -20,7 +20,7 @@ bottles_sources = [ 'generic_cli.py', 'journal_dialog.py', 'bottle_picker_dialog.py', - 'protonalert.py', + 'proton_alert_dialog.py', 'sandbox.py', 'installer_dialog.py', 'dependencies_check_dialog.py', diff --git a/bottles/frontend/windows/protonalert.py b/bottles/frontend/windows/proton_alert_dialog.py similarity index 91% rename from bottles/frontend/windows/protonalert.py rename to bottles/frontend/windows/proton_alert_dialog.py index c13a09a9e2..f4a860c2bd 100644 --- a/bottles/frontend/windows/protonalert.py +++ b/bottles/frontend/windows/proton_alert_dialog.py @@ -1,6 +1,6 @@ -# protonalert.py +# proton_alert_dialog.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 @@ -18,7 +18,7 @@ from gi.repository import Gtk, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-proton-alert.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/proton-alert-dialog.ui") class ProtonAlertDialog(Adw.Window): __gtype_name__ = "ProtonAlertDialog" __resources = {} diff --git a/po/POTFILES b/po/POTFILES index cde4c95b15..cd9a5e12d8 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -27,7 +27,7 @@ bottles/frontend/ui/gamescope-dialog.blp bottles/frontend/ui/installer-dialog.blp bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/launch-options-dialog.blp -bottles/frontend/ui/dialog-proton-alert.blp +bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/dialog-rename.blp bottles/frontend/ui/dialog-run-args.blp bottles/frontend/ui/dialog-sandbox.blp From ef0cc7ed9cde0a86a539c5a0da93d3bfe679b556 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:44:39 -0500 Subject: [PATCH 41/47] rename-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/ui/{dialog-rename.blp => rename-dialog.blp} | 0 bottles/frontend/widgets/program_row.py | 2 +- bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/{rename.py => rename_dialog.py} | 6 +++--- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-rename.blp => rename-dialog.blp} (100%) rename bottles/frontend/windows/{rename.py => rename_dialog.py} (93%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index d1551d59cc..01ba25dc3a 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -38,7 +38,7 @@ environment-variables-dialog.ui crash-report-dialog.ui duplicate-dialog.ui - dialog-rename.ui + rename-dialog.ui gamescope-dialog.ui dialog-vkbasalt.ui fsr-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 092355596e..87fce47b4b 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -24,7 +24,7 @@ blueprints = custom_target('blueprints', 'journal-dialog.blp', 'launch-options-dialog.blp', 'proton-alert-dialog.blp', - 'dialog-rename.blp', + 'rename-dialog.blp', 'dialog-sandbox.blp', 'dialog-upgrade-versioning.blp', 'dialog-vkbasalt.blp', diff --git a/bottles/frontend/ui/dialog-rename.blp b/bottles/frontend/ui/rename-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-rename.blp rename to bottles/frontend/ui/rename-dialog.blp diff --git a/bottles/frontend/widgets/program_row.py b/bottles/frontend/widgets/program_row.py index 1241fac11b..bd7b8e6b57 100644 --- a/bottles/frontend/widgets/program_row.py +++ b/bottles/frontend/widgets/program_row.py @@ -30,7 +30,7 @@ from bottles.backend.wine.winedbg import WineDbg from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.windows.launch_options_dialog import LaunchOptionsDialog -from bottles.frontend.windows.rename import RenameDialog +from bottles.frontend.windows.rename_dialog import RenameDialog # noinspection PyUnusedLocal diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index a52ab86291..a8771cad5f 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -10,7 +10,7 @@ bottles_sources = [ 'generic.py', 'launch_options_dialog.py', 'onboard_dialog.py', - 'rename.py', + 'rename_dialog.py', 'drives_dialog.py', 'gamescope_dialog.py', 'vkbasalt.py', diff --git a/bottles/frontend/windows/rename.py b/bottles/frontend/windows/rename_dialog.py similarity index 93% rename from bottles/frontend/windows/rename.py rename to bottles/frontend/windows/rename_dialog.py index e58535268e..8faa00b4c7 100644 --- a/bottles/frontend/windows/rename.py +++ b/bottles/frontend/windows/rename_dialog.py @@ -1,6 +1,6 @@ -# rename.py +# rename_dialog.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 @@ -18,7 +18,7 @@ from gi.repository import Gtk, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-rename.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/rename-dialog.ui") class RenameDialog(Adw.Window): __gtype_name__ = "RenameDialog" diff --git a/po/POTFILES b/po/POTFILES index cd9a5e12d8..633332a393 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -28,7 +28,7 @@ bottles/frontend/ui/installer-dialog.blp bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/proton-alert-dialog.blp -bottles/frontend/ui/dialog-rename.blp +bottles/frontend/ui/rename-dialog.blp bottles/frontend/ui/dialog-run-args.blp bottles/frontend/ui/dialog-sandbox.blp bottles/frontend/ui/dialog-upgrade-versioning.blp From f3c775fc6372be9767f8ef158ac7cffddd01becb Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:45:33 -0500 Subject: [PATCH 42/47] dialog-run-args: Remove file It's not being used --- bottles/frontend/ui/dialog-run-args.blp | 50 ------------------------- po/POTFILES | 1 - 2 files changed, 51 deletions(-) delete mode 100644 bottles/frontend/ui/dialog-run-args.blp diff --git a/bottles/frontend/ui/dialog-run-args.blp b/bottles/frontend/ui/dialog-run-args.blp deleted file mode 100644 index c718581a82..0000000000 --- a/bottles/frontend/ui/dialog-run-args.blp +++ /dev/null @@ -1,50 +0,0 @@ -using Gtk 4.0; -using Adw 1; - -template $RunArgsDialog: Window { - modal: true; - default-width: 550; - destroy-with-parent: true; - - [titlebar] - HeaderBar { - show-title-buttons: false; - - title-widget: Adw.WindowTitle { - title: _("Run With Arguments"); - }; - - [start] - Button btn_cancel { - label: _("Cancel"); - - ShortcutController { - scope: managed; - - Shortcut { - trigger: "Escape"; - action: "activate"; - } - } - } - - [end] - Button btn_run { - label: _("Run"); - - styles [ - "suggested-action", - ] - } - } - - Adw.PreferencesPage { - Adw.PreferencesGroup { - description: _("Write below the arguments to be passed to the executable."); - - Adw.EntryRow entry_args { - title: _("e.g.: -opengl -SkipBuildPatchPrereq"); - } - } - } -} diff --git a/po/POTFILES b/po/POTFILES index 633332a393..e71abd72df 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -29,7 +29,6 @@ bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/rename-dialog.blp -bottles/frontend/ui/dialog-run-args.blp bottles/frontend/ui/dialog-sandbox.blp bottles/frontend/ui/dialog-upgrade-versioning.blp bottles/frontend/ui/dialog-vkbasalt.blp From a54e643f052a08803e486aae8c2ccd675d37957b Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:47:10 -0500 Subject: [PATCH 43/47] sandbox-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/ui/{dialog-sandbox.blp => sandbox-dialog.blp} | 0 bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/{sandbox.py => sandbox_dialog.py} | 6 +++--- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-sandbox.blp => sandbox-dialog.blp} (100%) rename bottles/frontend/windows/{sandbox.py => sandbox_dialog.py} (92%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 01ba25dc3a..810e390fc2 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -46,7 +46,7 @@ display-dialog.ui drives-dialog.ui journal-dialog.ui - dialog-sandbox.ui + sandbox-dialog.ui installer-dialog.ui bottle-picker-dialog.ui proton-alert-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 87fce47b4b..fa3db90927 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -25,7 +25,7 @@ blueprints = custom_target('blueprints', 'launch-options-dialog.blp', 'proton-alert-dialog.blp', 'rename-dialog.blp', - 'dialog-sandbox.blp', + 'sandbox-dialog.blp', 'dialog-upgrade-versioning.blp', 'dialog-vkbasalt.blp', 'display-dialog.blp', diff --git a/bottles/frontend/ui/dialog-sandbox.blp b/bottles/frontend/ui/sandbox-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-sandbox.blp rename to bottles/frontend/ui/sandbox-dialog.blp diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index c921442791..497a740a86 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -54,7 +54,7 @@ from bottles.frontend.windows.gamescope_dialog import GamescopeDialog from bottles.frontend.windows.mangohud_dialog import MangoHudDialog from bottles.frontend.windows.proton_alert_dialog import ProtonAlertDialog -from bottles.frontend.windows.sandbox import SandboxDialog +from bottles.frontend.windows.sandbox_dialog import SandboxDialog from bottles.frontend.windows.vkbasalt import VkBasaltDialog from bottles.frontend.windows.vmtouch import VmtouchDialog diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index a8771cad5f..5a99c908b4 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -21,7 +21,7 @@ bottles_sources = [ 'journal_dialog.py', 'bottle_picker_dialog.py', 'proton_alert_dialog.py', - 'sandbox.py', + 'sandbox_dialog.py', 'installer_dialog.py', 'dependencies_check_dialog.py', 'exclusion_patterns_dialog.py', diff --git a/bottles/frontend/windows/sandbox.py b/bottles/frontend/windows/sandbox_dialog.py similarity index 92% rename from bottles/frontend/windows/sandbox.py rename to bottles/frontend/windows/sandbox_dialog.py index 84c7d98f06..9f0bd1a1a0 100644 --- a/bottles/frontend/windows/sandbox.py +++ b/bottles/frontend/windows/sandbox_dialog.py @@ -1,6 +1,6 @@ -# sandbox.py +# sandbox_dialog.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 @@ -18,7 +18,7 @@ from gi.repository import Gtk, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-sandbox.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/sandbox-dialog.ui") class SandboxDialog(Adw.Window): __gtype_name__ = "SandboxDialog" diff --git a/po/POTFILES b/po/POTFILES index e71abd72df..8728c7d32e 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -29,7 +29,7 @@ bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/rename-dialog.blp -bottles/frontend/ui/dialog-sandbox.blp +bottles/frontend/ui/sandbox-dialog.blp bottles/frontend/ui/dialog-upgrade-versioning.blp bottles/frontend/ui/dialog-vkbasalt.blp bottles/frontend/ui/mangohud-dialog.blp From 8644b76de95a6035f69b233c123b696540f5285a Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:48:48 -0500 Subject: [PATCH 44/47] upgrade-versioning-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- ...upgrade-versioning.blp => upgrade-versioning-dialog.blp} | 0 bottles/frontend/views/bottle_details_page.py | 2 +- bottles/frontend/windows/meson.build | 2 +- .../{upgradeversioning.py => upgrade_versioning_dialog.py} | 6 +++--- po/POTFILES | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename bottles/frontend/ui/{dialog-upgrade-versioning.blp => upgrade-versioning-dialog.blp} (100%) rename bottles/frontend/windows/{upgradeversioning.py => upgrade_versioning_dialog.py} (94%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 810e390fc2..94b78fbaf1 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -52,7 +52,7 @@ proton-alert-dialog.ui dependencies-check-dialog.ui exclusion-patterns-dialog.ui - dialog-upgrade-versioning.ui + upgrade-versioning-dialog.ui dialog-vmtouch.ui onboard-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index fa3db90927..12c19da56a 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -26,7 +26,7 @@ blueprints = custom_target('blueprints', 'proton-alert-dialog.blp', 'rename-dialog.blp', 'sandbox-dialog.blp', - 'dialog-upgrade-versioning.blp', + 'upgrade-versioning-dialog.blp', 'dialog-vkbasalt.blp', 'display-dialog.blp', 'dialog-vmtouch.blp', diff --git a/bottles/frontend/ui/dialog-upgrade-versioning.blp b/bottles/frontend/ui/upgrade-versioning-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-upgrade-versioning.blp rename to bottles/frontend/ui/upgrade-versioning-dialog.blp diff --git a/bottles/frontend/views/bottle_details_page.py b/bottles/frontend/views/bottle_details_page.py index 39b39065bf..4c60ed69e4 100644 --- a/bottles/frontend/views/bottle_details_page.py +++ b/bottles/frontend/views/bottle_details_page.py @@ -43,7 +43,7 @@ from bottles.frontend.utils.gtk import GtkUtils from bottles.frontend.widgets.program_row import ProgramRow from bottles.frontend.windows.duplicate_dialog import DuplicateDialog -from bottles.frontend.windows.upgradeversioning import UpgradeVersioningDialog +from bottles.frontend.windows.upgrade_versioning_dialog import UpgradeVersioningDialog @Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-page.ui") diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index 5a99c908b4..b75e706196 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -25,7 +25,7 @@ bottles_sources = [ 'installer_dialog.py', 'dependencies_check_dialog.py', 'exclusion_patterns_dialog.py', - 'upgradeversioning.py', + 'upgrade_versioning_dialog.py', 'vmtouch.py', 'window.py', ] diff --git a/bottles/frontend/windows/upgradeversioning.py b/bottles/frontend/windows/upgrade_versioning_dialog.py similarity index 94% rename from bottles/frontend/windows/upgradeversioning.py rename to bottles/frontend/windows/upgrade_versioning_dialog.py index f9ebe665a0..cb5b2d8d34 100644 --- a/bottles/frontend/windows/upgradeversioning.py +++ b/bottles/frontend/windows/upgrade_versioning_dialog.py @@ -1,6 +1,6 @@ -# duplicate.py +# upgrade_versioning_dialog.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 @@ -21,7 +21,7 @@ from bottles.backend.utils.threading import RunAsync -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-upgrade-versioning.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/upgrade-versioning-dialog.ui") class UpgradeVersioningDialog(Adw.Window): __gtype_name__ = "UpgradeVersioningDialog" diff --git a/po/POTFILES b/po/POTFILES index 8728c7d32e..c81b45c2b6 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -30,7 +30,7 @@ bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/rename-dialog.blp bottles/frontend/ui/sandbox-dialog.blp -bottles/frontend/ui/dialog-upgrade-versioning.blp +bottles/frontend/ui/upgrade-versioning-dialog.blp bottles/frontend/ui/dialog-vkbasalt.blp bottles/frontend/ui/mangohud-dialog.blp bottles/frontend/ui/dll-override-entry.blp From a0aa869da77e6238b9d543a72085678eb3a10359 Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:50:49 -0500 Subject: [PATCH 45/47] vkbasalt-dialog: Rename files --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../ui/{dialog-vkbasalt.blp => vkbasalt-dialog.blp} | 0 bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/meson.build | 2 +- .../frontend/windows/{vkbasalt.py => vkbasalt_dialog.py} | 6 +++--- po/POTFILES | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename bottles/frontend/ui/{dialog-vkbasalt.blp => vkbasalt-dialog.blp} (100%) rename bottles/frontend/windows/{vkbasalt.py => vkbasalt_dialog.py} (98%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index 94b78fbaf1..e4557ffe84 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -40,7 +40,7 @@ duplicate-dialog.ui rename-dialog.ui gamescope-dialog.ui - dialog-vkbasalt.ui + vkbasalt-dialog.ui fsr-dialog.ui mangohud-dialog.ui display-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index 12c19da56a..d10a61b293 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -27,7 +27,7 @@ blueprints = custom_target('blueprints', 'rename-dialog.blp', 'sandbox-dialog.blp', 'upgrade-versioning-dialog.blp', - 'dialog-vkbasalt.blp', + 'vkbasalt-dialog.blp', 'display-dialog.blp', 'dialog-vmtouch.blp', 'fsr-dialog.blp', diff --git a/bottles/frontend/ui/dialog-vkbasalt.blp b/bottles/frontend/ui/vkbasalt-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-vkbasalt.blp rename to bottles/frontend/ui/vkbasalt-dialog.blp diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 497a740a86..57e82d2e13 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -55,7 +55,7 @@ from bottles.frontend.windows.mangohud_dialog import MangoHudDialog from bottles.frontend.windows.proton_alert_dialog import ProtonAlertDialog from bottles.frontend.windows.sandbox_dialog import SandboxDialog -from bottles.frontend.windows.vkbasalt import VkBasaltDialog +from bottles.frontend.windows.vkbasalt_dialog import VkBasaltDialog from bottles.frontend.windows.vmtouch import VmtouchDialog logging = Logger() diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index b75e706196..a593b6bca8 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -13,7 +13,7 @@ bottles_sources = [ 'rename_dialog.py', 'drives_dialog.py', 'gamescope_dialog.py', - 'vkbasalt.py', + 'vkbasalt_dialog.py', 'fsr_dialog.py', 'mangohud_dialog.py', 'display_dialog.py', diff --git a/bottles/frontend/windows/vkbasalt.py b/bottles/frontend/windows/vkbasalt_dialog.py similarity index 98% rename from bottles/frontend/windows/vkbasalt.py rename to bottles/frontend/windows/vkbasalt_dialog.py index 8a3950f8c9..f3f77c6645 100644 --- a/bottles/frontend/windows/vkbasalt.py +++ b/bottles/frontend/windows/vkbasalt_dialog.py @@ -1,6 +1,6 @@ -# vkbasalt.py +# vkbasalt_dialog.py # -# Copyright 2022 Hari Rana / TheEvilSkeleton +# 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 @@ -55,7 +55,7 @@ class VkBasaltSettings: exec = False -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-vkbasalt.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/vkbasalt-dialog.ui") class VkBasaltDialog(Adw.Window): __gtype_name__ = "VkBasaltDialog" diff --git a/po/POTFILES b/po/POTFILES index c81b45c2b6..3143ce2e61 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -31,7 +31,7 @@ bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/rename-dialog.blp bottles/frontend/ui/sandbox-dialog.blp bottles/frontend/ui/upgrade-versioning-dialog.blp -bottles/frontend/ui/dialog-vkbasalt.blp +bottles/frontend/ui/vkbasalt-dialog.blp bottles/frontend/ui/mangohud-dialog.blp bottles/frontend/ui/dll-override-entry.blp bottles/frontend/ui/drive-entry.blp @@ -81,7 +81,7 @@ bottles/frontend/windows/generic.py bottles/frontend/windows/installer_dialog.py bottles/frontend/windows/launch_options_dialog.py bottles/frontend/windows/main_window.py -bottles/frontend/windows/vkbasalt.py +bottles/frontend/windows/vkbasalt_dialog.py bottles/frontend/windows/fsr_dialog.py bottles/frontend/windows/mangohud_dialog.py data/com.usebottles.bottles.desktop.in.in From 91635e5769ef0dd204567e629aeef13dc8b9158f Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:53:15 -0500 Subject: [PATCH 46/47] vmtouch-dialog: Rename files and add to POTFILES --- bottles/frontend/ui/bottles.gresource.xml | 2 +- bottles/frontend/ui/meson.build | 2 +- .../frontend/ui/{dialog-vmtouch.blp => vmtouch-dialog.blp} | 0 bottles/frontend/views/details_preferences_page.py | 2 +- bottles/frontend/windows/meson.build | 2 +- bottles/frontend/windows/{vmtouch.py => vmtouch_dialog.py} | 6 +++--- po/POTFILES | 1 + 7 files changed, 8 insertions(+), 7 deletions(-) rename bottles/frontend/ui/{dialog-vmtouch.blp => vmtouch-dialog.blp} (100%) rename bottles/frontend/windows/{vmtouch.py => vmtouch_dialog.py} (93%) diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/ui/bottles.gresource.xml index e4557ffe84..2063c00957 100644 --- a/bottles/frontend/ui/bottles.gresource.xml +++ b/bottles/frontend/ui/bottles.gresource.xml @@ -53,7 +53,7 @@ dependencies-check-dialog.ui exclusion-patterns-dialog.ui upgrade-versioning-dialog.ui - dialog-vmtouch.ui + vmtouch-dialog.ui onboard-dialog.ui diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build index d10a61b293..0db06e45ce 100644 --- a/bottles/frontend/ui/meson.build +++ b/bottles/frontend/ui/meson.build @@ -29,7 +29,7 @@ blueprints = custom_target('blueprints', 'upgrade-versioning-dialog.blp', 'vkbasalt-dialog.blp', 'display-dialog.blp', - 'dialog-vmtouch.blp', + 'vmtouch-dialog.blp', 'fsr-dialog.blp', 'mangohud-dialog.blp', 'dll-override-entry.blp', diff --git a/bottles/frontend/ui/dialog-vmtouch.blp b/bottles/frontend/ui/vmtouch-dialog.blp similarity index 100% rename from bottles/frontend/ui/dialog-vmtouch.blp rename to bottles/frontend/ui/vmtouch-dialog.blp diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/views/details_preferences_page.py index 57e82d2e13..f9d68e09d3 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/views/details_preferences_page.py @@ -56,7 +56,7 @@ from bottles.frontend.windows.proton_alert_dialog import ProtonAlertDialog from bottles.frontend.windows.sandbox_dialog import SandboxDialog from bottles.frontend.windows.vkbasalt_dialog import VkBasaltDialog -from bottles.frontend.windows.vmtouch import VmtouchDialog +from bottles.frontend.windows.vmtouch_dialog import VmtouchDialog logging = Logger() diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build index a593b6bca8..76fed771bc 100644 --- a/bottles/frontend/windows/meson.build +++ b/bottles/frontend/windows/meson.build @@ -26,7 +26,7 @@ bottles_sources = [ 'dependencies_check_dialog.py', 'exclusion_patterns_dialog.py', 'upgrade_versioning_dialog.py', - 'vmtouch.py', + 'vmtouch_dialog.py', 'window.py', ] diff --git a/bottles/frontend/windows/vmtouch.py b/bottles/frontend/windows/vmtouch_dialog.py similarity index 93% rename from bottles/frontend/windows/vmtouch.py rename to bottles/frontend/windows/vmtouch_dialog.py index b613dc2341..1560ee89e3 100644 --- a/bottles/frontend/windows/vmtouch.py +++ b/bottles/frontend/windows/vmtouch_dialog.py @@ -1,6 +1,6 @@ -# vmtouch.py +# vmtouch_dialog.py # -# Copyright 2022 axtlos +# 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 @@ -20,7 +20,7 @@ from gi.repository import Gtk, GLib, Adw -@Gtk.Template(resource_path="/com/usebottles/bottles/dialog-vmtouch.ui") +@Gtk.Template(resource_path="/com/usebottles/bottles/vmtouch-dialog.ui") class VmtouchDialog(Adw.Window): __gtype_name__ = "VmtouchDialog" diff --git a/po/POTFILES b/po/POTFILES index 3143ce2e61..137f70dd46 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -29,6 +29,7 @@ bottles/frontend/ui/journal-dialog.blp bottles/frontend/ui/launch-options-dialog.blp bottles/frontend/ui/proton-alert-dialog.blp bottles/frontend/ui/rename-dialog.blp +bottles/frontend/ui/vmtouch-dialog.blp bottles/frontend/ui/sandbox-dialog.blp bottles/frontend/ui/upgrade-versioning-dialog.blp bottles/frontend/ui/vkbasalt-dialog.blp From c1aef2fcc1f5db053c2ccdbad290afbb6857f84e Mon Sep 17 00:00:00 2001 From: Hari Rana Date: Mon, 13 Jan 2025 13:58:15 -0500 Subject: [PATCH 47/47] frontend: Move files to root of `frontend/` --- .../frontend/{ui => }/bottle-details-page.blp | 0 .../frontend/{ui => }/bottle-details-view.blp | 0 .../{ui => }/bottle-picker-dialog.blp | 0 bottles/frontend/{ui => }/bottle-row.blp | 0 .../{views => }/bottle_details_page.py | 12 +- .../{views => }/bottle_details_view.py | 14 +- .../{windows => }/bottle_picker_dialog.py | 0 .../frontend/{ui => }/bottles-list-view.blp | 0 .../frontend/{ui => }/bottles.gresource.xml | 0 .../frontend/{views => }/bottles_list_view.py | 2 +- bottles/frontend/{ui => }/check-row.blp | 0 bottles/frontend/{cli => }/cli.py | 0 bottles/frontend/cli/__init__.py | 0 bottles/frontend/cli/meson.build | 17 --- bottles/frontend/{utils => }/common.py | 0 .../frontend/{ui => }/component-entry-row.blp | 0 .../{widgets => }/component_entry_row.py | 2 +- .../frontend/{ui => }/crash-report-dialog.blp | 0 .../{windows => }/crash_report_dialog.py | 0 .../{ui => }/dependencies-check-dialog.blp | 0 .../dependencies_check_dialog.py | 0 .../{ui => }/dependency-entry-row.blp | 0 .../{widgets => }/dependency_entry_row.py | 4 +- .../{ui => }/details-dependencies-view.blp | 0 .../{ui => }/details-installers-view.blp | 0 .../{ui => }/details-preferences-page.blp | 0 .../{ui => }/details-task-manager-view.blp | 0 .../{ui => }/details-versioning-page.blp | 0 .../{views => }/details_dependencies_view.py | 6 +- .../{views => }/details_installers_view.py | 4 +- .../{views => }/details_preferences_page.py | 26 ++-- .../{views => }/details_task_manager_view.py | 2 +- .../{views => }/details_versioning_page.py | 6 +- bottles/frontend/{ui => }/display-dialog.blp | 0 .../frontend/{windows => }/display_dialog.py | 2 +- .../frontend/{ui => }/dll-override-entry.blp | 0 .../{ui => }/dll-overrides-dialog.blp | 0 .../{windows => }/dll_overrides_dialog.py | 0 bottles/frontend/{ui => }/drive-entry.blp | 0 bottles/frontend/{ui => }/drives-dialog.blp | 0 .../frontend/{windows => }/drives_dialog.py | 0 .../frontend/{ui => }/duplicate-dialog.blp | 0 .../{windows => }/duplicate_dialog.py | 2 +- bottles/frontend/{ui => }/env-var-entry.blp | 0 .../{ui => }/environment-variables-dialog.blp | 0 .../environment_variables_dialog.py | 4 +- .../{ui => }/exclusion-pattern-row.blp | 0 .../{ui => }/exclusion-patterns-dialog.blp | 0 .../exclusion_patterns_dialog.py | 0 bottles/frontend/{widgets => }/executable.py | 0 bottles/frontend/{utils => }/filters.py | 0 bottles/frontend/{ui => }/fsr-dialog.blp | 0 bottles/frontend/{windows => }/fsr_dialog.py | 0 .../frontend/{ui => }/gamescope-dialog.blp | 0 .../{windows => }/gamescope_dialog.py | 0 bottles/frontend/{windows => }/generic.py | 0 bottles/frontend/{windows => }/generic_cli.py | 0 bottles/frontend/{utils => }/gtk.py | 2 +- bottles/frontend/{ui => }/help-overlay.blp | 0 bottles/frontend/{ui => }/importer-row.blp | 0 bottles/frontend/{ui => }/importer-view.blp | 0 .../frontend/{widgets => }/importer_row.py | 2 +- bottles/frontend/{views => }/importer_view.py | 6 +- .../frontend/{ui => }/installer-dialog.blp | 0 bottles/frontend/{ui => }/installer-row.blp | 0 .../{windows => }/installer_dialog.py | 2 +- .../frontend/{widgets => }/installer_row.py | 4 +- bottles/frontend/{ui => }/journal-dialog.blp | 0 .../frontend/{windows => }/journal_dialog.py | 0 .../{ui => }/launch-options-dialog.blp | 0 .../{windows => }/launch_options_dialog.py | 0 bottles/frontend/{ui => }/library-entry.blp | 0 bottles/frontend/{ui => }/library-view.blp | 0 bottles/frontend/{widgets => }/library.py | 2 +- bottles/frontend/{views => }/library_view.py | 4 +- bottles/frontend/{ui => }/loading-view.blp | 0 bottles/frontend/{views => }/loading_view.py | 2 +- .../frontend/{ui => }/local-resource-row.blp | 0 bottles/frontend/main.py | 6 +- bottles/frontend/{ui => }/mangohud-dialog.blp | 0 .../frontend/{windows => }/mangohud_dialog.py | 0 bottles/frontend/meson.build | 131 +++++++++++++++++- .../frontend/{ui => }/new-bottle-dialog.blp | 0 .../frontend/{views => }/new_bottle_dialog.py | 4 +- bottles/frontend/{ui => }/onboard-dialog.blp | 0 .../frontend/{windows => }/onboard_dialog.py | 2 +- bottles/frontend/{ui => }/preferences.blp | 0 bottles/frontend/{views => }/preferences.py | 2 +- bottles/frontend/{ui => }/program-row.blp | 0 bottles/frontend/{widgets => }/program_row.py | 6 +- .../frontend/{ui => }/proton-alert-dialog.blp | 0 .../{windows => }/proton_alert_dialog.py | 0 bottles/frontend/{ui => }/rename-dialog.blp | 0 .../frontend/{windows => }/rename_dialog.py | 0 bottles/frontend/{ui => }/sandbox-dialog.blp | 0 .../frontend/{windows => }/sandbox_dialog.py | 0 bottles/frontend/{utils => }/sh.py | 0 bottles/frontend/{ui => }/state-row.blp | 0 bottles/frontend/{widgets => }/state_row.py | 2 +- bottles/frontend/{ui => }/style-dark.css | 0 bottles/frontend/{ui => }/style.css | 0 bottles/frontend/{ui => }/task-row.blp | 0 bottles/frontend/ui/meson.build | 67 --------- .../{ui => }/upgrade-versioning-dialog.blp | 0 .../upgrade_versioning_dialog.py | 0 bottles/frontend/utils/__init__.py | 0 bottles/frontend/utils/meson.build | 12 -- bottles/frontend/views/__init__.py | 0 bottles/frontend/views/meson.build | 22 --- bottles/frontend/{ui => }/vkbasalt-dialog.blp | 0 .../frontend/{windows => }/vkbasalt_dialog.py | 0 bottles/frontend/{ui => }/vmtouch-dialog.blp | 0 .../frontend/{windows => }/vmtouch_dialog.py | 0 bottles/frontend/widgets/__init__.py | 0 bottles/frontend/widgets/meson.build | 16 --- bottles/frontend/{ui => }/window.blp | 0 bottles/frontend/{windows => }/window.py | 22 +-- bottles/frontend/windows/__init__.py | 0 bottles/frontend/windows/meson.build | 33 ----- 119 files changed, 202 insertions(+), 250 deletions(-) rename bottles/frontend/{ui => }/bottle-details-page.blp (100%) rename bottles/frontend/{ui => }/bottle-details-view.blp (100%) rename bottles/frontend/{ui => }/bottle-picker-dialog.blp (100%) rename bottles/frontend/{ui => }/bottle-row.blp (100%) rename bottles/frontend/{views => }/bottle_details_page.py (98%) rename bottles/frontend/{views => }/bottle_details_view.py (94%) rename bottles/frontend/{windows => }/bottle_picker_dialog.py (100%) rename bottles/frontend/{ui => }/bottles-list-view.blp (100%) rename bottles/frontend/{ui => }/bottles.gresource.xml (100%) rename bottles/frontend/{views => }/bottles_list_view.py (98%) rename bottles/frontend/{ui => }/check-row.blp (100%) rename bottles/frontend/{cli => }/cli.py (100%) delete mode 100644 bottles/frontend/cli/__init__.py delete mode 100644 bottles/frontend/cli/meson.build rename bottles/frontend/{utils => }/common.py (100%) rename bottles/frontend/{ui => }/component-entry-row.blp (100%) rename bottles/frontend/{widgets => }/component_entry_row.py (99%) rename bottles/frontend/{ui => }/crash-report-dialog.blp (100%) rename bottles/frontend/{windows => }/crash_report_dialog.py (100%) rename bottles/frontend/{ui => }/dependencies-check-dialog.blp (100%) rename bottles/frontend/{windows => }/dependencies_check_dialog.py (100%) rename bottles/frontend/{ui => }/dependency-entry-row.blp (100%) rename bottles/frontend/{widgets => }/dependency_entry_row.py (98%) rename bottles/frontend/{ui => }/details-dependencies-view.blp (100%) rename bottles/frontend/{ui => }/details-installers-view.blp (100%) rename bottles/frontend/{ui => }/details-preferences-page.blp (100%) rename bottles/frontend/{ui => }/details-task-manager-view.blp (100%) rename bottles/frontend/{ui => }/details-versioning-page.blp (100%) rename bottles/frontend/{views => }/details_dependencies_view.py (96%) rename bottles/frontend/{views => }/details_installers_view.py (97%) rename bottles/frontend/{views => }/details_preferences_page.py (97%) rename bottles/frontend/{views => }/details_task_manager_view.py (99%) rename bottles/frontend/{views => }/details_versioning_page.py (97%) rename bottles/frontend/{ui => }/display-dialog.blp (100%) rename bottles/frontend/{windows => }/display_dialog.py (99%) rename bottles/frontend/{ui => }/dll-override-entry.blp (100%) rename bottles/frontend/{ui => }/dll-overrides-dialog.blp (100%) rename bottles/frontend/{windows => }/dll_overrides_dialog.py (100%) rename bottles/frontend/{ui => }/drive-entry.blp (100%) rename bottles/frontend/{ui => }/drives-dialog.blp (100%) rename bottles/frontend/{windows => }/drives_dialog.py (100%) rename bottles/frontend/{ui => }/duplicate-dialog.blp (100%) rename bottles/frontend/{windows => }/duplicate_dialog.py (98%) rename bottles/frontend/{ui => }/env-var-entry.blp (100%) rename bottles/frontend/{ui => }/environment-variables-dialog.blp (100%) rename bottles/frontend/{windows => }/environment_variables_dialog.py (98%) rename bottles/frontend/{ui => }/exclusion-pattern-row.blp (100%) rename bottles/frontend/{ui => }/exclusion-patterns-dialog.blp (100%) rename bottles/frontend/{windows => }/exclusion_patterns_dialog.py (100%) rename bottles/frontend/{widgets => }/executable.py (100%) rename bottles/frontend/{utils => }/filters.py (100%) rename bottles/frontend/{ui => }/fsr-dialog.blp (100%) rename bottles/frontend/{windows => }/fsr_dialog.py (100%) rename bottles/frontend/{ui => }/gamescope-dialog.blp (100%) rename bottles/frontend/{windows => }/gamescope_dialog.py (100%) rename bottles/frontend/{windows => }/generic.py (100%) rename bottles/frontend/{windows => }/generic_cli.py (100%) rename bottles/frontend/{utils => }/gtk.py (98%) rename bottles/frontend/{ui => }/help-overlay.blp (100%) rename bottles/frontend/{ui => }/importer-row.blp (100%) rename bottles/frontend/{ui => }/importer-view.blp (100%) rename bottles/frontend/{widgets => }/importer_row.py (98%) rename bottles/frontend/{views => }/importer_view.py (96%) rename bottles/frontend/{ui => }/installer-dialog.blp (100%) rename bottles/frontend/{ui => }/installer-row.blp (100%) rename bottles/frontend/{windows => }/installer_dialog.py (99%) rename bottles/frontend/{widgets => }/installer_row.py (96%) rename bottles/frontend/{ui => }/journal-dialog.blp (100%) rename bottles/frontend/{windows => }/journal_dialog.py (100%) rename bottles/frontend/{ui => }/launch-options-dialog.blp (100%) rename bottles/frontend/{windows => }/launch_options_dialog.py (100%) rename bottles/frontend/{ui => }/library-entry.blp (100%) rename bottles/frontend/{ui => }/library-view.blp (100%) rename bottles/frontend/{widgets => }/library.py (99%) rename bottles/frontend/{views => }/library_view.py (96%) rename bottles/frontend/{ui => }/loading-view.blp (100%) rename bottles/frontend/{views => }/loading_view.py (97%) rename bottles/frontend/{ui => }/local-resource-row.blp (100%) rename bottles/frontend/{ui => }/mangohud-dialog.blp (100%) rename bottles/frontend/{windows => }/mangohud_dialog.py (100%) rename bottles/frontend/{ui => }/new-bottle-dialog.blp (100%) rename bottles/frontend/{views => }/new_bottle_dialog.py (98%) rename bottles/frontend/{ui => }/onboard-dialog.blp (100%) rename bottles/frontend/{windows => }/onboard_dialog.py (99%) rename bottles/frontend/{ui => }/preferences.blp (100%) rename bottles/frontend/{views => }/preferences.py (99%) rename bottles/frontend/{ui => }/program-row.blp (100%) rename bottles/frontend/{widgets => }/program_row.py (98%) rename bottles/frontend/{ui => }/proton-alert-dialog.blp (100%) rename bottles/frontend/{windows => }/proton_alert_dialog.py (100%) rename bottles/frontend/{ui => }/rename-dialog.blp (100%) rename bottles/frontend/{windows => }/rename_dialog.py (100%) rename bottles/frontend/{ui => }/sandbox-dialog.blp (100%) rename bottles/frontend/{windows => }/sandbox_dialog.py (100%) rename bottles/frontend/{utils => }/sh.py (100%) rename bottles/frontend/{ui => }/state-row.blp (100%) rename bottles/frontend/{widgets => }/state_row.py (98%) rename bottles/frontend/{ui => }/style-dark.css (100%) rename bottles/frontend/{ui => }/style.css (100%) rename bottles/frontend/{ui => }/task-row.blp (100%) delete mode 100644 bottles/frontend/ui/meson.build rename bottles/frontend/{ui => }/upgrade-versioning-dialog.blp (100%) rename bottles/frontend/{windows => }/upgrade_versioning_dialog.py (100%) delete mode 100644 bottles/frontend/utils/__init__.py delete mode 100644 bottles/frontend/utils/meson.build delete mode 100644 bottles/frontend/views/__init__.py delete mode 100644 bottles/frontend/views/meson.build rename bottles/frontend/{ui => }/vkbasalt-dialog.blp (100%) rename bottles/frontend/{windows => }/vkbasalt_dialog.py (100%) rename bottles/frontend/{ui => }/vmtouch-dialog.blp (100%) rename bottles/frontend/{windows => }/vmtouch_dialog.py (100%) delete mode 100644 bottles/frontend/widgets/__init__.py delete mode 100644 bottles/frontend/widgets/meson.build rename bottles/frontend/{ui => }/window.blp (100%) rename bottles/frontend/{windows => }/window.py (95%) delete mode 100644 bottles/frontend/windows/__init__.py delete mode 100644 bottles/frontend/windows/meson.build diff --git a/bottles/frontend/ui/bottle-details-page.blp b/bottles/frontend/bottle-details-page.blp similarity index 100% rename from bottles/frontend/ui/bottle-details-page.blp rename to bottles/frontend/bottle-details-page.blp diff --git a/bottles/frontend/ui/bottle-details-view.blp b/bottles/frontend/bottle-details-view.blp similarity index 100% rename from bottles/frontend/ui/bottle-details-view.blp rename to bottles/frontend/bottle-details-view.blp diff --git a/bottles/frontend/ui/bottle-picker-dialog.blp b/bottles/frontend/bottle-picker-dialog.blp similarity index 100% rename from bottles/frontend/ui/bottle-picker-dialog.blp rename to bottles/frontend/bottle-picker-dialog.blp diff --git a/bottles/frontend/ui/bottle-row.blp b/bottles/frontend/bottle-row.blp similarity index 100% rename from bottles/frontend/ui/bottle-row.blp rename to bottles/frontend/bottle-row.blp diff --git a/bottles/frontend/views/bottle_details_page.py b/bottles/frontend/bottle_details_page.py similarity index 98% rename from bottles/frontend/views/bottle_details_page.py rename to bottles/frontend/bottle_details_page.py index 4c60ed69e4..fb01c96b77 100644 --- a/bottles/frontend/views/bottle_details_page.py +++ b/bottles/frontend/bottle_details_page.py @@ -38,12 +38,12 @@ from bottles.backend.wine.winecfg import WineCfg from bottles.backend.wine.winedbg import WineDbg from bottles.backend.wine.wineserver import WineServer -from bottles.frontend.utils.common import open_doc_url -from bottles.frontend.utils.filters import add_executable_filters, add_all_filters -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.program_row import ProgramRow -from bottles.frontend.windows.duplicate_dialog import DuplicateDialog -from bottles.frontend.windows.upgrade_versioning_dialog import UpgradeVersioningDialog +from bottles.frontend.common import open_doc_url +from bottles.frontend.filters import add_executable_filters, add_all_filters +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.program_row import ProgramRow +from bottles.frontend.duplicate_dialog import DuplicateDialog +from bottles.frontend.upgrade_versioning_dialog import UpgradeVersioningDialog @Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-page.ui") diff --git a/bottles/frontend/views/bottle_details_view.py b/bottles/frontend/bottle_details_view.py similarity index 94% rename from bottles/frontend/views/bottle_details_view.py rename to bottles/frontend/bottle_details_view.py index 92285f2e80..f1292ca302 100644 --- a/bottles/frontend/views/bottle_details_view.py +++ b/bottles/frontend/bottle_details_view.py @@ -25,13 +25,13 @@ from bottles.backend.models.config import BottleConfig from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.views.bottle_details_page import BottleDetailsPage -from bottles.frontend.views.details_installers_view import DetailsInstallersView -from bottles.frontend.views.details_dependencies_view import DetailsDependenciesView -from bottles.frontend.views.details_preferences_page import DetailsPreferencesPage -from bottles.frontend.views.details_versioning_page import DetailsVersioningPage -from bottles.frontend.views.details_task_manager_view import DetailsTaskManagerView +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.bottle_details_page import BottleDetailsPage +from bottles.frontend.details_installers_view import DetailsInstallersView +from bottles.frontend.details_dependencies_view import DetailsDependenciesView +from bottles.frontend.details_preferences_page import DetailsPreferencesPage +from bottles.frontend.details_versioning_page import DetailsVersioningPage +from bottles.frontend.details_task_manager_view import DetailsTaskManagerView @Gtk.Template(resource_path="/com/usebottles/bottles/bottle-details-view.ui") diff --git a/bottles/frontend/windows/bottle_picker_dialog.py b/bottles/frontend/bottle_picker_dialog.py similarity index 100% rename from bottles/frontend/windows/bottle_picker_dialog.py rename to bottles/frontend/bottle_picker_dialog.py diff --git a/bottles/frontend/ui/bottles-list-view.blp b/bottles/frontend/bottles-list-view.blp similarity index 100% rename from bottles/frontend/ui/bottles-list-view.blp rename to bottles/frontend/bottles-list-view.blp diff --git a/bottles/frontend/ui/bottles.gresource.xml b/bottles/frontend/bottles.gresource.xml similarity index 100% rename from bottles/frontend/ui/bottles.gresource.xml rename to bottles/frontend/bottles.gresource.xml diff --git a/bottles/frontend/views/bottles_list_view.py b/bottles/frontend/bottles_list_view.py similarity index 98% rename from bottles/frontend/views/bottles_list_view.py rename to bottles/frontend/bottles_list_view.py index 171f81628d..8af42c72eb 100644 --- a/bottles/frontend/views/bottles_list_view.py +++ b/bottles/frontend/bottles_list_view.py @@ -25,7 +25,7 @@ from bottles.backend.state import Signals, SignalManager from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.executor import WineExecutor -from bottles.frontend.utils.filters import add_executable_filters, add_all_filters +from bottles.frontend.filters import add_executable_filters, add_all_filters from bottles.frontend.params import APP_ID diff --git a/bottles/frontend/ui/check-row.blp b/bottles/frontend/check-row.blp similarity index 100% rename from bottles/frontend/ui/check-row.blp rename to bottles/frontend/check-row.blp diff --git a/bottles/frontend/cli/cli.py b/bottles/frontend/cli.py similarity index 100% rename from bottles/frontend/cli/cli.py rename to bottles/frontend/cli.py diff --git a/bottles/frontend/cli/__init__.py b/bottles/frontend/cli/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bottles/frontend/cli/meson.build b/bottles/frontend/cli/meson.build deleted file mode 100644 index b9eb81fb1a..0000000000 --- a/bottles/frontend/cli/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -clidir = join_paths(pkgdatadir, 'bottles/frontend/cli') - -bottles_sources = [ - '__init__.py', -] - -install_data(bottles_sources, install_dir: clidir) - -configure_file( - input: 'cli.py', - output: 'bottles-cli', - configuration: conf, - install: true, - install_dir: get_option('bindir'), - install_mode: ['rwxr-xr-x'] -) diff --git a/bottles/frontend/utils/common.py b/bottles/frontend/common.py similarity index 100% rename from bottles/frontend/utils/common.py rename to bottles/frontend/common.py diff --git a/bottles/frontend/ui/component-entry-row.blp b/bottles/frontend/component-entry-row.blp similarity index 100% rename from bottles/frontend/ui/component-entry-row.blp rename to bottles/frontend/component-entry-row.blp diff --git a/bottles/frontend/widgets/component_entry_row.py b/bottles/frontend/component_entry_row.py similarity index 99% rename from bottles/frontend/widgets/component_entry_row.py rename to bottles/frontend/component_entry_row.py index 5b7766b6a8..4175fa8c36 100644 --- a/bottles/frontend/widgets/component_entry_row.py +++ b/bottles/frontend/component_entry_row.py @@ -24,7 +24,7 @@ from bottles.backend.state import Status from bottles.backend.utils.manager import ManagerUtils from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils logging = Logger() diff --git a/bottles/frontend/ui/crash-report-dialog.blp b/bottles/frontend/crash-report-dialog.blp similarity index 100% rename from bottles/frontend/ui/crash-report-dialog.blp rename to bottles/frontend/crash-report-dialog.blp diff --git a/bottles/frontend/windows/crash_report_dialog.py b/bottles/frontend/crash_report_dialog.py similarity index 100% rename from bottles/frontend/windows/crash_report_dialog.py rename to bottles/frontend/crash_report_dialog.py diff --git a/bottles/frontend/ui/dependencies-check-dialog.blp b/bottles/frontend/dependencies-check-dialog.blp similarity index 100% rename from bottles/frontend/ui/dependencies-check-dialog.blp rename to bottles/frontend/dependencies-check-dialog.blp diff --git a/bottles/frontend/windows/dependencies_check_dialog.py b/bottles/frontend/dependencies_check_dialog.py similarity index 100% rename from bottles/frontend/windows/dependencies_check_dialog.py rename to bottles/frontend/dependencies_check_dialog.py diff --git a/bottles/frontend/ui/dependency-entry-row.blp b/bottles/frontend/dependency-entry-row.blp similarity index 100% rename from bottles/frontend/ui/dependency-entry-row.blp rename to bottles/frontend/dependency-entry-row.blp diff --git a/bottles/frontend/widgets/dependency_entry_row.py b/bottles/frontend/dependency_entry_row.py similarity index 98% rename from bottles/frontend/widgets/dependency_entry_row.py rename to bottles/frontend/dependency_entry_row.py index 3595926c75..99646567f2 100644 --- a/bottles/frontend/widgets/dependency_entry_row.py +++ b/bottles/frontend/dependency_entry_row.py @@ -24,8 +24,8 @@ from bottles.backend.models.config import BottleConfig from bottles.backend.models.result import Result from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.windows.generic import SourceDialog +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.generic import SourceDialog @Gtk.Template(resource_path="/com/usebottles/bottles/dependency-entry-row.ui") diff --git a/bottles/frontend/ui/details-dependencies-view.blp b/bottles/frontend/details-dependencies-view.blp similarity index 100% rename from bottles/frontend/ui/details-dependencies-view.blp rename to bottles/frontend/details-dependencies-view.blp diff --git a/bottles/frontend/ui/details-installers-view.blp b/bottles/frontend/details-installers-view.blp similarity index 100% rename from bottles/frontend/ui/details-installers-view.blp rename to bottles/frontend/details-installers-view.blp diff --git a/bottles/frontend/ui/details-preferences-page.blp b/bottles/frontend/details-preferences-page.blp similarity index 100% rename from bottles/frontend/ui/details-preferences-page.blp rename to bottles/frontend/details-preferences-page.blp diff --git a/bottles/frontend/ui/details-task-manager-view.blp b/bottles/frontend/details-task-manager-view.blp similarity index 100% rename from bottles/frontend/ui/details-task-manager-view.blp rename to bottles/frontend/details-task-manager-view.blp diff --git a/bottles/frontend/ui/details-versioning-page.blp b/bottles/frontend/details-versioning-page.blp similarity index 100% rename from bottles/frontend/ui/details-versioning-page.blp rename to bottles/frontend/details-versioning-page.blp diff --git a/bottles/frontend/views/details_dependencies_view.py b/bottles/frontend/details_dependencies_view.py similarity index 96% rename from bottles/frontend/views/details_dependencies_view.py rename to bottles/frontend/details_dependencies_view.py index e93bcea5c8..217ef84954 100644 --- a/bottles/frontend/views/details_dependencies_view.py +++ b/bottles/frontend/details_dependencies_view.py @@ -23,9 +23,9 @@ from bottles.backend.models.config import BottleConfig from bottles.backend.state import EventManager, Events from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.common import open_doc_url -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.dependency_entry_row import DependencyEntryRow +from bottles.frontend.common import open_doc_url +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.dependency_entry_row import DependencyEntryRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-dependencies-view.ui") diff --git a/bottles/frontend/views/details_installers_view.py b/bottles/frontend/details_installers_view.py similarity index 97% rename from bottles/frontend/views/details_installers_view.py rename to bottles/frontend/details_installers_view.py index cb74fd620d..e6059475fd 100644 --- a/bottles/frontend/views/details_installers_view.py +++ b/bottles/frontend/details_installers_view.py @@ -22,8 +22,8 @@ from bottles.backend.models.result import Result from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.common import open_doc_url -from bottles.frontend.widgets.installer_row import InstallerRow +from bottles.frontend.common import open_doc_url +from bottles.frontend.installer_row import InstallerRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-installers-view.ui") diff --git a/bottles/frontend/views/details_preferences_page.py b/bottles/frontend/details_preferences_page.py similarity index 97% rename from bottles/frontend/views/details_preferences_page.py rename to bottles/frontend/details_preferences_page.py index f9d68e09d3..ee89982dc7 100644 --- a/bottles/frontend/views/details_preferences_page.py +++ b/bottles/frontend/details_preferences_page.py @@ -42,21 +42,21 @@ from bottles.backend.utils.manager import ManagerUtils from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.regkeys import RegKeys -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.windows.display_dialog import DisplayDialog -from bottles.frontend.windows.dll_overrides_dialog import DLLOverridesDialog -from bottles.frontend.windows.drives_dialog import DrivesDialog -from bottles.frontend.windows.environment_variables_dialog import ( +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.display_dialog import DisplayDialog +from bottles.frontend.dll_overrides_dialog import DLLOverridesDialog +from bottles.frontend.drives_dialog import DrivesDialog +from bottles.frontend.environment_variables_dialog import ( EnvironmentVariablesDialog, ) -from bottles.frontend.windows.exclusion_patterns_dialog import ExclusionPatternsDialog -from bottles.frontend.windows.fsr_dialog import FsrDialog -from bottles.frontend.windows.gamescope_dialog import GamescopeDialog -from bottles.frontend.windows.mangohud_dialog import MangoHudDialog -from bottles.frontend.windows.proton_alert_dialog import ProtonAlertDialog -from bottles.frontend.windows.sandbox_dialog import SandboxDialog -from bottles.frontend.windows.vkbasalt_dialog import VkBasaltDialog -from bottles.frontend.windows.vmtouch_dialog import VmtouchDialog +from bottles.frontend.exclusion_patterns_dialog import ExclusionPatternsDialog +from bottles.frontend.fsr_dialog import FsrDialog +from bottles.frontend.gamescope_dialog import GamescopeDialog +from bottles.frontend.mangohud_dialog import MangoHudDialog +from bottles.frontend.proton_alert_dialog import ProtonAlertDialog +from bottles.frontend.sandbox_dialog import SandboxDialog +from bottles.frontend.vkbasalt_dialog import VkBasaltDialog +from bottles.frontend.vmtouch_dialog import VmtouchDialog logging = Logger() diff --git a/bottles/frontend/views/details_task_manager_view.py b/bottles/frontend/details_task_manager_view.py similarity index 99% rename from bottles/frontend/views/details_task_manager_view.py rename to bottles/frontend/details_task_manager_view.py index f2d6d25a7b..af55ee8036 100644 --- a/bottles/frontend/views/details_task_manager_view.py +++ b/bottles/frontend/details_task_manager_view.py @@ -23,7 +23,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.winebridge import WineBridge from bottles.backend.wine.winedbg import WineDbg -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/details-task-manager-view.ui") diff --git a/bottles/frontend/views/details_versioning_page.py b/bottles/frontend/details_versioning_page.py similarity index 97% rename from bottles/frontend/views/details_versioning_page.py rename to bottles/frontend/details_versioning_page.py index 661852d3f9..d83408f328 100644 --- a/bottles/frontend/views/details_versioning_page.py +++ b/bottles/frontend/details_versioning_page.py @@ -22,9 +22,9 @@ from bottles.backend.models.result import Result from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.common import open_doc_url -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.state_row import StateRow +from bottles.frontend.common import open_doc_url +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.state_row import StateRow @Gtk.Template(resource_path="/com/usebottles/bottles/details-versioning-page.ui") diff --git a/bottles/frontend/ui/display-dialog.blp b/bottles/frontend/display-dialog.blp similarity index 100% rename from bottles/frontend/ui/display-dialog.blp rename to bottles/frontend/display-dialog.blp diff --git a/bottles/frontend/windows/display_dialog.py b/bottles/frontend/display_dialog.py similarity index 99% rename from bottles/frontend/windows/display_dialog.py rename to bottles/frontend/display_dialog.py index 0d6ce73806..d5a605a394 100644 --- a/bottles/frontend/windows/display_dialog.py +++ b/bottles/frontend/display_dialog.py @@ -23,7 +23,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.reg import Reg from bottles.backend.wine.regkeys import RegKeys -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils logging = Logger() diff --git a/bottles/frontend/ui/dll-override-entry.blp b/bottles/frontend/dll-override-entry.blp similarity index 100% rename from bottles/frontend/ui/dll-override-entry.blp rename to bottles/frontend/dll-override-entry.blp diff --git a/bottles/frontend/ui/dll-overrides-dialog.blp b/bottles/frontend/dll-overrides-dialog.blp similarity index 100% rename from bottles/frontend/ui/dll-overrides-dialog.blp rename to bottles/frontend/dll-overrides-dialog.blp diff --git a/bottles/frontend/windows/dll_overrides_dialog.py b/bottles/frontend/dll_overrides_dialog.py similarity index 100% rename from bottles/frontend/windows/dll_overrides_dialog.py rename to bottles/frontend/dll_overrides_dialog.py diff --git a/bottles/frontend/ui/drive-entry.blp b/bottles/frontend/drive-entry.blp similarity index 100% rename from bottles/frontend/ui/drive-entry.blp rename to bottles/frontend/drive-entry.blp diff --git a/bottles/frontend/ui/drives-dialog.blp b/bottles/frontend/drives-dialog.blp similarity index 100% rename from bottles/frontend/ui/drives-dialog.blp rename to bottles/frontend/drives-dialog.blp diff --git a/bottles/frontend/windows/drives_dialog.py b/bottles/frontend/drives_dialog.py similarity index 100% rename from bottles/frontend/windows/drives_dialog.py rename to bottles/frontend/drives_dialog.py diff --git a/bottles/frontend/ui/duplicate-dialog.blp b/bottles/frontend/duplicate-dialog.blp similarity index 100% rename from bottles/frontend/ui/duplicate-dialog.blp rename to bottles/frontend/duplicate-dialog.blp diff --git a/bottles/frontend/windows/duplicate_dialog.py b/bottles/frontend/duplicate_dialog.py similarity index 98% rename from bottles/frontend/windows/duplicate_dialog.py rename to bottles/frontend/duplicate_dialog.py index 31c70539bb..a3b839430d 100644 --- a/bottles/frontend/windows/duplicate_dialog.py +++ b/bottles/frontend/duplicate_dialog.py @@ -21,7 +21,7 @@ from bottles.backend.managers.backup import BackupManager from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/duplicate-dialog.ui") diff --git a/bottles/frontend/ui/env-var-entry.blp b/bottles/frontend/env-var-entry.blp similarity index 100% rename from bottles/frontend/ui/env-var-entry.blp rename to bottles/frontend/env-var-entry.blp diff --git a/bottles/frontend/ui/environment-variables-dialog.blp b/bottles/frontend/environment-variables-dialog.blp similarity index 100% rename from bottles/frontend/ui/environment-variables-dialog.blp rename to bottles/frontend/environment-variables-dialog.blp diff --git a/bottles/frontend/windows/environment_variables_dialog.py b/bottles/frontend/environment_variables_dialog.py similarity index 98% rename from bottles/frontend/windows/environment_variables_dialog.py rename to bottles/frontend/environment_variables_dialog.py index 8ca9de3657..8252a135f0 100644 --- a/bottles/frontend/windows/environment_variables_dialog.py +++ b/bottles/frontend/environment_variables_dialog.py @@ -20,8 +20,8 @@ from gi.repository import Gtk, GLib, Adw from bottles.backend.logger import Logger -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.utils.sh import ShUtils +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.sh import ShUtils logging = Logger() diff --git a/bottles/frontend/ui/exclusion-pattern-row.blp b/bottles/frontend/exclusion-pattern-row.blp similarity index 100% rename from bottles/frontend/ui/exclusion-pattern-row.blp rename to bottles/frontend/exclusion-pattern-row.blp diff --git a/bottles/frontend/ui/exclusion-patterns-dialog.blp b/bottles/frontend/exclusion-patterns-dialog.blp similarity index 100% rename from bottles/frontend/ui/exclusion-patterns-dialog.blp rename to bottles/frontend/exclusion-patterns-dialog.blp diff --git a/bottles/frontend/windows/exclusion_patterns_dialog.py b/bottles/frontend/exclusion_patterns_dialog.py similarity index 100% rename from bottles/frontend/windows/exclusion_patterns_dialog.py rename to bottles/frontend/exclusion_patterns_dialog.py diff --git a/bottles/frontend/widgets/executable.py b/bottles/frontend/executable.py similarity index 100% rename from bottles/frontend/widgets/executable.py rename to bottles/frontend/executable.py diff --git a/bottles/frontend/utils/filters.py b/bottles/frontend/filters.py similarity index 100% rename from bottles/frontend/utils/filters.py rename to bottles/frontend/filters.py diff --git a/bottles/frontend/ui/fsr-dialog.blp b/bottles/frontend/fsr-dialog.blp similarity index 100% rename from bottles/frontend/ui/fsr-dialog.blp rename to bottles/frontend/fsr-dialog.blp diff --git a/bottles/frontend/windows/fsr_dialog.py b/bottles/frontend/fsr_dialog.py similarity index 100% rename from bottles/frontend/windows/fsr_dialog.py rename to bottles/frontend/fsr_dialog.py diff --git a/bottles/frontend/ui/gamescope-dialog.blp b/bottles/frontend/gamescope-dialog.blp similarity index 100% rename from bottles/frontend/ui/gamescope-dialog.blp rename to bottles/frontend/gamescope-dialog.blp diff --git a/bottles/frontend/windows/gamescope_dialog.py b/bottles/frontend/gamescope_dialog.py similarity index 100% rename from bottles/frontend/windows/gamescope_dialog.py rename to bottles/frontend/gamescope_dialog.py diff --git a/bottles/frontend/windows/generic.py b/bottles/frontend/generic.py similarity index 100% rename from bottles/frontend/windows/generic.py rename to bottles/frontend/generic.py diff --git a/bottles/frontend/windows/generic_cli.py b/bottles/frontend/generic_cli.py similarity index 100% rename from bottles/frontend/windows/generic_cli.py rename to bottles/frontend/generic_cli.py diff --git a/bottles/frontend/utils/gtk.py b/bottles/frontend/gtk.py similarity index 98% rename from bottles/frontend/utils/gtk.py rename to bottles/frontend/gtk.py index 3af520d6c3..dfad76e655 100644 --- a/bottles/frontend/utils/gtk.py +++ b/bottles/frontend/gtk.py @@ -21,7 +21,7 @@ from gi.repository import GLib, Gtk, GObject -from bottles.frontend.utils.sh import ShUtils +from bottles.frontend.sh import ShUtils class GtkUtils: diff --git a/bottles/frontend/ui/help-overlay.blp b/bottles/frontend/help-overlay.blp similarity index 100% rename from bottles/frontend/ui/help-overlay.blp rename to bottles/frontend/help-overlay.blp diff --git a/bottles/frontend/ui/importer-row.blp b/bottles/frontend/importer-row.blp similarity index 100% rename from bottles/frontend/ui/importer-row.blp rename to bottles/frontend/importer-row.blp diff --git a/bottles/frontend/ui/importer-view.blp b/bottles/frontend/importer-view.blp similarity index 100% rename from bottles/frontend/ui/importer-view.blp rename to bottles/frontend/importer-view.blp diff --git a/bottles/frontend/widgets/importer_row.py b/bottles/frontend/importer_row.py similarity index 98% rename from bottles/frontend/widgets/importer_row.py rename to bottles/frontend/importer_row.py index 3fec3da5e4..106bb04af5 100644 --- a/bottles/frontend/widgets/importer_row.py +++ b/bottles/frontend/importer_row.py @@ -21,7 +21,7 @@ from bottles.backend.utils.manager import ManagerUtils from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/importer-row.ui") diff --git a/bottles/frontend/views/importer_view.py b/bottles/frontend/importer_view.py similarity index 96% rename from bottles/frontend/views/importer_view.py rename to bottles/frontend/importer_view.py index dfc50ecf18..4a2256f220 100644 --- a/bottles/frontend/views/importer_view.py +++ b/bottles/frontend/importer_view.py @@ -21,9 +21,9 @@ from bottles.backend.managers.backup import BackupManager from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.filters import add_yaml_filters, add_all_filters -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.importer_row import ImporterRow +from bottles.frontend.filters import add_yaml_filters, add_all_filters +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.importer_row import ImporterRow @Gtk.Template(resource_path="/com/usebottles/bottles/importer-view.ui") diff --git a/bottles/frontend/ui/installer-dialog.blp b/bottles/frontend/installer-dialog.blp similarity index 100% rename from bottles/frontend/ui/installer-dialog.blp rename to bottles/frontend/installer-dialog.blp diff --git a/bottles/frontend/ui/installer-row.blp b/bottles/frontend/installer-row.blp similarity index 100% rename from bottles/frontend/ui/installer-row.blp rename to bottles/frontend/installer-row.blp diff --git a/bottles/frontend/windows/installer_dialog.py b/bottles/frontend/installer_dialog.py similarity index 99% rename from bottles/frontend/windows/installer_dialog.py rename to bottles/frontend/installer_dialog.py index 9479c214e8..775c1648ff 100644 --- a/bottles/frontend/windows/installer_dialog.py +++ b/bottles/frontend/installer_dialog.py @@ -21,7 +21,7 @@ from gi.repository import Gtk, GLib, Gio, GdkPixbuf, Adw from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/local-resource-row.ui") diff --git a/bottles/frontend/widgets/installer_row.py b/bottles/frontend/installer_row.py similarity index 96% rename from bottles/frontend/widgets/installer_row.py rename to bottles/frontend/installer_row.py index 6860dff9dc..3e0d4906df 100644 --- a/bottles/frontend/widgets/installer_row.py +++ b/bottles/frontend/installer_row.py @@ -19,8 +19,8 @@ from gettext import gettext as _ import webbrowser -from bottles.frontend.windows.generic import SourceDialog -from bottles.frontend.windows.installer_dialog import InstallerDialog +from bottles.frontend.generic import SourceDialog +from bottles.frontend.installer_dialog import InstallerDialog @Gtk.Template(resource_path="/com/usebottles/bottles/installer-row.ui") diff --git a/bottles/frontend/ui/journal-dialog.blp b/bottles/frontend/journal-dialog.blp similarity index 100% rename from bottles/frontend/ui/journal-dialog.blp rename to bottles/frontend/journal-dialog.blp diff --git a/bottles/frontend/windows/journal_dialog.py b/bottles/frontend/journal_dialog.py similarity index 100% rename from bottles/frontend/windows/journal_dialog.py rename to bottles/frontend/journal_dialog.py diff --git a/bottles/frontend/ui/launch-options-dialog.blp b/bottles/frontend/launch-options-dialog.blp similarity index 100% rename from bottles/frontend/ui/launch-options-dialog.blp rename to bottles/frontend/launch-options-dialog.blp diff --git a/bottles/frontend/windows/launch_options_dialog.py b/bottles/frontend/launch_options_dialog.py similarity index 100% rename from bottles/frontend/windows/launch_options_dialog.py rename to bottles/frontend/launch_options_dialog.py diff --git a/bottles/frontend/ui/library-entry.blp b/bottles/frontend/library-entry.blp similarity index 100% rename from bottles/frontend/ui/library-entry.blp rename to bottles/frontend/library-entry.blp diff --git a/bottles/frontend/ui/library-view.blp b/bottles/frontend/library-view.blp similarity index 100% rename from bottles/frontend/ui/library-view.blp rename to bottles/frontend/library-view.blp diff --git a/bottles/frontend/widgets/library.py b/bottles/frontend/library.py similarity index 99% rename from bottles/frontend/widgets/library.py rename to bottles/frontend/library.py index 88fe68eb24..1a2e5fea60 100644 --- a/bottles/frontend/widgets/library.py +++ b/bottles/frontend/library.py @@ -26,7 +26,7 @@ from bottles.backend.utils.threading import RunAsync from bottles.backend.wine.executor import WineExecutor from bottles.backend.wine.winedbg import WineDbg -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils logging = Logger() diff --git a/bottles/frontend/views/library_view.py b/bottles/frontend/library_view.py similarity index 96% rename from bottles/frontend/views/library_view.py rename to bottles/frontend/library_view.py index 45cbf5ad80..82e475fe9e 100644 --- a/bottles/frontend/views/library_view.py +++ b/bottles/frontend/library_view.py @@ -21,8 +21,8 @@ from gi.repository import Gtk, Adw, GObject from bottles.backend.managers.library import LibraryManager -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.widgets.library import LibraryEntry +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.library import LibraryEntry @Gtk.Template(resource_path="/com/usebottles/bottles/library-view.ui") diff --git a/bottles/frontend/ui/loading-view.blp b/bottles/frontend/loading-view.blp similarity index 100% rename from bottles/frontend/ui/loading-view.blp rename to bottles/frontend/loading-view.blp diff --git a/bottles/frontend/views/loading_view.py b/bottles/frontend/loading_view.py similarity index 97% rename from bottles/frontend/views/loading_view.py rename to bottles/frontend/loading_view.py index 36c44d585f..330f26ac46 100644 --- a/bottles/frontend/views/loading_view.py +++ b/bottles/frontend/loading_view.py @@ -21,7 +21,7 @@ from bottles.backend.models.result import Result from bottles.backend.state import SignalManager, Signals -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils from bottles.frontend.params import APP_ID diff --git a/bottles/frontend/ui/local-resource-row.blp b/bottles/frontend/local-resource-row.blp similarity index 100% rename from bottles/frontend/ui/local-resource-row.blp rename to bottles/frontend/local-resource-row.blp diff --git a/bottles/frontend/main.py b/bottles/frontend/main.py index 3df92f69be..504bf4a55d 100644 --- a/bottles/frontend/main.py +++ b/bottles/frontend/main.py @@ -34,8 +34,8 @@ # ruff: noqa: E402 from gi.repository import Gio, GLib, GObject, Adw # type: ignore -from bottles.frontend.windows.window import BottlesWindow -from bottles.frontend.views.preferences import PreferencesWindow +from bottles.frontend.window import BottlesWindow +from bottles.frontend.preferences import PreferencesWindow logging = Logger() @@ -217,7 +217,7 @@ def __process_uri(self, uri): return 0 try: - from bottles.frontend.windows.bottle_picker_dialog import BottlePickerDialog + from bottles.frontend.bottle_picker_dialog import BottlePickerDialog dialog = BottlePickerDialog(application=self, arg_exe=uri) dialog.present() diff --git a/bottles/frontend/ui/mangohud-dialog.blp b/bottles/frontend/mangohud-dialog.blp similarity index 100% rename from bottles/frontend/ui/mangohud-dialog.blp rename to bottles/frontend/mangohud-dialog.blp diff --git a/bottles/frontend/windows/mangohud_dialog.py b/bottles/frontend/mangohud_dialog.py similarity index 100% rename from bottles/frontend/windows/mangohud_dialog.py rename to bottles/frontend/mangohud_dialog.py diff --git a/bottles/frontend/meson.build b/bottles/frontend/meson.build index 6ff7c01106..aeee712d78 100644 --- a/bottles/frontend/meson.build +++ b/bottles/frontend/meson.build @@ -1,12 +1,81 @@ pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) frontenddir = join_paths(pkgdatadir, 'bottles/frontend') -subdir('ui') -subdir('utils') -subdir('views') -subdir('widgets') -subdir('windows') -subdir('cli') +gnome = import('gnome') +blueprints = custom_target('blueprints', + input: files( + 'component-entry-row.blp', + 'check-row.blp', + 'dependency-entry-row.blp', + 'bottle-details-page.blp', + 'details-dependencies-view.blp', + 'details-installers-view.blp', + 'details-task-manager-view.blp', + 'details-versioning-page.blp', + 'bottle-details-view.blp', + 'bottle-picker-dialog.blp', + 'crash-report-dialog.blp', + 'dependencies-check-dialog.blp', + 'dll-overrides-dialog.blp', + 'drives-dialog.blp', + 'duplicate-dialog.blp', + 'environment-variables-dialog.blp', + 'exclusion-patterns-dialog.blp', + 'gamescope-dialog.blp', + 'installer-dialog.blp', + 'journal-dialog.blp', + 'launch-options-dialog.blp', + 'proton-alert-dialog.blp', + 'rename-dialog.blp', + 'sandbox-dialog.blp', + 'upgrade-versioning-dialog.blp', + 'vkbasalt-dialog.blp', + 'display-dialog.blp', + 'vmtouch-dialog.blp', + 'fsr-dialog.blp', + 'mangohud-dialog.blp', + 'dll-override-entry.blp', + 'drive-entry.blp', + 'env-var-entry.blp', + 'exclusion-pattern-row.blp', + 'importer-row.blp', + 'importer-view.blp', + 'installer-row.blp', + 'library-entry.blp', + 'library-view.blp', + 'bottle-row.blp', + 'bottles-list-view.blp', + 'loading-view.blp', + 'local-resource-row.blp', + 'new-bottle-dialog.blp', + 'onboard-dialog.blp', + 'preferences.blp', + 'program-row.blp', + 'state-row.blp', + 'task-row.blp', + 'window.blp', + 'details-preferences-page.blp', + 'help-overlay.blp', + ), + output: '.', + command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],) + +gnome.compile_resources('bottles', + 'bottles.gresource.xml', + gresource_bundle: true, + dependencies: blueprints, + install: true, + install_dir: pkgdatadir, +) + +configure_file( + input: 'cli.py', + output: 'bottles-cli', + configuration: conf, + install: true, + install_dir: get_option('bindir'), + install_mode: ['rwxr-xr-x'] +) configure_file( input: 'bottles.py', @@ -33,6 +102,56 @@ bottles_sources = [ '__init__.py', 'main.py', 'operation.py', + 'gtk.py', + 'common.py', + 'filters.py', + 'sh.py', + 'new_bottle_dialog.py', + 'bottles_list_view.py', + 'library_view.py', + 'bottle_details_view.py', + 'preferences.py', + 'importer_view.py', + 'loading_view.py', + 'bottle_details_page.py', + 'details_installers_view.py', + 'details_dependencies_view.py', + 'details_preferences_page.py', + 'details_versioning_page.py', + 'details_task_manager_view.py', + 'dependency_entry_row.py', + 'executable.py', + 'importer_row.py', + 'installer_row.py', + 'program_row.py', + 'state_row.py', + 'component_entry_row.py', + 'library.py', + 'crash_report_dialog.py', + 'dll_overrides_dialog.py', + 'duplicate_dialog.py', + 'environment_variables_dialog.py', + 'generic.py', + 'launch_options_dialog.py', + 'onboard_dialog.py', + 'rename_dialog.py', + 'drives_dialog.py', + 'gamescope_dialog.py', + 'vkbasalt_dialog.py', + 'fsr_dialog.py', + 'mangohud_dialog.py', + 'display_dialog.py', + 'generic_cli.py', + 'journal_dialog.py', + 'bottle_picker_dialog.py', + 'proton_alert_dialog.py', + 'sandbox_dialog.py', + 'installer_dialog.py', + 'dependencies_check_dialog.py', + 'exclusion_patterns_dialog.py', + 'upgrade_versioning_dialog.py', + 'vmtouch_dialog.py', + 'window.py', params_file, ] diff --git a/bottles/frontend/ui/new-bottle-dialog.blp b/bottles/frontend/new-bottle-dialog.blp similarity index 100% rename from bottles/frontend/ui/new-bottle-dialog.blp rename to bottles/frontend/new-bottle-dialog.blp diff --git a/bottles/frontend/views/new_bottle_dialog.py b/bottles/frontend/new_bottle_dialog.py similarity index 98% rename from bottles/frontend/views/new_bottle_dialog.py rename to bottles/frontend/new_bottle_dialog.py index 82fafa2d26..65718cb799 100644 --- a/bottles/frontend/views/new_bottle_dialog.py +++ b/bottles/frontend/new_bottle_dialog.py @@ -22,8 +22,8 @@ from bottles.backend.models.config import BottleConfig from bottles.backend.utils.threading import RunAsync from bottles.backend.models.result import Result -from bottles.frontend.utils.filters import add_yaml_filters, add_all_filters -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.filters import add_yaml_filters, add_all_filters +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/check-row.ui") diff --git a/bottles/frontend/ui/onboard-dialog.blp b/bottles/frontend/onboard-dialog.blp similarity index 100% rename from bottles/frontend/ui/onboard-dialog.blp rename to bottles/frontend/onboard-dialog.blp diff --git a/bottles/frontend/windows/onboard_dialog.py b/bottles/frontend/onboard_dialog.py similarity index 99% rename from bottles/frontend/windows/onboard_dialog.py rename to bottles/frontend/onboard_dialog.py index 076e36a812..b5383f0e4b 100644 --- a/bottles/frontend/windows/onboard_dialog.py +++ b/bottles/frontend/onboard_dialog.py @@ -21,7 +21,7 @@ from bottles.backend.models.result import Result from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/onboard-dialog.ui") diff --git a/bottles/frontend/ui/preferences.blp b/bottles/frontend/preferences.blp similarity index 100% rename from bottles/frontend/ui/preferences.blp rename to bottles/frontend/preferences.blp diff --git a/bottles/frontend/views/preferences.py b/bottles/frontend/preferences.py similarity index 99% rename from bottles/frontend/views/preferences.py rename to bottles/frontend/preferences.py index aa214672cd..3fe9249277 100644 --- a/bottles/frontend/views/preferences.py +++ b/bottles/frontend/preferences.py @@ -26,7 +26,7 @@ from bottles.backend.state import EventManager, Events from bottles.backend.utils.threading import RunAsync from bottles.backend.utils.generic import sort_by_version -from bottles.frontend.widgets.component_entry_row import ( +from bottles.frontend.component_entry_row import ( ComponentEntryRow, ComponentExpander, ) diff --git a/bottles/frontend/ui/program-row.blp b/bottles/frontend/program-row.blp similarity index 100% rename from bottles/frontend/ui/program-row.blp rename to bottles/frontend/program-row.blp diff --git a/bottles/frontend/widgets/program_row.py b/bottles/frontend/program_row.py similarity index 98% rename from bottles/frontend/widgets/program_row.py rename to bottles/frontend/program_row.py index bd7b8e6b57..82c201a954 100644 --- a/bottles/frontend/widgets/program_row.py +++ b/bottles/frontend/program_row.py @@ -28,9 +28,9 @@ from bottles.backend.wine.executor import WineExecutor from bottles.backend.wine.uninstaller import Uninstaller from bottles.backend.wine.winedbg import WineDbg -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.windows.launch_options_dialog import LaunchOptionsDialog -from bottles.frontend.windows.rename_dialog import RenameDialog +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.launch_options_dialog import LaunchOptionsDialog +from bottles.frontend.rename_dialog import RenameDialog # noinspection PyUnusedLocal diff --git a/bottles/frontend/ui/proton-alert-dialog.blp b/bottles/frontend/proton-alert-dialog.blp similarity index 100% rename from bottles/frontend/ui/proton-alert-dialog.blp rename to bottles/frontend/proton-alert-dialog.blp diff --git a/bottles/frontend/windows/proton_alert_dialog.py b/bottles/frontend/proton_alert_dialog.py similarity index 100% rename from bottles/frontend/windows/proton_alert_dialog.py rename to bottles/frontend/proton_alert_dialog.py diff --git a/bottles/frontend/ui/rename-dialog.blp b/bottles/frontend/rename-dialog.blp similarity index 100% rename from bottles/frontend/ui/rename-dialog.blp rename to bottles/frontend/rename-dialog.blp diff --git a/bottles/frontend/windows/rename_dialog.py b/bottles/frontend/rename_dialog.py similarity index 100% rename from bottles/frontend/windows/rename_dialog.py rename to bottles/frontend/rename_dialog.py diff --git a/bottles/frontend/ui/sandbox-dialog.blp b/bottles/frontend/sandbox-dialog.blp similarity index 100% rename from bottles/frontend/ui/sandbox-dialog.blp rename to bottles/frontend/sandbox-dialog.blp diff --git a/bottles/frontend/windows/sandbox_dialog.py b/bottles/frontend/sandbox_dialog.py similarity index 100% rename from bottles/frontend/windows/sandbox_dialog.py rename to bottles/frontend/sandbox_dialog.py diff --git a/bottles/frontend/utils/sh.py b/bottles/frontend/sh.py similarity index 100% rename from bottles/frontend/utils/sh.py rename to bottles/frontend/sh.py diff --git a/bottles/frontend/ui/state-row.blp b/bottles/frontend/state-row.blp similarity index 100% rename from bottles/frontend/ui/state-row.blp rename to bottles/frontend/state-row.blp diff --git a/bottles/frontend/widgets/state_row.py b/bottles/frontend/state_row.py similarity index 98% rename from bottles/frontend/widgets/state_row.py rename to bottles/frontend/state_row.py index 6f3c0f26fa..35e1f654a3 100644 --- a/bottles/frontend/widgets/state_row.py +++ b/bottles/frontend/state_row.py @@ -21,7 +21,7 @@ from gi.repository import Gtk, Adw from bottles.backend.utils.threading import RunAsync -from bottles.frontend.utils.gtk import GtkUtils +from bottles.frontend.gtk import GtkUtils @Gtk.Template(resource_path="/com/usebottles/bottles/state-row.ui") diff --git a/bottles/frontend/ui/style-dark.css b/bottles/frontend/style-dark.css similarity index 100% rename from bottles/frontend/ui/style-dark.css rename to bottles/frontend/style-dark.css diff --git a/bottles/frontend/ui/style.css b/bottles/frontend/style.css similarity index 100% rename from bottles/frontend/ui/style.css rename to bottles/frontend/style.css diff --git a/bottles/frontend/ui/task-row.blp b/bottles/frontend/task-row.blp similarity index 100% rename from bottles/frontend/ui/task-row.blp rename to bottles/frontend/task-row.blp diff --git a/bottles/frontend/ui/meson.build b/bottles/frontend/ui/meson.build deleted file mode 100644 index 0db06e45ce..0000000000 --- a/bottles/frontend/ui/meson.build +++ /dev/null @@ -1,67 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -gnome = import('gnome') -blueprints = custom_target('blueprints', - input: files( - 'component-entry-row.blp', - 'check-row.blp', - 'dependency-entry-row.blp', - 'bottle-details-page.blp', - 'details-dependencies-view.blp', - 'details-installers-view.blp', - 'details-task-manager-view.blp', - 'details-versioning-page.blp', - 'bottle-details-view.blp', - 'bottle-picker-dialog.blp', - 'crash-report-dialog.blp', - 'dependencies-check-dialog.blp', - 'dll-overrides-dialog.blp', - 'drives-dialog.blp', - 'duplicate-dialog.blp', - 'environment-variables-dialog.blp', - 'exclusion-patterns-dialog.blp', - 'gamescope-dialog.blp', - 'installer-dialog.blp', - 'journal-dialog.blp', - 'launch-options-dialog.blp', - 'proton-alert-dialog.blp', - 'rename-dialog.blp', - 'sandbox-dialog.blp', - 'upgrade-versioning-dialog.blp', - 'vkbasalt-dialog.blp', - 'display-dialog.blp', - 'vmtouch-dialog.blp', - 'fsr-dialog.blp', - 'mangohud-dialog.blp', - 'dll-override-entry.blp', - 'drive-entry.blp', - 'env-var-entry.blp', - 'exclusion-pattern-row.blp', - 'importer-row.blp', - 'importer-view.blp', - 'installer-row.blp', - 'library-entry.blp', - 'library-view.blp', - 'bottle-row.blp', - 'bottles-list-view.blp', - 'loading-view.blp', - 'local-resource-row.blp', - 'new-bottle-dialog.blp', - 'onboard-dialog.blp', - 'preferences.blp', - 'program-row.blp', - 'state-row.blp', - 'task-row.blp', - 'window.blp', - 'details-preferences-page.blp', - 'help-overlay.blp', - ), - output: '.', - command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],) - -gnome.compile_resources('bottles', - 'bottles.gresource.xml', - gresource_bundle: true, - dependencies: blueprints, - install: true, - install_dir: pkgdatadir, -) diff --git a/bottles/frontend/ui/upgrade-versioning-dialog.blp b/bottles/frontend/upgrade-versioning-dialog.blp similarity index 100% rename from bottles/frontend/ui/upgrade-versioning-dialog.blp rename to bottles/frontend/upgrade-versioning-dialog.blp diff --git a/bottles/frontend/windows/upgrade_versioning_dialog.py b/bottles/frontend/upgrade_versioning_dialog.py similarity index 100% rename from bottles/frontend/windows/upgrade_versioning_dialog.py rename to bottles/frontend/upgrade_versioning_dialog.py diff --git a/bottles/frontend/utils/__init__.py b/bottles/frontend/utils/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bottles/frontend/utils/meson.build b/bottles/frontend/utils/meson.build deleted file mode 100644 index 5b280588e0..0000000000 --- a/bottles/frontend/utils/meson.build +++ /dev/null @@ -1,12 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -utilsdir = join_paths(pkgdatadir, 'bottles/frontend/utils') - -bottles_sources = [ - '__init__.py', - 'gtk.py', - 'common.py', - 'filters.py', - 'sh.py', -] - -install_data(bottles_sources, install_dir: utilsdir) diff --git a/bottles/frontend/views/__init__.py b/bottles/frontend/views/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bottles/frontend/views/meson.build b/bottles/frontend/views/meson.build deleted file mode 100644 index f856cda06a..0000000000 --- a/bottles/frontend/views/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -viewsdir = join_paths(pkgdatadir, 'bottles/frontend/views') - -bottles_sources = [ - '__init__.py', - 'new_bottle_dialog.py', - 'bottles_list_view.py', - 'library_view.py', - 'bottle_details_view.py', - 'preferences.py', - 'importer_view.py', - 'loading_view.py', - - 'bottle_details_page.py', - 'details_installers_view.py', - 'details_dependencies_view.py', - 'details_preferences_page.py', - 'details_versioning_page.py', - 'details_task_manager_view.py' -] - -install_data(bottles_sources, install_dir: viewsdir) diff --git a/bottles/frontend/ui/vkbasalt-dialog.blp b/bottles/frontend/vkbasalt-dialog.blp similarity index 100% rename from bottles/frontend/ui/vkbasalt-dialog.blp rename to bottles/frontend/vkbasalt-dialog.blp diff --git a/bottles/frontend/windows/vkbasalt_dialog.py b/bottles/frontend/vkbasalt_dialog.py similarity index 100% rename from bottles/frontend/windows/vkbasalt_dialog.py rename to bottles/frontend/vkbasalt_dialog.py diff --git a/bottles/frontend/ui/vmtouch-dialog.blp b/bottles/frontend/vmtouch-dialog.blp similarity index 100% rename from bottles/frontend/ui/vmtouch-dialog.blp rename to bottles/frontend/vmtouch-dialog.blp diff --git a/bottles/frontend/windows/vmtouch_dialog.py b/bottles/frontend/vmtouch_dialog.py similarity index 100% rename from bottles/frontend/windows/vmtouch_dialog.py rename to bottles/frontend/vmtouch_dialog.py diff --git a/bottles/frontend/widgets/__init__.py b/bottles/frontend/widgets/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bottles/frontend/widgets/meson.build b/bottles/frontend/widgets/meson.build deleted file mode 100644 index db12efc56d..0000000000 --- a/bottles/frontend/widgets/meson.build +++ /dev/null @@ -1,16 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -widgetsdir = join_paths(pkgdatadir, 'bottles/frontend/widgets') - -bottles_sources = [ - '__init__.py', - 'dependency_entry_row.py', - 'executable.py', - 'importer_row.py', - 'installer_row.py', - 'program_row.py', - 'state_row.py', - 'component_entry_row.py', - 'library.py', -] - -install_data(bottles_sources, install_dir: widgetsdir) diff --git a/bottles/frontend/ui/window.blp b/bottles/frontend/window.blp similarity index 100% rename from bottles/frontend/ui/window.blp rename to bottles/frontend/window.blp diff --git a/bottles/frontend/windows/window.py b/bottles/frontend/window.py similarity index 95% rename from bottles/frontend/windows/window.py rename to bottles/frontend/window.py index eb85e427b9..8e05ab88f9 100644 --- a/bottles/frontend/windows/window.py +++ b/bottles/frontend/window.py @@ -35,17 +35,17 @@ from bottles.backend.utils.threading import RunAsync from bottles.frontend.operation import TaskSyncer from bottles.frontend.params import APP_ID, BASE_ID, PROFILE -from bottles.frontend.utils.gtk import GtkUtils -from bottles.frontend.views.bottle_details_view import BottleDetailsView -from bottles.frontend.views.importer_view import ImporterView -from bottles.frontend.views.library_view import LibraryView -from bottles.frontend.views.bottles_list_view import BottlesListView -from bottles.frontend.views.loading_view import LoadingView -from bottles.frontend.views.new_bottle_dialog import NewBottleDialog -from bottles.frontend.views.preferences import PreferencesWindow -from bottles.frontend.windows.crash_report_dialog import CrashReportDialog -from bottles.frontend.windows.dependencies_check_dialog import DependenciesCheckDialog -from bottles.frontend.windows.onboard_dialog import OnboardDialog +from bottles.frontend.gtk import GtkUtils +from bottles.frontend.bottle_details_view import BottleDetailsView +from bottles.frontend.importer_view import ImporterView +from bottles.frontend.library_view import LibraryView +from bottles.frontend.bottles_list_view import BottlesListView +from bottles.frontend.loading_view import LoadingView +from bottles.frontend.new_bottle_dialog import NewBottleDialog +from bottles.frontend.preferences import PreferencesWindow +from bottles.frontend.crash_report_dialog import CrashReportDialog +from bottles.frontend.dependencies_check_dialog import DependenciesCheckDialog +from bottles.frontend.onboard_dialog import OnboardDialog logging = Logger() diff --git a/bottles/frontend/windows/__init__.py b/bottles/frontend/windows/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/bottles/frontend/windows/meson.build b/bottles/frontend/windows/meson.build deleted file mode 100644 index 76fed771bc..0000000000 --- a/bottles/frontend/windows/meson.build +++ /dev/null @@ -1,33 +0,0 @@ -pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) -dialogsdir = join_paths(pkgdatadir, 'bottles/frontend/windows') - -bottles_sources = [ - '__init__.py', - 'crash_report_dialog.py', - 'dll_overrides_dialog.py', - 'duplicate_dialog.py', - 'environment_variables_dialog.py', - 'generic.py', - 'launch_options_dialog.py', - 'onboard_dialog.py', - 'rename_dialog.py', - 'drives_dialog.py', - 'gamescope_dialog.py', - 'vkbasalt_dialog.py', - 'fsr_dialog.py', - 'mangohud_dialog.py', - 'display_dialog.py', - 'generic_cli.py', - 'journal_dialog.py', - 'bottle_picker_dialog.py', - 'proton_alert_dialog.py', - 'sandbox_dialog.py', - 'installer_dialog.py', - 'dependencies_check_dialog.py', - 'exclusion_patterns_dialog.py', - 'upgrade_versioning_dialog.py', - 'vmtouch_dialog.py', - 'window.py', -] - -install_data(bottles_sources, install_dir: dialogsdir)