GNOME.org
 

[gnome-klotski/unify-app-id] unify app-id by using org.gnome.Klotski

commit 0cb77c94a370a88eca8649bcafd51b2172bc779e
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Sat Jan 19 13:03:38 2019 +0100

    unify app-id by using org.gnome.Klotski
    
    Rename the destkop, appdata file, the icons & the schema to use org.gnome.Klotski
    following the newest specs
    It also updates the appdata to the latest specs
    https://freedesktop.org/software/appstream/docs/chap-Quickstart.html

 .../16x16/{gnome-klotski.png => org.gnome.Klotski.png}  | Bin
 .../22x22/{gnome-klotski.png => org.gnome.Klotski.png}  | Bin
 .../24x24/{gnome-klotski.png => org.gnome.Klotski.png}  | Bin
 .../32x32/{gnome-klotski.png => org.gnome.Klotski.png}  | Bin
 .../48x48/{gnome-klotski.png => org.gnome.Klotski.png}  | Bin
 ...tski-symbolic.svg => org.gnome.Klotski-symbolic.svg} |   0
 .../{gnome-klotski.svg => org.gnome.Klotski.svg}        |   0
 data/meson.build                                        |  16 ++++++++--------
 ....appdata.xml.in => org.gnome.Klotski.appdata.xml.in} |  11 +++++++----
 ...-klotski.desktop.in => org.gnome.Klotski.desktop.in} |   2 +-
 data/org.gnome.klotski.gschema.xml                      |   2 +-
 meson.build                                             |   2 +-
 src/gnome-klotski.vala                                  |   6 +++---
 src/klotski-window.vala                                 |   6 +++---
 src/klotski.gresource.xml                               |   2 +-
 src/puzzle-view.vala                                    |   2 +-
 16 files changed, 26 insertions(+), 23 deletions(-)
---
diff --git a/data/icons/hicolor/16x16/gnome-klotski.png b/data/icons/hicolor/16x16/org.gnome.Klotski.png
similarity index 100%
rename from data/icons/hicolor/16x16/gnome-klotski.png
rename to data/icons/hicolor/16x16/org.gnome.Klotski.png
diff --git a/data/icons/hicolor/22x22/gnome-klotski.png b/data/icons/hicolor/22x22/org.gnome.Klotski.png
similarity index 100%
rename from data/icons/hicolor/22x22/gnome-klotski.png
rename to data/icons/hicolor/22x22/org.gnome.Klotski.png
diff --git a/data/icons/hicolor/24x24/gnome-klotski.png b/data/icons/hicolor/24x24/org.gnome.Klotski.png
similarity index 100%
rename from data/icons/hicolor/24x24/gnome-klotski.png
rename to data/icons/hicolor/24x24/org.gnome.Klotski.png
diff --git a/data/icons/hicolor/32x32/gnome-klotski.png b/data/icons/hicolor/32x32/org.gnome.Klotski.png
similarity index 100%
rename from data/icons/hicolor/32x32/gnome-klotski.png
rename to data/icons/hicolor/32x32/org.gnome.Klotski.png
diff --git a/data/icons/hicolor/48x48/gnome-klotski.png b/data/icons/hicolor/48x48/org.gnome.Klotski.png
similarity index 100%
rename from data/icons/hicolor/48x48/gnome-klotski.png
rename to data/icons/hicolor/48x48/org.gnome.Klotski.png
diff --git a/data/icons/hicolor/scalable/gnome-klotski-symbolic.svg 
b/data/icons/hicolor/scalable/org.gnome.Klotski-symbolic.svg
similarity index 100%
rename from data/icons/hicolor/scalable/gnome-klotski-symbolic.svg
rename to data/icons/hicolor/scalable/org.gnome.Klotski-symbolic.svg
diff --git a/data/icons/hicolor/scalable/gnome-klotski.svg b/data/icons/hicolor/scalable/org.gnome.Klotski.svg
similarity index 100%
rename from data/icons/hicolor/scalable/gnome-klotski.svg
rename to data/icons/hicolor/scalable/org.gnome.Klotski.svg
diff --git a/data/meson.build b/data/meson.build
index 7a968a9..68509e0 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -2,19 +2,19 @@
 icon_sizes = ['16', '22', '24', '32', '48']
 foreach size : icon_sizes
   install_data(
-    join_paths('icons', 'hicolor', '@0@x@0@'.format(size), '@0@.png'.format(meson.project_name())),
+    join_paths('icons', 'hicolor', '@0@x@0@'.format(size), '@0@.png'.format(project_id)),
     install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', '@0@x@0@'.format(size), 'apps')
   )
 endforeach
 # Install scalable icon
 install_data(
-  join_paths('icons', 'hicolor', 'scalable', '@0@.svg'.format(meson.project_name())),
+  join_paths('icons', 'hicolor', 'scalable', '@0@.svg'.format(project_id)),
   install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'scalable', 'apps')
 )
 
 # Install symbolic icon
 install_data(
-  join_paths('icons', 'hicolor', 'scalable', '@0 -symbolic svg'.format(meson.project_name())),
+  join_paths('icons', 'hicolor', 'scalable', '@0 -symbolic svg'.format(project_id)),
   install_dir: join_paths(get_option('datadir'), 'icons', 'hicolor', 'symbolic', 'apps')
 )
 
