diff --git a/build-aux/flatpak/org.gtk.Demo.json b/build-aux/flatpak/org.gtk.Demo.json
index ca655a7bd6..bb2c1054eb 100644
--- a/build-aux/flatpak/org.gtk.Demo.json
+++ b/build-aux/flatpak/org.gtk.Demo.json
@@ -5,7 +5,6 @@
"sdk": "org.gnome.Sdk",
"command": "gtk4-demo",
"tags": ["devel", "development", "nightly"],
- "rename-icon": "gtk4-demo",
"desktop-file-name-prefix": "(Development) ",
"finish-args": [
"--device=dri",
diff --git a/build-aux/flatpak/org.gtk.WidgetFactory.json b/build-aux/flatpak/org.gtk.WidgetFactory.json
index ea6aaa9938..3df814a546 100644
--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory.json
@@ -5,7 +5,6 @@
"sdk": "org.gnome.Sdk",
"command": "gtk4-widget-factory",
"tags": ["devel", "development", "nightly"],
- "rename-icon": "gtk4-widget-factory",
"desktop-file-name-prefix": "(Development) ",
"finish-args": [
"--device=dri",
diff --git a/demos/gtk-demo/application.c b/demos/gtk-demo/application.c
index 767e351d96..e1e2d881c6 100644
--- a/demos/gtk-demo/application.c
+++ b/demos/gtk-demo/application.c
@@ -212,7 +212,7 @@ activate_about (GSimpleAction *action,
"comments", "Program to demonstrate GTK functions.",
"authors", authors,
"documenters", documentors,
- "logo-icon-name", "gtk4-demo",
+ "logo-icon-name", "org.gtk.Demo",
"title", "About GTK Code Demos",
NULL);
}
diff --git a/demos/gtk-demo/data/16x16/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/16x16/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index 945c632a6f..0000000000
Binary files a/demos/gtk-demo/data/16x16/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/16x16/gtk4-demo.png b/demos/gtk-demo/data/16x16/gtk4-demo.png
deleted file mode 100644
index 604e6c54d7..0000000000
Binary files a/demos/gtk-demo/data/16x16/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/22x22/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/22x22/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index dbe69aa224..0000000000
Binary files a/demos/gtk-demo/data/22x22/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/22x22/gtk4-demo.png b/demos/gtk-demo/data/22x22/gtk4-demo.png
deleted file mode 100644
index 9bf42e8ad1..0000000000
Binary files a/demos/gtk-demo/data/22x22/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/24x24/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/24x24/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index 21d0ac14c7..0000000000
Binary files a/demos/gtk-demo/data/24x24/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/24x24/gtk4-demo.png b/demos/gtk-demo/data/24x24/gtk4-demo.png
deleted file mode 100644
index 7136592315..0000000000
Binary files a/demos/gtk-demo/data/24x24/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/256x256/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/256x256/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index ef5305d9fb..0000000000
Binary files a/demos/gtk-demo/data/256x256/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/256x256/gtk4-demo.png b/demos/gtk-demo/data/256x256/gtk4-demo.png
deleted file mode 100644
index 2a598897df..0000000000
Binary files a/demos/gtk-demo/data/256x256/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/32x32/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/32x32/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index d212a0f558..0000000000
Binary files a/demos/gtk-demo/data/32x32/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/32x32/gtk4-demo.png b/demos/gtk-demo/data/32x32/gtk4-demo.png
deleted file mode 100644
index 9d046bbe42..0000000000
Binary files a/demos/gtk-demo/data/32x32/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/48x48/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/48x48/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index 93fa6b74cb..0000000000
Binary files a/demos/gtk-demo/data/48x48/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/48x48/gtk4-demo.png b/demos/gtk-demo/data/48x48/gtk4-demo.png
deleted file mode 100644
index d35178859b..0000000000
Binary files a/demos/gtk-demo/data/48x48/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/512x512/gtk4-demo-symbolic.symbolic.png b/demos/gtk-demo/data/512x512/gtk4-demo-symbolic.symbolic.png
deleted file mode 100644
index 7746398979..0000000000
Binary files a/demos/gtk-demo/data/512x512/gtk4-demo-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/gtk-demo/data/512x512/gtk4-demo.png b/demos/gtk-demo/data/512x512/gtk4-demo.png
deleted file mode 100644
index d6d38cb678..0000000000
Binary files a/demos/gtk-demo/data/512x512/gtk4-demo.png and /dev/null differ
diff --git a/demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg b/demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
new file mode 100644
index 0000000000..5773821eba
--- /dev/null
+++ b/demos/gtk-demo/data/scalable/apps/org.gtk.Demo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/demos/gtk-demo/data/source.svg b/demos/gtk-demo/data/source.svg
deleted file mode 100644
index b2eafd9a0e..0000000000
--- a/demos/gtk-demo/data/source.svg
+++ /dev/null
@@ -1,2886 +0,0 @@
-
-
-
-
diff --git a/demos/gtk-demo/data/symbolic-source.svg b/demos/gtk-demo/data/symbolic-source.svg
deleted file mode 100644
index 36fa0ff731..0000000000
--- a/demos/gtk-demo/data/symbolic-source.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
diff --git a/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
new file mode 100644
index 0000000000..033dae5ebd
--- /dev/null
+++ b/demos/gtk-demo/data/symbolic/apps/org.gtk.Demo-symbolic.svg
@@ -0,0 +1,114 @@
+
+
+
+
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index c4ae6312a0..bf5f32e0b8 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -58,7 +58,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org",
"comments", "Program to demonstrate GTK widgets",
"authors", authors,
- "logo-icon-name", "gtk4-demo",
+ "logo-icon-name", "org.gtk.Demo",
"title", "About GTK Demo",
NULL);
}
diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index df8db17414..7116a411e2 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -99,7 +99,7 @@ gtkdemo_resources = gnome.compile_resources('gtkdemo_resources',
source_dir: '.')
executable('gtk4-demo',
- demos, demos_h, extra_demo_sources, gtkdemo_resources,
+ demos, demos_h, extra_demo_sources, gtkdemo_resources,
c_args: gtkdemo_args,
dependencies: gtkdemo_deps,
include_directories: confinc,
@@ -119,12 +119,10 @@ executable('gtk4-demo-application',
# icons
icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
- gtk_demo_icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
- install_data('data/@0@/gtk4-demo.png'.format(icon_size),
- install_dir: gtk_demo_icons_dir)
- install_data('data/@0@/gtk4-demo-symbolic.symbolic.png'.format(icon_size),
- install_dir: gtk_demo_icons_dir)
+foreach size: ['scalable', 'symbolic']
+ install_subdir('data/' + size,
+ install_dir: icontheme_dir
+ )
endforeach
# desktop file
diff --git a/demos/gtk-demo/org.gtk.Demo.desktop b/demos/gtk-demo/org.gtk.Demo.desktop
index 021a92f710..e9078dfe30 100644
--- a/demos/gtk-demo/org.gtk.Demo.desktop
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
@@ -2,7 +2,7 @@
Name=GTK Demo
Comment=GTK code examples and demonstrations
Exec=gtk4-demo
-Icon=gtk4-demo
+Icon=org.gtk.Demo
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/icon-browser/data/scalable/apps/org.gnome.IconBrowser.svg b/demos/icon-browser/data/scalable/apps/org.gnome.IconBrowser.svg
new file mode 100644
index 0000000000..ff312e407e
--- /dev/null
+++ b/demos/icon-browser/data/scalable/apps/org.gnome.IconBrowser.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/demos/icon-browser/data/symbolic/apps/org.gtk.IconBrowser-symbolic.svg b/demos/icon-browser/data/symbolic/apps/org.gtk.IconBrowser-symbolic.svg
new file mode 100644
index 0000000000..0e05a2e076
--- /dev/null
+++ b/demos/icon-browser/data/symbolic/apps/org.gtk.IconBrowser-symbolic.svg
@@ -0,0 +1,136 @@
+
+
+
+
diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build
index fcaca82d8d..3708fa047a 100644
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -18,3 +18,12 @@ executable('gtk4-icon-browser',
install: true)
install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+ install_subdir('data/' + size,
+ install_dir: icontheme_dir
+ )
+endforeach
diff --git a/demos/icon-browser/org.gtk.IconBrowser.desktop b/demos/icon-browser/org.gtk.IconBrowser.desktop
index 844de8cdd8..64f69e3056 100644
--- a/demos/icon-browser/org.gtk.IconBrowser.desktop
+++ b/demos/icon-browser/org.gtk.IconBrowser.desktop
@@ -2,7 +2,7 @@
Name=Icon Browser
Comment=An application that shows themed icons
Exec=gtk4-icon-browser
-Icon=gtk4-icon-browser
+Icon=org.gtk.IconBrowser
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/widget-factory/data/16x16/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/16x16/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index d40786fe29..0000000000
Binary files a/demos/widget-factory/data/16x16/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/16x16/gtk4-widget-factory.png b/demos/widget-factory/data/16x16/gtk4-widget-factory.png
deleted file mode 100644
index d1c09e014c..0000000000
Binary files a/demos/widget-factory/data/16x16/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/22x22/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/22x22/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index a2903750c9..0000000000
Binary files a/demos/widget-factory/data/22x22/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/22x22/gtk4-widget-factory.png b/demos/widget-factory/data/22x22/gtk4-widget-factory.png
deleted file mode 100644
index 5b02f1dfe8..0000000000
Binary files a/demos/widget-factory/data/22x22/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/24x24/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/24x24/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index 7760a618a8..0000000000
Binary files a/demos/widget-factory/data/24x24/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/24x24/gtk4-widget-factory.png b/demos/widget-factory/data/24x24/gtk4-widget-factory.png
deleted file mode 100644
index 4944ff155b..0000000000
Binary files a/demos/widget-factory/data/24x24/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/256x256/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/256x256/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index a95b9b035d..0000000000
Binary files a/demos/widget-factory/data/256x256/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/256x256/gtk4-widget-factory.png b/demos/widget-factory/data/256x256/gtk4-widget-factory.png
deleted file mode 100644
index 493ecfa6d1..0000000000
Binary files a/demos/widget-factory/data/256x256/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/32x32/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/32x32/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index 1f2f6cd8a7..0000000000
Binary files a/demos/widget-factory/data/32x32/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/32x32/gtk4-widget-factory.png b/demos/widget-factory/data/32x32/gtk4-widget-factory.png
deleted file mode 100644
index 5aa1786cd6..0000000000
Binary files a/demos/widget-factory/data/32x32/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/48x48/gtk4-widget-factory-symbolic.symbolic.png b/demos/widget-factory/data/48x48/gtk4-widget-factory-symbolic.symbolic.png
deleted file mode 100644
index 201eeb776a..0000000000
Binary files a/demos/widget-factory/data/48x48/gtk4-widget-factory-symbolic.symbolic.png and /dev/null differ
diff --git a/demos/widget-factory/data/48x48/gtk4-widget-factory.png b/demos/widget-factory/data/48x48/gtk4-widget-factory.png
deleted file mode 100644
index 751c209b0a..0000000000
Binary files a/demos/widget-factory/data/48x48/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/512x512/gtk4-widget-factory.png b/demos/widget-factory/data/512x512/gtk4-widget-factory.png
deleted file mode 100644
index 33d4b5cbf2..0000000000
Binary files a/demos/widget-factory/data/512x512/gtk4-widget-factory.png and /dev/null differ
diff --git a/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
new file mode 100644
index 0000000000..e3bccac4aa
--- /dev/null
+++ b/demos/widget-factory/data/scalable/apps/org.gtk.WidgetFactory.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/demos/widget-factory/data/source.svg b/demos/widget-factory/data/source.svg
deleted file mode 100644
index f2284b3058..0000000000
--- a/demos/widget-factory/data/source.svg
+++ /dev/null
@@ -1,4854 +0,0 @@
-
-
-
-
diff --git a/demos/widget-factory/data/symbolic-source.svg b/demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
similarity index 100%
rename from demos/widget-factory/data/symbolic-source.svg
rename to demos/widget-factory/data/symbolic/apps/org.gtk.WidgetFactory-symbolic.svg
diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index be7b5db57a..c1ba9ec564 100644
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -18,13 +18,11 @@ install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
# icons
icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
-foreach icon_size : ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
- icons_dir = join_paths(icontheme_dir, '@0@/apps'.format(icon_size))
- install_data('data/@0@/gtk4-widget-factory.png'.format(icon_size),
- install_dir: icons_dir)
- install_data('data/@0@/gtk4-widget-factory-symbolic.symbolic.png'.format(icon_size),
- install_dir: icons_dir)
+foreach size: ['scalable', 'symbolic']
+ install_subdir('data/' + size,
+ install_dir: icontheme_dir
+ )
endforeach
# appdata
-install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
\ No newline at end of file
+install_data('org.gtk.WidgetFactory.appdata.xml', install_dir: gtk_appdatadir)
diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop b/demos/widget-factory/org.gtk.WidgetFactory.desktop
index fa7218e593..8590e68a5e 100644
--- a/demos/widget-factory/org.gtk.WidgetFactory.desktop
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
@@ -2,7 +2,7 @@
Name=Widget Factory
Comment=A showcase for GTK widgets, designed for testing themes.
Exec=gtk4-widget-factory
-Icon=gtk4-widget-factory
+Icon=org.gtk.WidgetFactory
Terminal=false
Type=Application
StartupNotify=true
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 6bfb68d623..f19ae57d83 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", "gtk4-widget-factory",
+ "logo-icon-name", "org.gtk.WidgetFactory",
"title", "About GTK Widget Factory",
"system-information", s->str,
NULL);