diff --git a/.github/workflows/AppImage.yml b/.github/workflows/AppImage.yml index e2b6643b846..bfa47588083 100644 --- a/.github/workflows/AppImage.yml +++ b/.github/workflows/AppImage.yml @@ -38,7 +38,7 @@ jobs: rm appdir/usr/local/share/bottles/bottles/bottles.in rm appdir/usr/local/share/bottles/bottles/meson.build mkdir -p appdir/usr/share/glib-2.0/schemas/ - cp ../data/pm.mirko.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/pm.mirko.bottles.gschema.xml + cp ../data/com.usebottles.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/com.usebottles.bottles.gschema.xml - name: Glib Schemas compilation working-directory: /home/runner/work/Bottles/Bottles/build run: | @@ -46,7 +46,7 @@ jobs: - name: Directory and files creation working-directory: /home/runner/work/Bottles/Bottles/build run: | - mkdir -p appdir/usr/share/applications ; cp data/pm.mirko.bottles.desktop appdir/usr/share/applications/ + mkdir -p appdir/usr/share/applications ; cp data/com.usebottles.bottles.desktop appdir/usr/share/applications/ cp -a ../AppRun appdir/AppRun - name: AppImage creation working-directory: /home/runner/work/Bottles/Bottles/build @@ -56,7 +56,7 @@ jobs: run: | wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" chmod a+x linuxdeploy-x86_64.AppImage - ./linuxdeploy-x86_64.AppImage --appdir appdir --icon-file=../data/icons/hicolor/scalable/apps/pm.mirko.bottles.svg --output appimage + ./linuxdeploy-x86_64.AppImage --appdir appdir --icon-file=../data/icons/hicolor/scalable/apps/com.usebottles.bottles.svg --output appimage - name: Moving the artifact working-directory: /home/runner/work/Bottles/Bottles/build run: | diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..25a924073a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +.mypy_cache/ +.pytest_cache/ +/.project +/.pydevproject +/.settings +/.cproject +/.idea +/.vscode + +__pycache__ +.coverage +/install dir +/work area + +/meson-test-run.txt +/meson-test-run.xml +/meson-cross-test-run.txt +/meson-cross-test-run.xml + +.DS_Store +*~ +*.swp +packagecache +/MANIFEST +/build +/dist +/meson.egg-info + +/docs/built_docs +/docs/hotdoc-private* + +*.pyc +/*venv* \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index ba93a04b094..d7351fd1e0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,17 +51,17 @@ script: - rm appdir/usr/local/share/bottles/bottles/meson.build # - appdata - echo "Copying appdata" - - cp -a ../data/pm.mirko.bottles.appdata.xml.in appdir/usr/share/metainfo/pm.mirko.bottles.appdata.xml + - cp -a ../data/com.usebottles.bottles.appdata.xml.in appdir/usr/share/metainfo/com.usebottles.bottles.appdata.xml # - icons - echo "Copying icons" - cp -a ../data/icons appdir/usr/share/icons # - schemas - echo "Copying and compiling gschema" - - cp ../data/pm.mirko.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/pm.mirko.bottles.gschema.xml + - cp ../data/com.usebottles.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/com.usebottles.bottles.gschema.xml - glib-compile-schemas appdir/usr/share/glib-2.0/schemas/ # - desktop file - echo "Copying Desktop file" - - cp data/pm.mirko.bottles.desktop appdir/usr/share/applications/ + - cp data/com.usebottles.bottles.desktop appdir/usr/share/applications/ # - apprun - echo "Copying AppRun file" - cp -a ../AppRun appdir/AppRun diff --git a/AppRun b/AppRun index 19bdebcc389..c65911a1afd 100755 --- a/AppRun +++ b/AppRun @@ -3,10 +3,10 @@ export APPDIR="$(dirname "$(readlink -f "$0")")" export PATH="$APPDIR/usr/bin/:$PATH" export LD_LIBRARY_PATH="$APPDIR/usr/lib:$PATH" export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS" -export DESKTOP_FILE_PATH=$APPDIR/usr/share/applications/pm.mirko.bottles.desktop -export ICON_FILE_PATH=$APPDIR/usr/share/icons/hicolor/scalable/apps/pm.mirko.bottles.svg +export DESKTOP_FILE_PATH=$APPDIR/usr/share/applications/com.usebottles.bottles.desktop +export ICON_FILE_PATH=$APPDIR/usr/share/icons/hicolor/scalable/apps/com.usebottles.bottles.svg export INSTALLED_DESKTOP_FILE_PATH=~/.local/share/applications/bottles.desktop -export INSTALLED_ICON_FILE_PATH=~/.local/share/icons/hicolor/scalable/apps/pm.mirko.bottles.svg +export INSTALLED_ICON_FILE_PATH=~/.local/share/icons/hicolor/scalable/apps/com.usebottles.bottles.svg INSTALL_DESKTOP_FILE=false if ! test -f $INSTALLED_ICON_FILE_PATH; then diff --git a/README.md b/README.md index 21175ac49f2..14854412217 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- +