@@ -26,8 +26,8 @@ install_data(
 
 # Desktop file
 desktop_file = i18n.merge_file(
-    input: '@0  desktop in'.format(meson.project_name()),
-    output: '@0@.desktop'.format(meson.project_name()),
+    input: '@0  desktop in'.format(project_id),
+    output: '@0@.desktop'.format(project_id),
     po_dir: join_paths(meson.source_root(), 'po'),
     type: 'desktop',
     install: true,
@@ -38,7 +38,7 @@ desktop_file = i18n.merge_file(
 desktop_file_validate = find_program('desktop-file-validate', required: false)
 if desktop_file_validate.found()
   test(
-    'validate-desktop --no-net',
+    'validate-desktop',
     desktop_file_validate,
     args: [
       desktop_file.full_path()
@@ -48,8 +48,8 @@ endif
 
 # AppData file
 appdata_file = i18n.merge_file(
-    input: '@0  appdata xml in'.format(meson.project_name()),
-    output: '@0  appdata xml'.format(meson.project_name()),
+    input: '@0  appdata xml in'.format(project_id),
+    output: '@0  appdata xml'.format(project_id),
     po_dir: join_paths(meson.source_root(), 'po'),
     install: true,
     install_dir: join_paths(get_option('datadir'), 'metainfo')
diff --git a/data/gnome-klotski.appdata.xml.in b/data/org.gnome.Klotski.appdata.xml.in
similarity index 91%
rename from data/gnome-klotski.appdata.xml.in
rename to data/org.gnome.Klotski.appdata.xml.in
index e87f35a..d381bdb 100644
--- a/data/gnome-klotski.appdata.xml.in
+++ b/data/org.gnome.Klotski.appdata.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2013 Michael Catanzaro -->
-<component type="desktop">
-  <id>gnome-klotski.desktop</id>
+<component type="desktop-application">
+  <id>org.gnome.Klotski</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>GNOME Klotski</name>
@@ -28,13 +28,16 @@
   <update_contact>mcatanzaro_at_gnome.org</update_contact>
   <project_group>GNOME</project_group>
   <kudos>
-    <kudo>AppMenu</kudo>
     <kudo>HiDpiIcon</kudo>
     <kudo>ModernToolkit</kudo>
     <kudo>UserDocs</kudo>
   </kudos>
+  <provides>
+    <id>gnome-klotski.desktop</id>
+  </provides>
+  <launchable type="desktop-id">org.gnome.Klotski</launchable>
   <translation type="gettext">gnome-klotski</translation>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-klotski</url>
+  <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-klotski/issues/</url>
   <url type="donation">http://www.gnome.org/friends/</url>
   <url type="help">https://help.gnome.org/users/gnome-klotski/stable/</url>
   <url type="translate">https://wiki.gnome.org/TranslationProject</url>
diff --git a/data/gnome-klotski.desktop.in b/data/org.gnome.Klotski.desktop.in
similarity index 95%
rename from data/gnome-klotski.desktop.in
rename to data/org.gnome.Klotski.desktop.in
index b85f9b9..7b4bd73 100644
--- a/data/gnome-klotski.desktop.in
+++ b/data/org.gnome.Klotski.desktop.in
@@ -5,7 +5,7 @@ Comment=Slide blocks to solve the puzzle
 Keywords=game;strategy;logic;move;
 Exec=gnome-klotski
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=gnome-klotski
+Icon=org.gnome.Klotski
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;LogicGame;
diff --git a/data/org.gnome.klotski.gschema.xml b/data/org.gnome.klotski.gschema.xml
index d22d099..1082b4d 100644
--- a/data/org.gnome.klotski.gschema.xml
+++ b/data/org.gnome.klotski.gschema.xml
@@ -1,5 +1,5 @@
 <schemalist>
-  <schema id="org.gnome.klotski" path="/org/gnome/klotski/" gettext-domain="gnome-klotski">
+  <schema id="org.gnome.Klotski" path="/org/gnome/Klotski/" gettext-domain="gnome-klotski">
     <key name="level" type="i">
       <default>0</default>
       <summary>The puzzle in play</summary>
diff --git a/meson.build b/meson.build
index f5f767e..ac9e84d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('gnome-klotski', 'vala', 'c',
         version: '3.31.3')
 
-project_id = 'org.gnome.klotski'
+project_id = 'org.gnome.Klotski'
 i18n = import('i18n')
 gnome = import('gnome')
 # used to run post install script
diff --git a/src/gnome-klotski.vala b/src/gnome-klotski.vala
index 413f6df..b621739 100644
--- a/src/gnome-klotski.vala
+++ b/src/gnome-klotski.vala
@@ -43,7 +43,7 @@ public class Klotski : Gtk.Application
 
     public Klotski ()
     {
-        Object (application_id: "org.gnome.klotski", flags: ApplicationFlags.FLAGS_NONE);
+        Object (application_id: "org.gnome.Klotski", flags: ApplicationFlags.FLAGS_NONE);
 
         add_main_option_entries (option_entries);
     }
@@ -64,7 +64,7 @@ public class Klotski : Gtk.Application
         base.startup ();
 
         Environment.set_application_name (_("Klotski"));
-        Window.set_default_icon_name ("gnome-klotski");
+        Window.set_default_icon_name ("org.gnome.Klotski");
 
         add_action_entries (action_entries, this);
 
@@ -120,7 +120,7 @@ public class Klotski : Gtk.Application
                            "authors", authors,
                            "documenters", documenters,
                            "translator-credits", _("translator-credits"),
-                           "logo-icon-name", "gnome-klotski",
+                           "logo-icon-name", "org.gnome.Klotski",
                            "website", "https://wiki.gnome.org/Apps/Klotski";,
                            null);
     }
diff --git a/src/klotski-window.vala b/src/klotski-window.vala
index 794281a..bdb6fdc 100644
--- a/src/klotski-window.vala
+++ b/src/klotski-window.vala
@@ -20,7 +20,7 @@ private struct LevelInfo
     string data;
 }
 
-[GtkTemplate (ui = "/org/gnome/klotski/ui/klotski.ui")]
+[GtkTemplate (ui = "/org/gnome/Klotski/ui/klotski.ui")]
 public class KlotskiWindow : ApplicationWindow
 {
     /* Settings */
@@ -506,10 +506,10 @@ public class KlotskiWindow : ApplicationWindow
     public KlotskiWindow ()
     {
         var css_provider = new CssProvider ();
-        css_provider.load_from_resource ("/org/gnome/klotski/ui/klotski.css");
+        css_provider.load_from_resource ("/org/gnome/Klotski/ui/klotski.css");
         StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, 
STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-        settings = new GLib.Settings ("org.gnome.klotski");
+        settings = new GLib.Settings ("org.gnome.Klotski");
         set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
         if (settings.get_boolean ("window-is-maximized"))
             maximize ();
diff --git a/src/klotski.gresource.xml b/src/klotski.gresource.xml
index 0ddc10a..d63c36e 100644
--- a/src/klotski.gresource.xml
+++ b/src/klotski.gresource.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/gnome/klotski/ui">
+  <gresource prefix="/org/gnome/Klotski/ui">
     <file preprocess="xml-stripblanks" alias="assets.svg">../data/assets.svg</file>
     <file preprocess="xml-stripblanks" alias="klotski.ui">../data/klotski.ui</file>
     <file alias="klotski.css">../data/klotski.css</file>
diff --git a/src/puzzle-view.vala b/src/puzzle-view.vala
index cbb4f5f..7d3dc6c 100644
--- a/src/puzzle-view.vala
+++ b/src/puzzle-view.vala
@@ -77,7 +77,7 @@ public class PuzzleView : Gtk.DrawingArea
 
     private void load_image ()
     {
-        image_file = File.new_for_uri("resource:///org/gnome/klotski/ui/assets.svg");
+        image_file = File.new_for_uri("resource:///org/gnome/Klotski/ui/assets.svg");
 
         try
         {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]