Undo previous coimmit that broke everything

flattool · Sep 25, 2023 · 4b75ba1 · 4b75ba1
1 parent 646f120
commit 4b75ba1
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/flatpak-builder.yml b/.github/workflows/flatpak-builder.yml
@@ -17,5 +17,5 @@ jobs:
     - name: Flatpak Builder
       uses: flatpak/flatpak-github-actions/[email protected]
       with:
-        bundle: org.neocities.heliguy.Warehouse.flatpak
-        manifest-path: org.neocities.heliguy.Warehouse.json
+        bundle: io.github.heliguy4599.Warehouse.flatpak
+        manifest-path: io.github.heliguy4599.Warehouse.json
diff --git a/README.md b/README.md
@@ -33,12 +33,12 @@ To use Warehouse effectively, ensure the following dependencies are installed on
 
 ## 🛠️ Installation Steps:
 1. Make sure you have the above dependencies installed.
-2. Visit the [releases](https://github.com/flattool/warehouse/releases) page and download `org.neocities.heliguy.Warehouse.flatpak`.
+2. Visit the [releases](https://github.com/flattool/warehouse/releases) page and download `io.github.heliguy4599.Warehouse.flatpak`.
 3. Install it using your software store or run the following command:
    ```shell
-   $ flatpak install /path/to/org.neocities.heliguy.Warehouse.flatpak
+   $ flatpak install /path/to/io.github.heliguy4599.Warehouse.flatpak
    ```
 You're all set! Launch the application by clicking its icon in your app menu or running:
 ```shell
-$ flatpak run org.neocities.heliguy.Warehouse
+$ flatpak run io.github.heliguy4599.Warehouse
 ```
diff --git a/.../apps/org.neocities.heliguy.Warehouse.svg → .../apps/io.github.heliguy4599.Warehouse.svg b/.../apps/org.neocities.heliguy.Warehouse.svg → .../apps/io.github.heliguy4599.Warehouse.svg
diff --git a/....neocities.heliguy.Warehouse-symbolic.svg → ...github.heliguy4599.Warehouse-symbolic.svg b/....neocities.heliguy.Warehouse-symbolic.svg → ...github.heliguy4599.Warehouse-symbolic.svg
diff --git a/data/icons/meson.build b/data/icons/meson.build
@@ -1,4 +1,4 @@
-application_id = 'org.neocities.heliguy.Warehouse'
+application_id = 'io.github.heliguy4599.Warehouse'
 
 scalable_dir = join_paths('hicolor', 'scalable', 'apps')
 install_data(

diff --git a/...rg.neocities.heliguy.Warehouse.desktop.in → ...o.github.heliguy4599.Warehouse.desktop.in b/...rg.neocities.heliguy.Warehouse.desktop.in → ...o.github.heliguy4599.Warehouse.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Warehouse
 Exec=warehouse
-Icon=org.neocities.heliguy.Warehouse
+Icon=io.github.heliguy4599.Warehouse
 Terminal=false
 Type=Application
 Categories=GTK;System;Utility;

diff --git a/...g.neocities.heliguy.Warehouse.gschema.xml → ....github.heliguy4599.Warehouse.gschema.xml b/...g.neocities.heliguy.Warehouse.gschema.xml → ....github.heliguy4599.Warehouse.gschema.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="warehouse">
-	<schema id="org.neocities.heliguy.Warehouse" path="org/neocities/heliguy/Warehouse/">
+	<schema id="io.github.heliguy4599.Warehouse" path="/io/github/heliguy4599/Warehouse/">
 	</schema>
 </schemalist>
diff --git a/...ocities.heliguy.Warehouse.metainfo.xml.in → ...hub.heliguy4599.Warehouse.metainfo.xml.in b/...ocities.heliguy.Warehouse.metainfo.xml.in → ...hub.heliguy4599.Warehouse.metainfo.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-	<id>org.neocities.heliguy.Warehouse.desktop</id>
-  <launchable type="desktop-id">org.neocities.heliguy.Warehouse.desktop</launchable>
+	<id>io.github.heliguy4599.Warehouse.desktop</id>
+  <launchable type="desktop-id">io.github.heliguy4599.Warehouse.desktop</launchable>
   <name translatable='no'>Warehouse</name>
   <developer_name translatable="no">Heliguy</developer_name>
 	<metadata_license>CC0-1.0</metadata_license>

diff --git a/data/meson.build b/data/meson.build
@@ -1,6 +1,6 @@
 desktop_file = i18n.merge_file(
-        input: 'org.neocities.heliguy.Warehouse.desktop.in',
-       output: 'org.neocities.heliguy.Warehouse.desktop',
+        input: 'io.github.heliguy4599.Warehouse.desktop.in',
+       output: 'io.github.heliguy4599.Warehouse.desktop',
          type: 'desktop',
        po_dir: '../po',
       install: true,
@@ -13,8 +13,8 @@ if desktop_utils.found()
 endif
 
 appstream_file = i18n.merge_file(
-        input: 'org.neocities.heliguy.Warehouse.metainfo.xml.in',
-       output: 'org.neocities.heliguy.Warehouse.metainfo.xml',
+        input: 'io.github.heliguy4599.Warehouse.metainfo.xml.in',
+       output: 'io.github.heliguy4599.Warehouse.metainfo.xml',
        po_dir: '../po',
       install: true,
   install_dir: join_paths(get_option('datadir'), 'metainfo')
@@ -25,7 +25,7 @@ if appstream_util.found()
   test('Validate appstream file', appstream_util, args: ['validate', appstream_file])
 endif
 
-install_data('org.neocities.heliguy.Warehouse.gschema.xml',
+install_data('io.github.heliguy4599.Warehouse.gschema.xml',
   install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas')
 )
 

diff --git a/org.neocities.heliguy.Warehouse.json → io.github.heliguy4599.Warehouse.json b/org.neocities.heliguy.Warehouse.json → io.github.heliguy4599.Warehouse.json
@@ -1,5 +1,5 @@
 {
-    "id" : "org.neocities.heliguy.Warehouse",
+    "id" : "io.github.heliguy4599.Warehouse",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "45",
     "sdk" : "org.gnome.Sdk",

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,6 +1,6 @@
-data/org.neocities.heliguy.Warehouse.desktop.in
-data/org.neocities.heliguy.Warehouse.metainfo.xml.in
-data/org.neocities.heliguy.Warehouse.gschema.xml
+data/io.github.heliguy4599.Warehouse.desktop.in
+data/io.github.heliguy4599.Warehouse.metainfo.xml.in
+data/io.github.heliguy4599.Warehouse.gschema.xml
 src/main.py
 src/window.py
 src/window.blp
diff --git a/po/de.po b/po/de.po
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr "Warehouse"
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr "Keine Beschreibung"
 

diff --git a/po/es.po b/po/es.po
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr "Warehouse"
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr ""
 

diff --git a/po/flattool-gui.pot b/po/flattool-gui.pot
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr ""
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr ""
 

diff --git a/po/nb.po b/po/nb.po
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr "Warehouse"
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr "Ingen beskrivelse"
 

diff --git a/po/nn.po b/po/nn.po
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr "Warehouse"
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr "Ingen skildring"
 

diff --git a/po/pl.po b/po/pl.po
@@ -17,11 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 3.3.1\n"
 
-#: data/org.neocities.heliguy.Warehouse.desktop.in:3
+#: data/io.github.heliguy4599.Warehouse.desktop.in:3
 msgid "Warehouse"
 msgstr "Warehouse"
 
-#: data/org.neocities.heliguy.Warehouse.metainfo.xml.in:7
+#: data/io.github.heliguy4599.Warehouse.metainfo.xml.in:7
 msgid "No description"
 msgstr "Brak opisu"
 

diff --git a/src/filter_window.py b/src/filter_window.py
@@ -4,7 +4,7 @@
 import os
 import pathlib
 
-@Gtk.Template(resource_path="org/neocities/heliguy/Warehouse/filter.ui")
+@Gtk.Template(resource_path="/io/github/heliguy4599/Warehouse/filter.ui")
 class FilterWindow(Adw.Window):
     __gtype_name__ = "FilterWindow"
 

diff --git a/src/main.py b/src/main.py
@@ -35,7 +35,7 @@ class WarehouseApplication(Adw.Application):
 
     def __init__(self):
         super().__init__(
-            application_id="org.neocities.heliguy.Warehouse",
+            application_id="io.github.heliguy4599.Warehouse",
             flags=Gio.ApplicationFlags.DEFAULT_FLAGS,
         )
         self.create_action("quit", lambda *_: self.quit(), ["<primary>q"])
@@ -90,7 +90,7 @@ def on_about_action(self, widget, _):
         about = Adw.AboutWindow(
             transient_for=self.props.active_window,
             application_name="Warehouse",
-            application_icon="org.neocities.heliguy.Warehouse",
+            application_icon="io.github.heliguy4599.Warehouse",
             developer_name="Heliguy",
             version="0.6.0",
             developers=["Heliguy https://github.com/heliguy4599", "kramo https://kramo.hu"],

diff --git a/src/orphans_window.py b/src/orphans_window.py
@@ -4,7 +4,7 @@
 import os
 import pathlib
 
-@Gtk.Template(resource_path="org/neocities/heliguy/Warehouse/orphans.ui")
+@Gtk.Template(resource_path="/io/github/heliguy4599/Warehouse/orphans.ui")
 class OrphansWindow(Adw.Window):
     __gtype_name__ = "OrphansWindow"
 

diff --git a/src/warehouse.gresource.xml b/src/warehouse.gresource.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/neocities/heliguy/Warehouse">
+  <gresource prefix="/io/github/heliguy4599/Warehouse">
     <file preprocess="xml-stripblanks">window.ui</file>
     <file preprocess="xml-stripblanks">orphans.ui</file>
     <file preprocess="xml-stripblanks">filter.ui</file>
     <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
-    <!-- <file preprocess="xml-stripblanks">../data/org.neocities.heliguy.Warehouse.metainfo.xml.in</file> -->
+    <!-- <file preprocess="xml-stripblanks">../data/io.github.heliguy4599.Warehouse.metainfo.xml.in</file> -->
   </gresource>
-  <gresource prefix="/org/neocities/heliguy/Warehouse/icons/scalable/actions/">
+  <gresource prefix="/io/github/heliguy4599/Warehouse/icons/scalable/actions/">
     <file preprocess="xml-stripblanks">selection-mode-symbolic.svg</file>
     <file preprocess="xml-stripblanks">error-symbolic.svg</file>
     <file preprocess="xml-stripblanks">brush-symbolic.svg</file>

diff --git a/src/window.py b/src/window.py
@@ -25,7 +25,7 @@
 from .filter_window import FilterWindow
 from .common import myUtils
 
-@Gtk.Template(resource_path="org/neocities/heliguy/Warehouse/window.ui")
+@Gtk.Template(resource_path="/io/github/heliguy4599/Warehouse/window.ui")
 class WarehouseWindow(Adw.ApplicationWindow):
     __gtype_name__ = "WarehouseWindow"
     main_window_title = "Warehouse"