Commit d1c7897b authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui

Reverse domain name for XDG files

Unify the app-id by using org.gnome.Tetravex for appdata,desktop & icons files
Also updates the schema & resources to use the same id

fix nitpicks
parent a9523d6b
foreach size: [ '16x16', '22x22', '24x24', '32x32', '48x48']
install_data (join_paths ('icons', 'hicolor', size, 'gnome-tetravex.png'),
install_data (join_paths ('icons', 'hicolor', size, project_id + '.png'),
install_dir: join_paths (datadir, 'icons', 'hicolor', size, 'apps'))
endforeach
install_data (join_paths ('icons', 'hicolor', 'scalable', 'gnome-tetravex.svg'),
install_data (join_paths ('icons', 'hicolor', 'scalable', project_id + '.svg'),
install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
install_data (join_paths ('icons', 'hicolor', 'scalable', 'gnome-tetravex-symbolic.svg'),
install_data (join_paths ('icons', 'hicolor', 'scalable', project_id + '-symbolic.svg'),
install_dir: join_paths (datadir, 'icons', 'hicolor', 'scalable', 'apps'))
install_data ('org.gnome.tetravex.gschema.xml',
install_data (project_id + '.gschema.xml',
install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
meson.add_install_script ('meson_compile_gschema.py')
i18n.merge_file ('desktop-file',
input: 'gnome-tetravex.desktop.in',
output: 'gnome-tetravex.desktop',
input: project_id + '.desktop.in',
output: project_id + '.desktop',
install: true,
install_dir: join_paths (datadir, 'applications'),
po_dir: '../po',
type: 'desktop')
i18n.merge_file ('appdata-file',
input: 'gnome-tetravex.appdata.xml.in',
output: 'gnome-tetravex.appdata.xml',
input: project_id + '.appdata.xml.in',
output: project_id + '.appdata.xml',
install: true,
install_dir: join_paths (datadir, 'metainfo'),
po_dir: '../po')
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013 Michael Catanzaro -->
<component type="desktop">
<id>gnome-tetravex.desktop</id>
<component type="desktop-application">
<id>org.gnome.Tetravex</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+ and CC-BY-SA-3.0</project_license>
<name>GNOME Tetravex</name>
......@@ -22,14 +22,18 @@
<image>https://people.gnome.org/~mcatanzaro/gnome-tetravex.png</image>
</screenshot>
</screenshots>
<launchable type="desktop-id">org.gnome.Tetravex.desktop</launchable>
<url type="homepage">https://wiki.gnome.org/Apps/Tetravex</url>
<url type="bugtracker">https://gitlab.gnome.org/GNOME/gnome-tetravex/issues</url>
<url type="donation">https://www.gnome.org/friends/</url>
<url type="help">https://help.gnome.org/users/gnome-tetravex/stable/</url>
<update_contact>mcatanzaro_at_gnome.org</update_contact>
<project_group>GNOME</project_group>
<developer_name>The GNOME Project</developer_name>
<provides>
<id>gnome-tetravex.desktop</id>
</provides>
<kudos>
<kudo>AppMenu</kudo>
<kudo>HiDpiIcon</kudo>
<kudo>ModernToolkit</kudo>
<kudo>UserDocs</kudo>
......
......@@ -8,7 +8,7 @@ Keywords=game;logic;board;
Exec=gnome-tetravex
# TRANSLATORS: Do NOT translate or transliterate this text!
# This is an icon file name.
Icon=gnome-tetravex
Icon=org.gnome.Tetravex
Terminal=false
Type=Application
Categories=GNOME;GTK;Game;LogicGame;
......
<schemalist>
<schema id="org.gnome.tetravex" path="/org/gnome/tetravex/" gettext-domain="gnome-tetravex">
<schema id="org.gnome.Tetravex" path="/org/gnome/Tetravex/" gettext-domain="gnome-tetravex">
<key name="grid-size" type="i">
<default>3</default>
<range min="2" max="6" />
......
......@@ -7,6 +7,8 @@ project ('gnome-tetravex', ['vala', 'c'],
],
meson_version: '>= 0.37.1')
project_id = 'org.gnome.Tetravex'
gnome = import ('gnome')
i18n = import ('i18n')
......
# List of source files containing translatable strings.
# Please keep this file in alphabetical order.
data/gnome-tetravex.appdata.xml.in
data/gnome-tetravex.desktop.in
data/org.gnome.tetravex.gschema.xml
data/org.gnome.Tetravex.appdata.xml.in
data/org.gnome.Tetravex.desktop.in
data/org.gnome.Tetravex.gschema.xml
src/app-menu.ui
src/gnome-tetravex.ui
src/gnome-tetravex.vala
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/tetravex">
<gresource prefix="/org/gnome/Tetravex">
<file preprocess="xml-stripblanks">gnome-tetravex.ui</file>
<file preprocess="xml-stripblanks">app-menu.ui</file>
</gresource>
<gresource prefix="/org/gnome/tetravex/gtk">
<gresource prefix="/org/gnome/Tetravex/gtk">
<file preprocess="xml-stripblanks">help-overlay.ui</file>
</gresource>
</gresources>
<?xml version="1.0" encoding="UTF-8"?>
......@@ -5,7 +5,7 @@
<object class="GtkApplicationWindow" id="gnome-tetravex-window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Tetravex</property>
<property name="icon-name">gnome-tetravex</property>
<property name="icon-name">org.gnome.Tetravex</property>
<child>
<object class="GtkGrid" id="grid">
<property name="visible">True</property>
......
......@@ -59,7 +59,7 @@ public class Tetravex : Gtk.Application
public Tetravex ()
{
Object (application_id: "org.gnome.tetravex", flags: ApplicationFlags.FLAGS_NONE);
Object (application_id: "org.gnome.Tetravex", flags: ApplicationFlags.FLAGS_NONE);
add_main_option_entries (option_entries);
}
......@@ -69,7 +69,7 @@ public class Tetravex : Gtk.Application
base.startup ();
Environment.set_application_name (_("Tetravex"));
Gtk.Window.set_default_icon_name ("gnome-tetravex");
Gtk.Window.set_default_icon_name ("org.gnome.Tetravex");
add_action_entries (action_entries, this);
set_accels_for_action ("app.new-game", {"<Primary>n"});
......@@ -81,9 +81,9 @@ public class Tetravex : Gtk.Application
set_accels_for_action ("app.move-left", {"<Primary>Left"});
set_accels_for_action ("app.move-right", {"<Primary>Right"});
var builder = new Gtk.Builder.from_resource ("/org/gnome/tetravex/gnome-tetravex.ui");
var builder = new Gtk.Builder.from_resource ("/org/gnome/Tetravex/gnome-tetravex.ui");
settings = new Settings ("org.gnome.tetravex");
settings = new Settings ("org.gnome.Tetravex");
history = new History (Path.build_filename (Environment.get_user_data_dir (), "gnome-tetravex", "history"));
history.load ();
......@@ -107,7 +107,7 @@ public class Tetravex : Gtk.Application
headerbar.show_close_button = true;
window.set_titlebar (headerbar);
var menu_builder = new Gtk.Builder.from_resource ("/org/gnome/tetravex/app-menu.ui");
var menu_builder = new Gtk.Builder.from_resource ("/org/gnome/Tetravex/app-menu.ui");
var appmenu = menu_builder.get_object("app-menu") as MenuModel;
var menu_button = new Gtk.MenuButton ();
menu_button.set_image (new Gtk.Image.from_icon_name ("open-menu-symbolic", Gtk.IconSize.BUTTON));
......@@ -397,7 +397,7 @@ public class Tetravex : Gtk.Application
"authors", authors,
"documenters", documenters,
"translator-credits", _("translator-credits"),
"logo-icon-name", "gnome-tetravex",
"logo-icon-name", "org.gnome.Tetravex",
"website", "https://wiki.gnome.org/Apps/Tetravex",
null);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment