From 4b75ba10fba0f479763a64298f1443e53c8dec54 Mon Sep 17 00:00:00 2001 From: heliguy4599 Date: Mon, 25 Sep 2023 01:42:59 -0400 Subject: [PATCH] Undo previous coimmit that broke everything --- .github/workflows/flatpak-builder.yml | 4 ++-- README.md | 6 +++--- ...rehouse.svg => io.github.heliguy4599.Warehouse.svg} | 0 ...vg => io.github.heliguy4599.Warehouse-symbolic.svg} | 0 data/icons/meson.build | 2 +- ...p.in => io.github.heliguy4599.Warehouse.desktop.in} | 2 +- ...xml => io.github.heliguy4599.Warehouse.gschema.xml} | 2 +- ...=> io.github.heliguy4599.Warehouse.metainfo.xml.in} | 4 ++-- data/meson.build | 10 +++++----- ...ehouse.json => io.github.heliguy4599.Warehouse.json | 2 +- po/POTFILES | 6 +++--- po/de.po | 4 ++-- po/es.po | 4 ++-- po/flattool-gui.pot | 4 ++-- po/nb.po | 4 ++-- po/nn.po | 4 ++-- po/pl.po | 4 ++-- src/filter_window.py | 2 +- src/main.py | 4 ++-- src/orphans_window.py | 2 +- src/warehouse.gresource.xml | 6 +++--- src/window.py | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) rename data/icons/hicolor/scalable/apps/{org.neocities.heliguy.Warehouse.svg => io.github.heliguy4599.Warehouse.svg} (100%) rename data/icons/hicolor/symbolic/apps/{org.neocities.heliguy.Warehouse-symbolic.svg => io.github.heliguy4599.Warehouse-symbolic.svg} (100%) rename data/{org.neocities.heliguy.Warehouse.desktop.in => io.github.heliguy4599.Warehouse.desktop.in} (77%) rename data/{org.neocities.heliguy.Warehouse.gschema.xml => io.github.heliguy4599.Warehouse.gschema.xml} (54%) rename data/{org.neocities.heliguy.Warehouse.metainfo.xml.in => io.github.heliguy4599.Warehouse.metainfo.xml.in} (96%) rename org.neocities.heliguy.Warehouse.json => io.github.heliguy4599.Warehouse.json (96%) diff --git a/.github/workflows/flatpak-builder.yml b/.github/workflows/flatpak-builder.yml index 3c61586..a496f82 100644 --- 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/flatpak-builder@v6.1 with: - bundle: org.neocities.heliguy.Warehouse.flatpak - manifest-path: org.neocities.heliguy.Warehouse.json \ No newline at end of file + bundle: io.github.heliguy4599.Warehouse.flatpak + manifest-path: io.github.heliguy4599.Warehouse.json \ No newline at end of file diff --git a/README.md b/README.md index 3a46493..7beefc6 100644 --- 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/data/icons/hicolor/scalable/apps/org.neocities.heliguy.Warehouse.svg b/data/icons/hicolor/scalable/apps/io.github.heliguy4599.Warehouse.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/org.neocities.heliguy.Warehouse.svg rename to data/icons/hicolor/scalable/apps/io.github.heliguy4599.Warehouse.svg diff --git a/data/icons/hicolor/symbolic/apps/org.neocities.heliguy.Warehouse-symbolic.svg b/data/icons/hicolor/symbolic/apps/io.github.heliguy4599.Warehouse-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/org.neocities.heliguy.Warehouse-symbolic.svg rename to data/icons/hicolor/symbolic/apps/io.github.heliguy4599.Warehouse-symbolic.svg diff --git a/data/icons/meson.build b/data/icons/meson.build index bfee42e..3b1474a 100644 --- 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/data/org.neocities.heliguy.Warehouse.desktop.in b/data/io.github.heliguy4599.Warehouse.desktop.in similarity index 77% rename from data/org.neocities.heliguy.Warehouse.desktop.in rename to data/io.github.heliguy4599.Warehouse.desktop.in index 17386fd..442dbf4 100644 --- a/data/org.neocities.heliguy.Warehouse.desktop.in +++ b/data/io.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/data/org.neocities.heliguy.Warehouse.gschema.xml b/data/io.github.heliguy4599.Warehouse.gschema.xml similarity index 54% rename from data/org.neocities.heliguy.Warehouse.gschema.xml rename to data/io.github.heliguy4599.Warehouse.gschema.xml index 98339d8..8e8b15b 100644 --- a/data/org.neocities.heliguy.Warehouse.gschema.xml +++ b/data/io.github.heliguy4599.Warehouse.gschema.xml @@ -1,5 +1,5 @@ - + diff --git a/data/org.neocities.heliguy.Warehouse.metainfo.xml.in b/data/io.github.heliguy4599.Warehouse.metainfo.xml.in similarity index 96% rename from data/org.neocities.heliguy.Warehouse.metainfo.xml.in rename to data/io.github.heliguy4599.Warehouse.metainfo.xml.in index 35593e2..33c6cd9 100644 --- a/data/org.neocities.heliguy.Warehouse.metainfo.xml.in +++ b/data/io.github.heliguy4599.Warehouse.metainfo.xml.in @@ -1,7 +1,7 @@ - org.neocities.heliguy.Warehouse.desktop - org.neocities.heliguy.Warehouse.desktop + io.github.heliguy4599.Warehouse.desktop + io.github.heliguy4599.Warehouse.desktop Warehouse Heliguy CC0-1.0 diff --git a/data/meson.build b/data/meson.build index 0b59587..8a5bef4 100644 --- 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 b/io.github.heliguy4599.Warehouse.json similarity index 96% rename from org.neocities.heliguy.Warehouse.json rename to io.github.heliguy4599.Warehouse.json index 552cf16..1a04d1c 100644 --- a/org.neocities.heliguy.Warehouse.json +++ b/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 index 6282488..da4c70c 100644 --- 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 index 5f3a831..03337d0 100644 --- 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 index 977aa66..fc5e0ee 100644 --- 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 index 63f70e6..804f750 100644 --- 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 index 622bba2..c3a622d 100644 --- 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 index 82b8489..db50a8b 100644 --- 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 index b5f02bd..8a8693e 100644 --- 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 index b5b51b3..93c69a2 100644 --- a/src/filter_window.py +++ b/src/filter_window.py @@ -4,7 +4,7 @@ import subprocess 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 index aa3422b..f1a8e6b 100644 --- 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(), ["q"]) @@ -90,7 +90,7 @@ class WarehouseApplication(Adw.Application): 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 index a581049..dce1f64 100644 --- a/src/orphans_window.py +++ b/src/orphans_window.py @@ -4,7 +4,7 @@ import subprocess 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 index 258bb0a..a627ab1 100644 --- a/src/warehouse.gresource.xml +++ b/src/warehouse.gresource.xml @@ -1,13 +1,13 @@ - + window.ui orphans.ui filter.ui gtk/help-overlay.ui - + - + selection-mode-symbolic.svg error-symbolic.svg brush-symbolic.svg diff --git a/src/window.py b/src/window.py index 1d5795e..9fda03a 100644 --- a/src/window.py +++ b/src/window.py @@ -25,7 +25,7 @@ from .properties_window import show_properties_window 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"