Bottles v2

Easily manage wineprefix using environments

⚠️ This version is under development. Here you can find the stable v1. diff --git a/appimage-build.sh b/appimage-build.sh index 3affec13b9e..7d3ae75bc2f 100755 --- a/appimage-build.sh +++ b/appimage-build.sh @@ -40,17 +40,17 @@ rm appdir/usr/local/share/bottles/bottles/bottles.in rm appdir/usr/local/share/bottles/bottles/meson.build echo "Copying appdata" -#cp -a ../data/pm.mirko.bottles.appdata.xml.in appdir/usr/share/metainfo/pm.mirko.bottles.appdata.xml +#cp -a ../data/com.usebottles.bottles.appdata.xml.in appdir/usr/share/metainfo/com.usebottles.bottles.appdata.xml echo "Copying icons" cp -a ../data/icons appdir/usr/share echo "Copying and compiling gschema" -cp ../data/pm.mirko.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/pm.mirko.bottles.gschema.xml +cp ../data/com.usebottles.bottles.gschema.xml appdir/usr/share/glib-2.0/schemas/com.usebottles.bottles.gschema.xml glib-compile-schemas appdir/usr/share/glib-2.0/schemas/ echo "Copying Desktop file" -cp data/pm.mirko.bottles.desktop appdir/usr/share/applications/ +cp data/com.usebottles.bottles.desktop appdir/usr/share/applications/ echo "Copying AppRun file" cp -a ../AppRun appdir/AppRun @@ -62,5 +62,5 @@ wget -c -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/contin chmod a+x linuxdeploy-x86_64.AppImage echo "Building Bottles Appimage" -#./linuxdeploy-x86_64.AppImage --appdir appdir --icon-file=../data/icons/hicolor/scalable/apps/pm.mirko.bottles.svg --output appimage +#./linuxdeploy-x86_64.AppImage --appdir appdir --icon-file=../data/icons/hicolor/scalable/apps/com.usebottles.bottles.svg --output appimage ./linuxdeploy-x86_64.AppImage --appdir appdir --output appimage diff --git a/data/pm.mirko.bottles.appdata.xml.in b/data/com.usebottles.bottles.appdata.xml.in similarity index 98% rename from data/pm.mirko.bottles.appdata.xml.in rename to data/com.usebottles.bottles.appdata.xml.in index 1f56e7c50ce..4a233c36830 100644 --- a/data/pm.mirko.bottles.appdata.xml.in +++ b/data/com.usebottles.bottles.appdata.xml.in @@ -1,6 +1,6 @@ - pm.mirko.bottles.desktop + com.usebottles.bottles.desktop CC0-1.0 GPL-3.0-or-later Bottles diff --git a/data/pm.mirko.bottles.desktop.in b/data/com.usebottles.bottles.desktop.in similarity index 89% rename from data/pm.mirko.bottles.desktop.in rename to data/com.usebottles.bottles.desktop.in index 3fe02b8d29c..6042071ca13 100644 --- a/data/pm.mirko.bottles.desktop.in +++ b/data/com.usebottles.bottles.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Name=Bottles Comment=Easily manage wineprefix -Icon=pm.mirko.bottles +Icon=com.usebottles.bottles Exec=bottles Terminal=false Type=Application diff --git a/data/pm.mirko.bottles.gschema.xml b/data/com.usebottles.bottles.gschema.xml similarity index 92% rename from data/pm.mirko.bottles.gschema.xml rename to data/com.usebottles.bottles.gschema.xml index b03ab8af949..094ddc0d975 100644 --- a/data/pm.mirko.bottles.gschema.xml +++ b/data/com.usebottles.bottles.gschema.xml @@ -1,6 +1,6 @@ - + true Dark theme diff --git a/data/icons/hicolor/48/apps/pm.mirko.bottles.svg b/data/icons/hicolor/48/apps/com.usebottles.bottles.svg similarity index 100% rename from data/icons/hicolor/48/apps/pm.mirko.bottles.svg rename to data/icons/hicolor/48/apps/com.usebottles.bottles.svg diff --git a/data/icons/hicolor/scalable/apps/pm.mirko.bottles.svg b/data/icons/hicolor/scalable/apps/com.usebottles.bottles.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/pm.mirko.bottles.svg rename to data/icons/hicolor/scalable/apps/com.usebottles.bottles.svg diff --git a/data/icons/symbolic/scalable/apps/pm.mirko.bottles.svg b/data/icons/symbolic/scalable/apps/com.usebottles.bottles.svg similarity index 100% rename from data/icons/symbolic/scalable/apps/pm.mirko.bottles.svg rename to data/icons/symbolic/scalable/apps/com.usebottles.bottles.svg diff --git a/data/meson.build b/data/meson.build index 00cc66671eb..22b1390e71d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,6 +1,6 @@ desktop_file = i18n.merge_file( - input: 'pm.mirko.bottles.desktop.in', - output: 'pm.mirko.bottles.desktop', + input: 'com.usebottles.bottles.desktop.in', + output: 'com.usebottles.bottles.desktop', type: 'desktop', po_dir: '../po', install: true, @@ -15,8 +15,8 @@ if desktop_utils.found() endif appstream_file = i18n.merge_file( - input: 'pm.mirko.bottles.appdata.xml.in', - output: 'pm.mirko.bottles.appdata.xml', + input: 'com.usebottles.bottles.appdata.xml.in', + output: 'com.usebottles.bottles.appdata.xml', po_dir: '../po', install: true, install_dir: join_paths(get_option('datadir'), 'appdata') @@ -29,7 +29,7 @@ if appstream_util.found() ) endif -install_data('pm.mirko.bottles.gschema.xml', +install_data('com.usebottles.bottles.gschema.xml', install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) @@ -41,6 +41,6 @@ if compile_schemas.found() endif install_data( - join_paths('icons/hicolor/scalable/apps/pm.mirko.bottles.svg'), + join_paths('icons/hicolor/scalable/apps/com.usebottles.bottles.svg'), install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'icons/hicolor/scalable/apps') ) diff --git a/po/POTFILES b/po/POTFILES index ae2add1155f..7dd9c66527b 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,6 +1,6 @@ -data/pm.mirko.bottles.desktop.in -data/pm.mirko.bottles.appdata.xml.in -data/pm.mirko.bottles.gschema.xml +data/com.usebottles.bottles.desktop.in +data/com.usebottles.bottles.appdata.xml.in +data/com.usebottles.bottles.gschema.xml src/ui/add.ui src/ui/add-details.ui src/ui/details.ui diff --git a/po/bottles.pot b/po/bottles.pot index e63e5eea423..8e79763d9d9 100644 --- a/po/bottles.pot +++ b/po/bottles.pot @@ -17,56 +17,56 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: data/pm.mirko.bottles.desktop.in:3 data/pm.mirko.bottles.appdata.xml.in:6 +#: data/com.usebottles.bottles.desktop.in:3 data/com.usebottles.bottles.appdata.xml.in:6 #: src/ui/window.ui:271 msgid "Bottles" msgstr "" -#: data/pm.mirko.bottles.desktop.in:4 +#: data/com.usebottles.bottles.desktop.in:4 msgid "Easily manage wineprefix" msgstr "" -#: data/pm.mirko.bottles.appdata.xml.in:7 +#: data/com.usebottles.bottles.appdata.xml.in:7 msgid "Easily manage your Wine bottles" msgstr "" -#: data/pm.mirko.bottles.appdata.xml.in:8 +#: data/com.usebottles.bottles.appdata.xml.in:8 msgid "Mirko Brombin" msgstr "" -#: data/pm.mirko.bottles.appdata.xml.in:10 +#: data/com.usebottles.bottles.appdata.xml.in:10 msgid "Easily manage your Wine bottles (wineprefix)" msgstr "" -#: data/pm.mirko.bottles.gschema.xml:6 src/ui/window.ui:103 +#: data/com.usebottles.bottles.gschema.xml:6 src/ui/window.ui:103 msgid "Dark theme" msgstr "" -#: data/pm.mirko.bottles.gschema.xml:7 +#: data/com.usebottles.bottles.gschema.xml:7 msgid "Enable the dark theme." msgstr "" -#: data/pm.mirko.bottles.gschema.xml:11 +#: data/com.usebottles.bottles.gschema.xml:11 msgid "Notifications" msgstr "" -#: data/pm.mirko.bottles.gschema.xml:12 +#: data/com.usebottles.bottles.gschema.xml:12 msgid "Enable notifications." msgstr "" -#: data/pm.mirko.bottles.gschema.xml:16 +#: data/com.usebottles.bottles.gschema.xml:16 msgid "Temp cleaning" msgstr "" -#: data/pm.mirko.bottles.gschema.xml:17 +#: data/com.usebottles.bottles.gschema.xml:17 msgid "Clean Temp path on boot." msgstr "" -#: data/pm.mirko.bottles.gschema.xml:21 +#: data/com.usebottles.bottles.gschema.xml:21 msgid "Startup view" msgstr "" -#: data/pm.mirko.bottles.gschema.xml:22 +#: data/com.usebottles.bottles.gschema.xml:22 msgid "Choose which view should be loaded on application startup." msgstr "" diff --git a/po/it.po b/po/it.po index 6b393629462..fefb87b4813 100644 --- a/po/it.po +++ b/po/it.po @@ -16,56 +16,56 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: data/pm.mirko.bottles.desktop.in:3 data/pm.mirko.bottles.appdata.xml.in:6 +#: data/com.usebottles.bottles.desktop.in:3 data/com.usebottles.bottles.appdata.xml.in:6 #: src/ui/window.ui:271 msgid "Bottles" msgstr "Bottles" -#: data/pm.mirko.bottles.desktop.in:4 +#: data/com.usebottles.bottles.desktop.in:4 msgid "Easily manage wineprefix" msgstr "Gestisci con facilità i prefissi wine" -#: data/pm.mirko.bottles.appdata.xml.in:7 +#: data/com.usebottles.bottles.appdata.xml.in:7 msgid "Easily manage your Wine bottles" msgstr "Gestisci con facilità le bottiglie Wine" -#: data/pm.mirko.bottles.appdata.xml.in:8 +#: data/com.usebottles.bottles.appdata.xml.in:8 msgid "Mirko Brombin" msgstr "Mirko Brombin" -#: data/pm.mirko.bottles.appdata.xml.in:10 +#: data/com.usebottles.bottles.appdata.xml.in:10 msgid "Easily manage your Wine bottles (wineprefix)" msgstr "Gestisci con facilità le bottiglie Wine (prefissi wine)" -#: data/pm.mirko.bottles.gschema.xml:6 src/ui/window.ui:103 +#: data/com.usebottles.bottles.gschema.xml:6 src/ui/window.ui:103 msgid "Dark theme" msgstr "Tema scuro" -#: data/pm.mirko.bottles.gschema.xml:7 +#: data/com.usebottles.bottles.gschema.xml:7 msgid "Enable the dark theme." msgstr "Abilita tema scuro" -#: data/pm.mirko.bottles.gschema.xml:11 +#: data/com.usebottles.bottles.gschema.xml:11 msgid "Notifications" msgstr "Notifiche" -#: data/pm.mirko.bottles.gschema.xml:12 +#: data/com.usebottles.bottles.gschema.xml:12 msgid "Enable notifications." msgstr "Abilita notifiche." -#: data/pm.mirko.bottles.gschema.xml:16 +#: data/com.usebottles.bottles.gschema.xml:16 msgid "Temp cleaning" msgstr "Pulizia file temporanei" -#: data/pm.mirko.bottles.gschema.xml:17 +#: data/com.usebottles.bottles.gschema.xml:17 msgid "Clean Temp path on boot." msgstr "Pulisci i file temporanei all'avvio." -#: data/pm.mirko.bottles.gschema.xml:21 +#: data/com.usebottles.bottles.gschema.xml:21 msgid "Startup view" msgstr "Schermata di avvio" -#: data/pm.mirko.bottles.gschema.xml:22 +#: data/com.usebottles.bottles.gschema.xml:22 msgid "Choose which view should be loaded on application startup." msgstr "Scegli la schermata da mostrare all'avvio." diff --git a/src/download.py b/src/download.py index ed637564679..e1da9a3ef43 100644 --- a/src/download.py +++ b/src/download.py @@ -19,7 +19,7 @@ import time -@Gtk.Template(resource_path='/pm/mirko/bottles/download-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/download-entry.ui') class BottlesDownloadEntry(Gtk.Box): __gtype_name__ = 'BottlesDownloadEntry' diff --git a/src/main.py b/src/main.py index 732df6d7d2a..aa8896deb6c 100644 --- a/src/main.py +++ b/src/main.py @@ -28,7 +28,7 @@ class Application(Gtk.Application): def __init__(self): - super().__init__(application_id='pm.mirko.bottles', + super().__init__(application_id='com.usebottles.bottles', flags=Gio.ApplicationFlags.FLAGS_NONE) self.props.flags = Gio.ApplicationFlags.HANDLES_OPEN @@ -43,7 +43,7 @@ def do_activate(self): ''' Load custom css ''' - bytes = Gio.resources_lookup_data("/pm/mirko/bottles/style.css", 0) + bytes = Gio.resources_lookup_data("/com/usebottles/bottles/style.css", 0) provider = Gtk.CssProvider() provider.load_from_data(bytes.get_data()) Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), diff --git a/src/pages/add.py b/src/pages/add.py index 7150b06c56c..ecd812bf8ed 100644 --- a/src/pages/add.py +++ b/src/pages/add.py @@ -24,7 +24,7 @@ ''' logging.basicConfig(level=logging.DEBUG) -@Gtk.Template(resource_path='/pm/mirko/bottles/add-details.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/add-details.ui') class BottlesAddDetails(Gtk.Box): __gtype_name__ = 'BottlesAddDetails' @@ -123,7 +123,7 @@ def create_bottle(self, widget): def toggle_entry_path(self, widget): self.entry_path.set_sensitive(widget.get_active()) -@Gtk.Template(resource_path='/pm/mirko/bottles/add.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/add.ui') class BottlesAdd(Gtk.Box): __gtype_name__ = 'BottlesAdd' diff --git a/src/pages/create.py b/src/pages/create.py index c3eec59a936..0541d5b5e40 100644 --- a/src/pages/create.py +++ b/src/pages/create.py @@ -19,7 +19,7 @@ import time -@Gtk.Template(resource_path='/pm/mirko/bottles/create.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/create.ui') class BottlesCreate(Gtk.Box): __gtype_name__ = 'BottlesCreate' diff --git a/src/pages/details.py b/src/pages/details.py index 68673fa30fa..4728cd5dff8 100644 --- a/src/pages/details.py +++ b/src/pages/details.py @@ -19,7 +19,7 @@ import webbrowser -@Gtk.Template(resource_path='/pm/mirko/bottles/program-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/program-entry.ui') class BottlesProgramEntry(Gtk.Box): __gtype_name__ = 'BottlesProgramEntry' @@ -62,7 +62,7 @@ def run_executable(self, widget): self.program_executable) -@Gtk.Template(resource_path='/pm/mirko/bottles/dependency-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/dependency-entry.ui') class BottlesDependencyEntry(Gtk.Box): __gtype_name__ = 'BottlesDependencyEntry' @@ -133,7 +133,7 @@ def remove_dependency(self, widget): self) -@Gtk.Template(resource_path='/pm/mirko/bottles/details.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/details.ui') class BottlesDetails(Gtk.Box): __gtype_name__ = 'BottlesDetails' diff --git a/src/pages/dialog.py b/src/pages/dialog.py index f80d4f5cd02..5252dbd8ee3 100644 --- a/src/pages/dialog.py +++ b/src/pages/dialog.py @@ -56,7 +56,7 @@ def __init__(self, content.add(box) self.show_all() -@Gtk.Template(resource_path='/pm/mirko/bottles/about.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/about.ui') class BottlesAboutDialog(Gtk.AboutDialog): __gtype_name__ = 'BottlesAboutDialog' diff --git a/src/pages/list.py b/src/pages/list.py index 19d19f03e58..35423482989 100644 --- a/src/pages/list.py +++ b/src/pages/list.py @@ -26,7 +26,7 @@ from .dialog import BottlesDialog -@Gtk.Template(resource_path='/pm/mirko/bottles/list-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/list-entry.ui') class BottlesListEntry(Gtk.Box): __gtype_name__ = 'BottlesListEntry' @@ -221,7 +221,7 @@ def confirm_delete(self, widget): dialog_delete.destroy() -@Gtk.Template(resource_path='/pm/mirko/bottles/list.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/list.ui') class BottlesList(Gtk.ScrolledWindow): __gtype_name__ = 'BottlesList' diff --git a/src/pages/preferences.py b/src/pages/preferences.py index 1b913087009..c56c47aef06 100644 --- a/src/pages/preferences.py +++ b/src/pages/preferences.py @@ -19,7 +19,7 @@ from .dialog import BottlesDialog -@Gtk.Template(resource_path='/pm/mirko/bottles/runner-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/runner-entry.ui') class BottlesRunnerEntry(Gtk.Box): __gtype_name__ = 'BottlesRunnerEntry' @@ -82,7 +82,7 @@ def run_browse(self, widget): self.runner.open_filemanager(path_type="runner", runner=self.runner_name) -@Gtk.Template(resource_path='/pm/mirko/bottles/dxvk-entry.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/dxvk-entry.ui') class BottlesDxvkEntry(Gtk.Box): __gtype_name__ = 'BottlesDxvkEntry' @@ -139,7 +139,7 @@ def run_browse(self, widget): dxvk=self.dxvk_name) -@Gtk.Template(resource_path='/pm/mirko/bottles/preferences.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/preferences.ui') class BottlesPreferences(Gtk.Box): __gtype_name__ = 'BottlesPreferences' diff --git a/src/params.py b/src/params.py index c5160480891..8c952934c10 100644 --- a/src/params.py +++ b/src/params.py @@ -2,7 +2,7 @@ General application details ''' APP_NAME = "Bottles" -APP_ID = "pm.mirko.bottles" +APP_ID = "com.usebottles.bottles" ''' These parameters cannot be changed from the user settings. diff --git a/src/ui/about.ui b/src/ui/about.ui index a71dc6781dc..81174fcbc77 100644 --- a/src/ui/about.ui +++ b/src/ui/about.ui @@ -15,7 +15,7 @@ Mirko Brombin send@mirko.pm Francesco Masala mail@francescomasala.me Filipe de Almeida Garrett @filipegarrett - pm.mirko.bottles + com.usebottles.bottles gpl-3-0-only diff --git a/src/ui/bottles.gresource.xml b/src/ui/bottles.gresource.xml index 67f69eddb19..3b8a53c9548 100644 --- a/src/ui/bottles.gresource.xml +++ b/src/ui/bottles.gresource.xml @@ -1,6 +1,6 @@ - + style.css window.ui add.ui diff --git a/src/window.py b/src/window.py index ad019c772fc..c378745fff8 100644 --- a/src/window.py +++ b/src/window.py @@ -37,7 +37,7 @@ ''' logging.basicConfig(level=logging.DEBUG) -@Gtk.Template(resource_path='/pm/mirko/bottles/window.ui') +@Gtk.Template(resource_path='/com/usebottles/bottles/window.ui') class BottlesWindow(Gtk.ApplicationWindow): __gtype_name__ = 'BottlesWindow'