[swell-foop] Use reverse domain naming schema for appdata, icon and desktop (#10)



commit 01f455273ee893af3ffa7adbbc1b3f9d055c2eee
Author: Robert Roth <robert roth off gmail com>
Date:   Mon Oct 8 19:52:38 2018 +0300

    Use reverse domain naming schema for appdata, icon and desktop (#10)

 .../16x16/apps/{swell-foop.png => org.gnome.SwellFoop.png}  | Bin
 .../22x22/apps/{swell-foop.png => org.gnome.SwellFoop.png}  | Bin
 .../24x24/apps/{swell-foop.png => org.gnome.SwellFoop.png}  | Bin
 .../apps/{swell-foop.png => org.gnome.SwellFoop.png}        | Bin
 .../32x32/apps/{swell-foop.png => org.gnome.SwellFoop.png}  | Bin
 .../48x48/apps/{swell-foop.png => org.gnome.SwellFoop.png}  | Bin
 .../apps/{swell-foop.png => org.gnome.SwellFoop.png}        | Bin
 ...l-foop-symbolic.svg => org.gnome.SwellFoop-symbolic.svg} |   0
 data/meson.build                                            |   4 ++--
 ...op.appdata.xml.in => org.gnome.SwellFoop.appdata.xml.in} |   2 +-
 ...swell-foop.desktop.in => org.gnome.SwellFoop.desktop.in} |   2 +-
 org.gnome.SwellFoop.json                                    |   3 ---
 src/swell-foop.vala                                         |   6 +++---
 13 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/apps/swell-foop.png 
b/data/icons/hicolor/16x16/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/16x16/apps/swell-foop.png
rename to data/icons/hicolor/16x16/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/22x22/apps/swell-foop.png 
b/data/icons/hicolor/22x22/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/22x22/apps/swell-foop.png
rename to data/icons/hicolor/22x22/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/24x24/apps/swell-foop.png 
b/data/icons/hicolor/24x24/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/24x24/apps/swell-foop.png
rename to data/icons/hicolor/24x24/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/256x256/apps/swell-foop.png 
b/data/icons/hicolor/256x256/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/256x256/apps/swell-foop.png
rename to data/icons/hicolor/256x256/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/32x32/apps/swell-foop.png 
b/data/icons/hicolor/32x32/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/32x32/apps/swell-foop.png
rename to data/icons/hicolor/32x32/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/48x48/apps/swell-foop.png 
b/data/icons/hicolor/48x48/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/48x48/apps/swell-foop.png
rename to data/icons/hicolor/48x48/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/512x512/apps/swell-foop.png 
b/data/icons/hicolor/512x512/apps/org.gnome.SwellFoop.png
similarity index 100%
rename from data/icons/hicolor/512x512/apps/swell-foop.png
rename to data/icons/hicolor/512x512/apps/org.gnome.SwellFoop.png
diff --git a/data/icons/hicolor/symbolic/apps/swell-foop-symbolic.svg 
b/data/icons/hicolor/symbolic/apps/org.gnome.SwellFoop-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/symbolic/apps/swell-foop-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/org.gnome.SwellFoop-symbolic.svg
diff --git a/data/meson.build b/data/meson.build
index faa2f31..55fd1a0 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,7 +18,7 @@ install_data('swell-foop.css',
   install_dir: pkgdatadir,
 )
 
-desktop = 'swell-foop.desktop'
+desktop = 'org.gnome.SwellFoop.desktop'
 
 # Desktop file
 i18n.merge_file(
@@ -30,7 +30,7 @@ i18n.merge_file(
   install_dir: join_paths(datadir, 'applications'),
 )
 
-appdata = 'swell-foop.appdata.xml'
+appdata = 'org.gnome.SwellFoop.appdata.xml'
 
 # Appdata
 i18n.merge_file(
diff --git a/data/swell-foop.appdata.xml.in b/data/org.gnome.SwellFoop.appdata.xml.in
similarity index 98%
rename from data/swell-foop.appdata.xml.in
rename to data/org.gnome.SwellFoop.appdata.xml.in
index a531ebf..a729ef6 100644
--- a/data/swell-foop.appdata.xml.in
+++ b/data/org.gnome.SwellFoop.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
 <component type="desktop">
-  <id>swell-foop.desktop</id>
+  <id>org.gnome.SwellFoop.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Swell Foop</name>
diff --git a/data/swell-foop.desktop.in b/data/org.gnome.SwellFoop.desktop.in
similarity index 95%
rename from data/swell-foop.desktop.in
rename to data/org.gnome.SwellFoop.desktop.in
index 05f544c..78fb6c0 100644
--- a/data/swell-foop.desktop.in
+++ b/data/org.gnome.SwellFoop.desktop.in
@@ -4,7 +4,7 @@ Comment=Clear the screen by removing groups of colored and shaped tiles
 # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 Keywords=game;logic;board;same;matching;
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=swell-foop
+Icon=org.gnome.SwellFoop
 Exec=swell-foop
 Terminal=false
 Type=Application
diff --git a/org.gnome.SwellFoop.json b/org.gnome.SwellFoop.json
index c22ed27..faf505a 100644
--- a/org.gnome.SwellFoop.json
+++ b/org.gnome.SwellFoop.json
@@ -4,9 +4,6 @@
     "runtime-version" : "3.30",
     "sdk" : "org.gnome.Sdk",
     "command" : "swell-foop",
-    "rename-icon" : "swell-foop",
-    "rename-desktop-file" : "swell-foop.desktop",
-    "rename-appdata-file" : "swell-foop.appdata.xml",
     "tags" : [
         "nightly"
     ],
diff --git a/src/swell-foop.vala b/src/swell-foop.vala
index 91e4fb2..a565b51 100644
--- a/src/swell-foop.vala
+++ b/src/swell-foop.vala
@@ -75,7 +75,7 @@ public class SwellFoop : Gtk.Application
         var stack = new Gtk.Stack ();
         var first_vbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 12);
         load_css ();
-        var logo = new Gtk.Image.from_icon_name ("swell-foop", Gtk.IconSize.DIALOG);
+        var logo = new Gtk.Image.from_icon_name ("org.gnome.SwellFoop", Gtk.IconSize.DIALOG);
         logo.set_pixel_size (96);
         first_vbox.pack_start (logo, false);
         var label = new Gtk.Label (_("Welcome to Swell Foop"));
@@ -126,7 +126,7 @@ public class SwellFoop : Gtk.Application
         /* Create the main window */
         window = new Gtk.ApplicationWindow (this);
         window.set_title (_("Swell Foop"));
-        window.icon_name = "swell-foop";
+        window.icon_name = "org.gnome.SwellFoop";
         window.resizable = false;
         window.set_events (window.get_events () | Gdk.EventMask.KEY_PRESS_MASK | 
Gdk.EventMask.KEY_RELEASE_MASK);
 
@@ -467,7 +467,7 @@ public class SwellFoop : Gtk.Application
                                "artists", artists,
                                "documenters", documenters,
                                "translator-credits", _("translator-credits"),
-                               "logo-icon-name", "swell-foop",
+                               "logo-icon-name", "org.gnome.SwellFoop",
                                "website", Config.PACKAGE_URL,
                                null);
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]