Commit 32091a33 authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui Committed by Zander

Rename app-id to org.gnome.design.IconPreview

parent c83dfbed
Pipeline #116670 passed with stage
in 1 minute and 38 seconds
......@@ -7,10 +7,10 @@ variables:
flatpak:
image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
variables:
MANIFEST_PATH: "org.gnome.IconPreview.json"
MANIFEST_PATH: "org.gnome.design.IconPreview.json"
FLATPAK_MODULE: "icon-preview"
RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
APP_ID: "org.gnome.IconPreview"
APP_ID: "org.gnome.design.IconPreview"
extends: .flatpak
review:
......@@ -21,4 +21,4 @@ review:
stop_review:
stage: deploy
extends: '.stop_review'
\ No newline at end of file
extends: '.stop_review'
desktop_file = i18n.merge_file(
input: 'org.gnome.IconPreview.desktop.in',
output: 'org.gnome.IconPreview.desktop',
input: 'org.gnome.design.IconPreview.desktop.in',
output: '@BASENAME@',
type: 'desktop',
po_dir: '../po',
install: true,
......@@ -15,8 +15,8 @@ if desktop_utils.found()
endif
appdata_file = i18n.merge_file(
input: 'org.gnome.IconPreview.appdata.xml.in',
output: 'org.gnome.IconPreview.appdata.xml',
input: 'org.gnome.design.IconPreview.appdata.xml.in',
output: '@BASENAME@',
po_dir: '../po',
install: true,
install_dir: join_paths(get_option('datadir'), 'metainfo'),
......@@ -28,14 +28,14 @@ if appstream_util.found()
test('Validate appstream file', appstream_util, args: validate_args)
endif
configure_file(input: 'org.gnome.IconPreview.service.in',
output: 'org.gnome.IconPreview.service',
configure_file(input: 'org.gnome.design.IconPreview.service.in',
output: '@BASENAME@',
configuration: conf,
install_dir: join_paths([datadir,'dbus-1/services']))
install_data('org.gnome.IconPreview.svg',
install_data('org.gnome.design.IconPreview.svg',
install_dir: join_paths([datadir,'icons/hicolor/scalable/apps']))
install_data('org.gnome.IconPreview-symbolic.svg',
install_data('org.gnome.design.IconPreview-symbolic.svg',
install_dir: join_paths([datadir,'icons/hicolor/symbolic/apps']))
[D-BUS Service]
Name=org.gnome.IconPreview
Exec=@BINDIR@/gnome-icon-preview --gapplication-service
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2018 Zander Brown -->
<component type="desktop-application">
<id>org.gnome.IconPreview</id>
<id>org.gnome.design.IconPreview</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0</project_license>
<project_group>GNOME</project_group>
......@@ -39,7 +39,10 @@
<release version="0.2.0" date="2018-09-05" />
<release version="0.1.0" date="2018-08-08" />
</releases>
<launchable type="desktop-id">org.gnome.IconPreview.desktop</launchable>
<provides>
<id>org.gnome.IconPreview</id>
</provides>
<launchable type="desktop-id">org.gnome.design.IconPreview.desktop</launchable>
<url type="homepage">https://gitlab.gnome.org/World/design/icon-tool</url>
<url type="bugtracker">https://gitlab.gnome.org/World/design/icon-icon/issues</url>
<update_contact>zbrown@gnome.org</update_contact>
......
......@@ -3,7 +3,7 @@ Name=Icon Preview
Comment=Preview icons
Exec=gnome-icon-preview %f
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gnome.IconPreview
Icon=org.gnome.design.IconPreview
Terminal=false
Type=Application
StartupNotify=true
......
[D-BUS Service]
Name=org.gnome.design.IconPreview
Exec=@BINDIR@/gnome-icon-preview --gapplication-service
......@@ -7,14 +7,14 @@ bindir = join_paths([ get_option('prefix'), 'bin' ])
localedir = join_paths(get_option('prefix'), get_option('localedir'))
conf = configuration_data()
conf.set_quoted('G_LOG_DOMAIN', 'org.gnome.IconPreview')
conf.set_quoted('G_LOG_DOMAIN', 'org.gnome.design.IconPreview')
conf.set_quoted('PACKAGE_VERSION', meson.project_version())
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('LOCALE_DIR', localedir)
conf.set('BINDIR', bindir)
add_global_arguments('-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name()), language: 'c')
add_global_arguments('-DG_LOG_DOMAIN="@0@"'.format ('org.gnome.IconPreview'), language: 'c')
add_global_arguments('-DG_LOG_DOMAIN="@0@"'.format ('org.gnome.design.IconPreview'), language: 'c')
add_global_arguments('-DHANDY_USE_UNSTABLE_API', language: 'c')
subdir('data')
......
{
"app-id" : "org.gnome.IconPreview",
"app-id" : "org.gnome.design.IconPreview",
"runtime" : "org.gnome.Platform",
"runtime-version" : "master",
"sdk" : "org.gnome.Sdk",
......
data/org.gnome.IconPreview.appdata.xml.in
data/org.gnome.IconPreview.desktop.in
data/org.gnome.design.IconPreview.appdata.xml.in
data/org.gnome.design.IconPreview.desktop.in
src/common.vala
src/exporter/exporter.ui
src/help-overlay.ui
......
using Gtk;
namespace IconPreview {
[GtkTemplate (ui = "/org/gnome/IconPreview/exporter/exporter.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/exporter/exporter.ui")]
public class Exporter : Popover {
public string name { get; set; }
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/IconPreview/icons/">
<gresource prefix="/org/gnome/design/IconPreview/icons/">
<file>com.github.bilelmoussaoui.Authenticator.svg</file>
<file>de.haeckerfelix.Radio.svg</file>
<file>org.gnome.Aisleriot.svg</file>
......@@ -14,7 +14,7 @@
<file>org.gnome.Contacts.svg</file>
<file>org.gnome.Fonts.svg</file>
<file>org.gnome.Games.svg</file>
<file>org.gnome.IconPreview.svg</file>
<file>org.gnome.design.IconPreview.svg</file>
<file>org.gnome.Logs.svg</file>
<file>org.gnome.Maps.svg</file>
<file>org.gnome.Messages.svg</file>
......
......@@ -44,7 +44,7 @@ namespace IconPreview {
// Bind the actions
add_action_entries(entries, this);
application_id = "org.gnome.IconPreview";
application_id = "org.gnome.design.IconPreview";
flags = HANDLES_OPEN | HANDLES_COMMAND_LINE;
add_main_option ("palette", 'p', IN_MAIN, NONE, _("no longer supported"), null);
......@@ -72,7 +72,7 @@ namespace IconPreview {
base.startup();
var styles = new CssProvider();
styles.load_from_resource("/org/gnome/IconPreview/gtk/style.css");
styles.load_from_resource("/org/gnome/design/IconPreview/gtk/style.css");
// Use of uint.MAX isn't ideal but we are effectively in an arms race
StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), styles, uint.MAX);
......@@ -108,7 +108,7 @@ namespace IconPreview {
}
public int main (string[] args) {
Gtk.Window.set_default_icon_name("org.gnome.IconPreview");
Gtk.Window.set_default_icon_name("org.gnome.design.IconPreview");
Intl.setlocale (LocaleCategory.ALL, "");
Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
......
......@@ -11,7 +11,7 @@ namespace IconPreview {
}
}
[GtkTemplate (ui = "/org/gnome/IconPreview/recentrow.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/recentrow.ui")]
class RecentRow : ListBoxRow {
[GtkChild]
Label label;
......@@ -33,7 +33,7 @@ namespace IconPreview {
}
}
[GtkTemplate (ui = "/org/gnome/IconPreview/recents.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/recents.ui")]
public class Recents : Popover {
[GtkChild]
ListBox recent;
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/IconPreview/">
<gresource prefix="/org/gnome/design/IconPreview/">
<file>recentrow.ui</file>
<file>recents.ui</file>
<file>wizard.ui</file>
......@@ -12,9 +12,9 @@
<file>templates/symbolic.svg</file>
<file>templates/colour.svg</file>
<file>templates/stripes.svg</file>
<file alias="badge.svg">../data/org.gnome.IconPreview-symbolic.svg</file>
<file alias="badge.svg">../data/org.gnome.design.IconPreview-symbolic.svg</file>
</gresource>
<gresource prefix="/org/gnome/IconPreview/gtk/">
<gresource prefix="/org/gnome/design/IconPreview/gtk/">
<file>style.css</file>
<file>menus.ui</file>
<file>help-overlay.ui</file>
......
using Gtk;
namespace IconPreview {
[GtkTemplate (ui = "/org/gnome/IconPreview/saver.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/saver.ui")]
class ScreenshotSaver : Hdy.Dialog {
[GtkChild]
Image preview;
......
......@@ -32,7 +32,7 @@ colour-view .wallpaper .backdrop {
colour-view .wallpaper {
/* Try again with gtk4 background-size: cover; */
background-position: center;
background-image: url('resource://org/gnome/IconPreview/wallpapers/Adwaita.jpg');
background-image: url('resource://org/gnome/design/IconPreview/wallpapers/Adwaita.jpg');
color: white;
text-shadow: 0 1px 2px rgba(0,0,0,0.4), 0 1px 8px rgba(0,0,0,0.2);
}
......@@ -42,7 +42,7 @@ colour-view .wallpaper label:backdrop {
}
.theme-Adwaita-dark .wallpaper {
background-image: url('resource://org/gnome/IconPreview/wallpapers/Adwaita-dark.jpg');
background-image: url('resource://org/gnome/design/IconPreview/wallpapers/Adwaita-dark.jpg');
}
colour-view image:not(.symbolic), .initial-state .shadow-icon {
......
......@@ -2,7 +2,7 @@ using Gtk;
namespace IconPreview {
public class Colour : Box, Previewer {
const string RES_PATH = "/org/gnome/IconPreview/icons/";
const string RES_PATH = "/org/gnome/design/IconPreview/icons/";
const string BASE_THEME = "Adwaita";
static string[] colours;
......@@ -89,7 +89,7 @@ namespace IconPreview {
Gdk.Pixbuf logo;
try {
logo = new Gdk.Pixbuf.from_resource_at_scale ("/org/gnome/IconPreview/badge.svg", 32, -1, true);
logo = new Gdk.Pixbuf.from_resource_at_scale ("/org/gnome/design/IconPreview/badge.svg", 32, -1, true);
} catch (Error e) {
critical (e.message);
logo = new Gdk.Pixbuf (RGB, false, 1, 2, 2);
......@@ -176,7 +176,7 @@ namespace IconPreview {
}
private Cairo.Surface get_overlay() {
var stripes = File.new_for_uri ("resource:///org/gnome/IconPreview/templates/stripes.svg");
var stripes = File.new_for_uri ("resource:///org/gnome/design/IconPreview/templates/stripes.svg");
var handle = new Rsvg.Handle.from_gfile_sync (stripes, FLAGS_NONE);
FileIOStream stream;
var temp_file = File.new_tmp("XXXXXX-strips.svg", out stream);
......
......@@ -22,7 +22,7 @@
<property name="halign">center</property>
<property name="valign">end</property>
<property name="pixel_size">128</property>
<property name="icon_name">org.gnome.IconPreview</property>
<property name="icon_name">org.gnome.design.IconPreview</property>
</object>
<packing>
<property name="left_attach">3</property>
......@@ -47,7 +47,7 @@
<property name="halign">center</property>
<property name="valign">end</property>
<property name="pixel_size">64</property>
<property name="icon_name">org.gnome.IconPreview</property>
<property name="icon_name">org.gnome.design.IconPreview</property>
</object>
<packing>
<property name="left_attach">2</property>
......@@ -72,7 +72,7 @@
<property name="halign">center</property>
<property name="valign">end</property>
<property name="pixel_size">32</property>
<property name="icon_name">org.gnome.IconPreview</property>
<property name="icon_name">org.gnome.design.IconPreview</property>
</object>
<packing>
<property name="left_attach">1</property>
......@@ -97,7 +97,7 @@
<property name="halign">center</property>
<property name="valign">end</property>
<property name="pixel_size">16</property>
<property name="icon_name">org.gnome.IconPreview-symbolic</property>
<property name="icon_name">org.gnome.design.IconPreview-symbolic</property>
<style>
<class name="symbolic"/>
</style>
......
......@@ -40,7 +40,7 @@ namespace IconPreview {
}
}
[GtkTemplate (ui = "/org/gnome/IconPreview/colourpane.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/colourpane.ui")]
public class ColourPane : Box {
[GtkChild]
Grid sizes;
......
using Gtk;
namespace IconPreview {
[GtkTemplate (ui = "/org/gnome/IconPreview/symbolicpane.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/symbolicpane.ui")]
public class SymbolicPane : Box {
[GtkChild]
Grid sizes;
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/IconPreview/">
<gresource prefix="/org/gnome/design/IconPreview/">
<file>wallpapers/Adwaita.jpg</file>
<file>wallpapers/Adwaita-dark.jpg</file>
</gresource>
</gresources>
\ No newline at end of file
</gresources>
......@@ -5,7 +5,7 @@
<template class="IconPreviewWindow" parent="DzlApplicationWindow">
<property name="can_focus">False</property>
<property name="icon_name">org.gnome.IconPreview</property>
<property name="icon_name">org.gnome.design.IconPreview</property>
<property name="show_menubar">False</property>
<child>
<object class="GtkStack" id="content">
......
using Gtk;
namespace IconPreview {
[GtkTemplate (ui = "/org/gnome/IconPreview/window.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/window.ui")]
public class Window : Dazzle.ApplicationWindow {
[GtkChild]
Stack content;
......
using Gtk;
namespace IconPreview {
[GtkTemplate (ui = "/org/gnome/IconPreview/wizard.ui")]
[GtkTemplate (ui = "/org/gnome/design/IconPreview/wizard.ui")]
class Wizard : Hdy.Dialog {
[GtkChild]
Label icon_type;
......@@ -95,7 +95,7 @@ namespace IconPreview {
private async File colour () requires (mode == COLOUR) {
var dest = File.new_for_path(Path.build_filename(location.file.get_path(), icon_title.text + ".svg"));
var from = File.new_for_uri("resource:///org/gnome/IconPreview/templates/colour.svg");
var from = File.new_for_uri("resource:///org/gnome/design/IconPreview/templates/colour.svg");
try {
var p = dest.get_parent();
if (!p.query_exists()) {
......@@ -111,7 +111,7 @@ namespace IconPreview {
private async File symbolic () requires (mode == SYMBOLIC) {
var dest = File.new_for_path(Path.build_filename(location.file.get_path(), icon_title.text + "-symbolic.svg"));
var from = File.new_for_uri("resource:///org/gnome/IconPreview/templates/symbolic.svg");
var from = File.new_for_uri("resource:///org/gnome/design/IconPreview/templates/symbolic.svg");
try {
var p = dest.get_parent();
if (!p.query_exists()) {
......
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