From 41bb87522103c5b1ae25cb71a9493b9ea3642976 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 1 Apr 2019 23:58:30 +0000 Subject: [PATCH] widget-factory: Rename to org.gtk.WidgetFactory4 --- .gitlab-ci.yml | 2 +- ...gtk.WidgetFactory.json => org.gtk.WidgetFactory4.json} | 2 +- ...g.gtk.WidgetFactory.svg => org.gtk.WidgetFactory4.svg} | 0 ...y-symbolic.svg => org.gtk.WidgetFactory4-symbolic.svg} | 0 demos/widget-factory/meson.build | 4 ++-- ...ory.appdata.xml => org.gtk.WidgetFactory4.appdata.xml} | 2 +- ...dgetFactory.desktop => org.gtk.WidgetFactory4.desktop} | 2 +- demos/widget-factory/widget-factory.c | 8 ++++---- demos/widget-factory/widget-factory.gresource.xml | 8 ++++---- demos/widget-factory/widget-factory.ui | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) rename build-aux/flatpak/{org.gtk.WidgetFactory.json => org.gtk.WidgetFactory4.json} (98%) rename demos/widget-factory/data/scalable/apps/{org.gtk.WidgetFactory.svg => org.gtk.WidgetFactory4.svg} (100%) rename demos/widget-factory/data/symbolic/apps/{org.gtk.WidgetFactory-symbolic.svg => org.gtk.WidgetFactory4-symbolic.svg} (100%) rename demos/widget-factory/{org.gtk.WidgetFactory.appdata.xml => org.gtk.WidgetFactory4.appdata.xml} (96%) rename demos/widget-factory/{org.gtk.WidgetFactory.desktop => org.gtk.WidgetFactory4.desktop} (88%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f56c81e5dd..d35315dccf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ flatpak:demo: flatpak:widget-factory: variables: - APPID: org.gtk.WidgetFactory + APPID: org.gtk.WidgetFactory4 <<: *flatpak-defaults pages: diff --git a/build-aux/flatpak/org.gtk.WidgetFactory.json b/build-aux/flatpak/org.gtk.WidgetFactory4.json similarity index 98% rename from build-aux/flatpak/org.gtk.WidgetFactory.json rename to build-aux/flatpak/org.gtk.WidgetFactory4.json index 3df814a546..0161809f4d 100644 --- a/build-aux/flatpak/org.gtk.WidgetFactory.json +++ b/build-aux/flatpak/org.gtk.WidgetFactory4.json @@ -1,5 +1,5 @@ { - "app-id": "org.gtk.WidgetFactory", + "app-id": "org.gtk.WidgetFactory4", "runtime": "org.gnome.Platform", "runtime-version": "master", "sdk": "org.gnome.Sdk", diff --git a/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory4.svg similarity index 100% rename from demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg rename to demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory4.svg diff --git a/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg similarity index 100% rename from demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg rename to demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build index c1ba9ec564..1c43423757 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -13,7 +13,7 @@ executable('gtk4-widget-factory', install: true) # desktop file -install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir) +install_data('org.gtk.WidgetFactory4.desktop', install_dir: gtk_applicationsdir) # icons icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor') @@ -25,4 +25,4 @@ foreach size: ['scalable', 'symbolic'] endforeach # appdata -install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir) +install_data('org.gtk.WidgetFactory4.appdata.xml', install_dir: gtk_appdatadir) diff --git a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml similarity index 96% rename from demos/widget-factory/org.gtk.WidgetFactory.appdata.xml rename to demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml index 6e5a2d120b..0f088394c0 100644 --- a/demos/widget-factory/org.gtk.WidgetFactory.appdata.xml +++ b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml @@ -1,6 +1,6 @@ - org.gtk.WidgetFactory.desktop + org.gtk.WidgetFactory4.desktop CC0-1.0 LGPL-2.0+ GTK Widget Factory diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop b/demos/widget-factory/org.gtk.WidgetFactory4.desktop similarity index 88% rename from demos/widget-factory/org.gtk.WidgetFactory.desktop rename to demos/widget-factory/org.gtk.WidgetFactory4.desktop index 8590e68a5e..c91544fabb 100644 --- a/demos/widget-factory/org.gtk.WidgetFactory.desktop +++ b/demos/widget-factory/org.gtk.WidgetFactory4.desktop @@ -2,7 +2,7 @@ Name=Widget Factory Comment=A showcase for GTK widgets, designed for testing themes. Exec=gtk4-widget-factory -Icon=org.gtk.WidgetFactory +Icon=org.gtk.WidgetFactory4 Terminal=false Type=Application StartupNotify=true diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 08f9d5efb4..7a32c37610 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -232,7 +232,7 @@ activate_about (GSimpleAction *action, "website", "http://www.gtk.org", "comments", "Program to demonstrate GTK themes and widgets", "authors", authors, - "logo-icon-name", "org.gtk.WidgetFactory", + "logo-icon-name", "org.gtk.WidgetFactory4", "title", "About GTK Widget Factory", "system-information", s->str, NULL); @@ -1657,13 +1657,13 @@ activate (GApplication *app) g_type_ensure (my_text_view_get_type ()); provider = gtk_css_provider_new (); - gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory/widget-factory.css"); + gtk_css_provider_load_from_resource (provider, "/org/gtk/WidgetFactory4/widget-factory.css"); gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), GTK_STYLE_PROVIDER_PRIORITY_USER); g_object_unref (provider); - builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory/widget-factory.ui"); + builder = gtk_builder_new_from_resource ("/org/gtk/WidgetFactory4/widget-factory.ui"); gtk_builder_add_callback_symbol (builder, "on_entry_icon_release", (GCallback)on_entry_icon_release); gtk_builder_add_callback_symbol (builder, "on_scale_button_value_changed", (GCallback)on_scale_button_value_changed); gtk_builder_add_callback_symbol (builder, "on_scale_button_query_tooltip", (GCallback)on_scale_button_query_tooltip); @@ -1944,7 +1944,7 @@ main (int argc, char *argv[]) }; gint status; - app = gtk_application_new ("org.gtk.WidgetFactory", G_APPLICATION_NON_UNIQUE); + app = gtk_application_new ("org.gtk.WidgetFactory4", G_APPLICATION_NON_UNIQUE); g_action_map_add_action_entries (G_ACTION_MAP (app), app_entries, G_N_ELEMENTS (app_entries), diff --git a/demos/widget-factory/widget-factory.gresource.xml b/demos/widget-factory/widget-factory.gresource.xml index 80a510f8ee..39d665da06 100644 --- a/demos/widget-factory/widget-factory.gresource.xml +++ b/demos/widget-factory/widget-factory.gresource.xml @@ -1,15 +1,15 @@ - + widget-factory.ui - + widget-factory.css - + help-overlay.ui - + icons/16x16/actions/document-new.png icons/16x16/actions/document-save.png icons/16x16/actions/edit-find.png diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 8c3a7f6a50..882a53a548 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -1569,7 +1569,7 @@ microphone-sensitivity-medium-symbolic Logo - gtk3-widget-factory + org.gtk.WidgetFactory4 256