AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

See merge request GNOME/gtk!3177
This commit is contained in:
Matthias Clasen 2021-02-10 13:55:50 +00:00
commit 6c85a4b2f5
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/icon-browser/iconbrowserapp.c
View File

@ -89,7 +89,7 @@ about_activated (GSimpleAction *action,
"website", "http://www.gtk.org", "website", "http://www.gtk.org",
"comments", "Program to browse themed icons", "comments", "Program to browse themed icons",
"authors", authors, "authors", authors,
"logo-icon-name", "org.gtk.Demo4", "logo-icon-name", "org.gtk.IconBrowser4",
"title", "About GTK Icon Browser", "title", "About GTK Icon Browser",
"system-information", s->str, "system-information", s->str,
NULL); NULL);

2
demos/node-editor/node-editor-application.c
View File

@ -109,7 +109,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org", "website", "http://www.gtk.org",
"comments", "Program to test GTK rendering", "comments", "Program to test GTK rendering",
"authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL}, "authors", (const char *[]){ "Benjamin Otte", "Timm Bäder", NULL},
"logo-icon-name", "org.gtk.gtk4.NodeEditor.Devel", "logo-icon-name", "org.gtk.gtk4.NodeEditor",
"title", "About GTK Node Editor", "title", "About GTK Node Editor",
"system-information", s->str, "system-information", s->str,
NULL); NULL);

2
demos/node-editor/node-editor-window.c
View File

@ -927,7 +927,7 @@ node_editor_window_init (NodeEditorWindow *self)
"shadow {\n" "shadow {\n"
" child: texture {\n" " child: texture {\n"
" bounds: 0 0 128 128;\n" " bounds: 0 0 128 128;\n"
" texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg\");\n" " texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.svg\");\n"
" }\n" " }\n"
" shadows: rgba(0,0,0,0.5) 0 1 12;\n" " shadows: rgba(0,0,0,0.5) 0 1 12;\n"
"}\n" "}\n"

2
demos/node-editor/node-editor.gresource.xml
View File

@ -4,6 +4,6 @@
<file preprocess="xml-stripblanks">node-editor-window.ui</file> <file preprocess="xml-stripblanks">node-editor-window.ui</file>
<file preprocess="xml-stripblanks">help-window.ui</file> <file preprocess="xml-stripblanks">help-window.ui</file>
<file>node-format.md</file> <file>node-format.md</file>
<file alias='icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg</file> <file alias='icons/apps/org.gtk.gtk4.NodeEditor.svg'>data/scalable/apps/org.gtk.gtk4.NodeEditor.svg</file>
</gresource> </gresource>
</gresources> </gresources>

2
demos/print-editor/org.gtk.PrintEditor4.desktop
View File

@ -2,7 +2,7 @@
Name=Print Editor Name=Print Editor
Comment=A simple editor demonstrating GTK printing Comment=A simple editor demonstrating GTK printing
Exec=gtk4-print-editor %f Exec=gtk4-print-editor %f
Icon=org.gtk.PrintEditor4.Devel Icon=org.gtk.PrintEditor4
Terminal=false Terminal=false
Type=Application Type=Application
StartupNotify=true StartupNotify=true

2
demos/print-editor/print-editor.c
View File

@ -656,7 +656,7 @@ activate_about (GSimpleAction *action,
"website", "http://www.gtk.org", "website", "http://www.gtk.org",
"comments", "Program to demonstrate GTK printing", "comments", "Program to demonstrate GTK printing",
"authors", authors, "authors", authors,
"logo-icon-name", "org.gtk.PrintEditor4.Devel", "logo-icon-name", "org.gtk.PrintEditor4",
"title", "About GTK Print Editor", "title", "About GTK Print Editor",
"system-information", sysinfo->str, "system-information", sysinfo->str,
NULL); NULL);