callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk-demo: Don't use subfolders for resources

Browse Source 
This confuses the notebook that is displaying them.
This commit is contained in:
Benjamin Otte
2013-01-30 23:05:12 +01:00
parent 7acf6296f4
commit aaab99bb4d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demos/gtk-demo/application.c
View File

@ -113,7 +113,7 @@ activate_about (GSimpleAction *action,
NULL NULL
}; };
pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-48.png", NULL); pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-48.png", NULL);
gtk_show_about_dialog (GTK_WINDOW (window), gtk_show_about_dialog (GTK_WINDOW (window),
"program-name", "GTK+ Code Demos", "program-name", "GTK+ Code Demos",
@ -177,7 +177,7 @@ register_stock_icons (void)
factory = gtk_icon_factory_new (); factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (factory); gtk_icon_factory_add_default (factory);
pixbuf = gdk_pixbuf_new_from_resource ("/application/logos/gtk-logo-24.png", NULL); pixbuf = gdk_pixbuf_new_from_resource ("/application/gtk-logo-24.png", NULL);
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf); icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set); gtk_icon_factory_add (factory, "demo-gtk-logo", icon_set);
@ -295,7 +295,7 @@ startup (GApplication *app)
GMenuModel *menubar; GMenuModel *menubar;
builder = gtk_builder_new (); builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder, "/application/ui/menus.ui", NULL); gtk_builder_add_from_resource (builder, "/application/menus.ui", NULL);
appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu"); appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar"); menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
@ -331,7 +331,7 @@ activate (GApplication *app)
window); window);
builder = gtk_builder_new (); builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder, "/application/ui/application.ui", NULL); gtk_builder_add_from_resource (builder, "/application/application.ui", NULL);
grid = (GtkWidget *)gtk_builder_get_object (builder, "grid"); grid = (GtkWidget *)gtk_builder_get_object (builder, "grid");
contents = (GtkWidget *)gtk_builder_get_object (builder, "contents"); contents = (GtkWidget *)gtk_builder_get_object (builder, "contents");

4
demos/gtk-demo/demo.gresource.xml
View File

@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<gresources> <gresources>
<gresource prefix="/application/logos"> <gresource prefix="/application">
<file preprocess="to-pixdata">gtk-logo-24.png</file> <file preprocess="to-pixdata">gtk-logo-24.png</file>
<file preprocess="to-pixdata">gtk-logo-48.png</file> <file preprocess="to-pixdata">gtk-logo-48.png</file>
</gresource>
<gresource prefix="/application/ui">
<file preprocess="xml-stripblanks">application.ui</file> <file preprocess="xml-stripblanks">application.ui</file>
<file preprocess="xml-stripblanks">menus.ui</file> <file preprocess="xml-stripblanks">menus.ui</file>
</gresource> </gresource>