Commit 4a11acdc authored by William Jon McCann's avatar William Jon McCann

resources: move resources into a subdirectory

parent 0426abd3
......@@ -1082,10 +1082,6 @@ gtk_extra_sources = \
paper_names_offsets.c \
gen-paper-names.c \
gtkstatusicon-quartz.c \
gtk-win32-base.css \
gtk-win32.css \
gtk-win32-xp.css \
gtk-win32-classic.css \
gtkversion.h.in \
gtkmarshalers.list \
fallback-c89.c
......@@ -1113,44 +1109,38 @@ pkgdata_DATA = gtkbuilder.rng
EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
DND_CURSORS = \
cursor_dnd_ask.png \
cursor_dnd_copy.png \
cursor_dnd_link.png \
cursor_dnd_move.png \
cursor_dnd_none.png
COMPOSITE_TEMPLATES = \
gtkapplication-quartz.ui \
gtkaboutdialog.ui \
gtkappchooserdialog.ui \
gtkappchooserwidget.ui \
gtkassistant.ui \
gtkcolorchooserdialog.ui \
gtkcoloreditor.ui \
gtkdialog.ui \
gtkfilechooserbutton.ui \
gtkfilechooserdefault.ui \
gtkfilechooserdialog.ui \
gtkfontbutton.ui \
gtkfontchooserdialog.ui \
gtkfontchooserwidget.ui \
gtkinfobar.ui \
gtklockbutton.ui \
gtkmessagedialog.ui \
gtkpagesetupunixdialog.ui \
gtkpathbar.ui \
gtkprintunixdialog.ui \
gtkrecentchooserdefault.ui \
gtksearchbar.ui \
gtkscalebutton.ui \
gtkstatusbar.ui \
gtkvolumebutton.ui
COMPOSITE_TEMPLATES = \
resources/ui/gtkapplication-quartz.ui \
resources/ui/gtkaboutdialog.ui \
resources/ui/gtkappchooserdialog.ui \
resources/ui/gtkappchooserwidget.ui \
resources/ui/gtkassistant.ui \
resources/ui/gtkcolorchooserdialog.ui \
resources/ui/gtkcoloreditor.ui \
resources/ui/gtkdialog.ui \
resources/ui/gtkfilechooserbutton.ui \
resources/ui/gtkfilechooserdefault.ui \
resources/ui/gtkfilechooserdialog.ui \
resources/ui/gtkfontbutton.ui \
resources/ui/gtkfontchooserdialog.ui \
resources/ui/gtkfontchooserwidget.ui \
resources/ui/gtkinfobar.ui \
resources/ui/gtklockbutton.ui \
resources/ui/gtkmessagedialog.ui \
resources/ui/gtkpagesetupunixdialog.ui \
resources/ui/gtkpathbar.ui \
resources/ui/gtkprintunixdialog.ui \
resources/ui/gtkrecentchooserdefault.ui \
resources/ui/gtksearchbar.ui \
resources/ui/gtkscalebutton.ui \
resources/ui/gtkstatusbar.ui \
resources/ui/gtkvolumebutton.ui
template_headers = $(COMPOSITE_TEMPLATES:.ui=.ui.h)
%.ui.h: %.ui extract-strings$(BUILD_EXEEXT)
$(AM_V_GEN) ./extract-strings$(BUILD_EXEEXT) $< > $@
$(AM_V_GEN) mkdir -p $(dir $@) \
&& ./extract-strings$(BUILD_EXEEXT) $< > $@
#
# rules to generate built sources
......@@ -1196,12 +1186,13 @@ gtktypebuiltins.c: $(gtk_public_h_sources) $(deprecated_h_sources) gtktypebuilti
&& cp xgen-gtbc gtktypebuiltins.c \
&& rm -f xgen-gtbc
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/resources --generate-dependencies $(srcdir)/gtk.gresource.xml)
gtkresources.h: gtk.gresource.xml
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
gtkresources.c: gtk.gresource.xml gtk-default.css gtk-win32.css gtk-win32-xp.css gtk-win32-base.css gtk-win32-classic.css $(DND_CURSORS) $(COMPOSITE_TEMPLATES) $(template_headers)
--target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-header --manual-register
gtkresources.c: gtk.gresource.xml $(resource_files) $(template_headers)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/gtk.gresource.xml \
--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
--target=$@ --sourcedir=$(srcdir)/resources --c-name _gtk --generate-source --manual-register
gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
@true
......@@ -1772,9 +1763,8 @@ endif
mv gtkbuiltincache.h.tmp gtkbuiltincache.h
EXTRA_DIST += \
$(resource_files) \
$(STOCK_ICONS) \
$(COMPOSITE_TEMPLATES) \
$(DND_CURSORS) \
$(GENERATED_ICONS) \
gtk-win32.rc \
gtk-win32.rc.in \
......@@ -1786,7 +1776,6 @@ EXTRA_DIST += \
gtksearchenginequartz.h \
gtk.gresource.xml \
gtkdbusinterfaces.xml \
gtk-default.css \
gtk-keys.css.default \
gtk-keys.css.emacs \
gtk-keys.css.mac \
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gtk/libgtk">
<file alias="Raleigh.css">gtk-default.css</file>
<file>gtk-win32.css</file>
<file>gtk-win32-xp.css</file>
<file>gtk-win32-base.css</file>
<file>gtk-win32-classic.css</file>
<file alias="cursor/dnd-ask.png">cursor_dnd_ask.png</file>
<file alias="cursor/dnd-link.png">cursor_dnd_link.png</file>
<file alias="cursor/dnd-none.png">cursor_dnd_none.png</file>
<file alias="cursor/dnd-move.png">cursor_dnd_move.png</file>
<file alias="cursor/dnd-copy.png">cursor_dnd_copy.png</file>
<file compressed="true">gtkaboutdialog.ui</file>
<file compressed="true">gtkappchooserdialog.ui</file>
<file compressed="true">gtkappchooserwidget.ui</file>
<file compressed="true">gtkassistant.ui</file>
<file compressed="true">gtkcolorchooserdialog.ui</file>
<file compressed="true">gtkcoloreditor.ui</file>
<file compressed="true">gtkdialog.ui</file>
<file compressed="true">gtkfilechooserbutton.ui</file>
<file compressed="true">gtkfilechooserdefault.ui</file>
<file compressed="true">gtkfilechooserdialog.ui</file>
<file compressed="true">gtkfontbutton.ui</file>
<file compressed="true">gtkfontchooserdialog.ui</file>
<file compressed="true">gtkfontchooserwidget.ui</file>
<file compressed="true">gtkinfobar.ui</file>
<file compressed="true">gtklockbutton.ui</file>
<file compressed="true">gtkmessagedialog.ui</file>
<file compressed="true">gtkpagesetupunixdialog.ui</file>
<file compressed="true">gtkpathbar.ui</file>
<file compressed="true">gtkprintunixdialog.ui</file>
<file compressed="true">gtkrecentchooserdefault.ui</file>
<file compressed="true">gtksearchbar.ui</file>
<file compressed="true">gtkscalebutton.ui</file>
<file compressed="true">gtkstatusbar.ui</file>
<file compressed="true">gtkvolumebutton.ui</file>
<file compressed="true">gtkapplication-quartz.ui</file>
<file alias="theme/Raleigh.css">theme/gtk-default.css</file>
<file>theme/gtk-win32.css</file>
<file>theme/gtk-win32-xp.css</file>
<file>theme/gtk-win32-base.css</file>
<file>theme/gtk-win32-classic.css</file>
<file alias="cursor/dnd-ask.png">cursor/cursor_dnd_ask.png</file>
<file alias="cursor/dnd-link.png">cursor/cursor_dnd_link.png</file>
<file alias="cursor/dnd-none.png">cursor/cursor_dnd_none.png</file>
<file alias="cursor/dnd-move.png">cursor/cursor_dnd_move.png</file>
<file alias="cursor/dnd-copy.png">cursor/cursor_dnd_copy.png</file>
<file compressed="true">ui/gtkaboutdialog.ui</file>
<file compressed="true">ui/gtkappchooserdialog.ui</file>
<file compressed="true">ui/gtkappchooserwidget.ui</file>
<file compressed="true">ui/gtkassistant.ui</file>
<file compressed="true">ui/gtkcolorchooserdialog.ui</file>
<file compressed="true">ui/gtkcoloreditor.ui</file>
<file compressed="true">ui/gtkdialog.ui</file>
<file compressed="true">ui/gtkfilechooserbutton.ui</file>
<file compressed="true">ui/gtkfilechooserdefault.ui</file>
<file compressed="true">ui/gtkfilechooserdialog.ui</file>
<file compressed="true">ui/gtkfontbutton.ui</file>
<file compressed="true">ui/gtkfontchooserdialog.ui</file>
<file compressed="true">ui/gtkfontchooserwidget.ui</file>
<file compressed="true">ui/gtkinfobar.ui</file>
<file compressed="true">ui/gtklockbutton.ui</file>
<file compressed="true">ui/gtkmessagedialog.ui</file>
<file compressed="true">ui/gtkpagesetupunixdialog.ui</file>
<file compressed="true">ui/gtkpathbar.ui</file>
<file compressed="true">ui/gtkprintunixdialog.ui</file>
<file compressed="true">ui/gtkrecentchooserdefault.ui</file>
<file compressed="true">ui/gtksearchbar.ui</file>
<file compressed="true">ui/gtkscalebutton.ui</file>
<file compressed="true">ui/gtkstatusbar.ui</file>
<file compressed="true">ui/gtkvolumebutton.ui</file>
<file compressed="true">ui/gtkapplication-quartz.ui</file>
</gresource>
</gresources>
......@@ -583,7 +583,7 @@ gtk_about_dialog_class_init (GtkAboutDialogClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkaboutdialog.ui");
"/org/gtk/libgtk/ui/gtkaboutdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkAboutDialog, stack);
gtk_widget_class_bind_template_child_private (widget_class, GtkAboutDialog, stack_switcher);
......
......@@ -608,7 +608,7 @@ gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass)
widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkappchooserdialog.ui");
"/org/gtk/libgtk/ui/gtkappchooserdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, label);
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, show_more_button);
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserDialog, inner_box);
......
......@@ -1104,7 +1104,7 @@ gtk_app_chooser_widget_class_init (GtkAppChooserWidgetClass *klass)
*/
widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkappchooserwidget.ui");
"/org/gtk/libgtk/ui/gtkappchooserwidget.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, program_list);
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, program_list_store);
gtk_widget_class_bind_template_child_private (widget_class, GtkAppChooserWidget, column);
......
......@@ -158,7 +158,7 @@ gtk_application_impl_quartz_startup (GtkApplicationImpl *impl,
* The fact that we do this here ensures that we will always have the
* app menu at index 0 in 'combined'.
*/
builder = gtk_builder_new_from_resource ("/org/gtk/libgtk/gtkapplication-quartz.ui");
builder = gtk_builder_new_from_resource ("/org/gtk/libgtk/ui/gtkapplication-quartz.ui");
gtk_application_set_app_menu (impl->application, G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
g_object_unref (builder);
}
......
......@@ -430,7 +430,7 @@ gtk_assistant_class_init (GtkAssistantClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkassistant.ui");
"/org/gtk/libgtk/ui/gtkassistant.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkAssistant, action_area);
gtk_widget_class_bind_template_child_private (widget_class, GtkAssistant, content);
......
......@@ -218,7 +218,7 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkcolorchooserdialog.ui");
"/org/gtk/libgtk/ui/gtkcolorchooserdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkColorChooserDialog, chooser);
gtk_widget_class_bind_template_callback (widget_class, propagate_notify);
gtk_widget_class_bind_template_callback (widget_class, color_activated_cb);
......
......@@ -462,7 +462,7 @@ gtk_color_editor_class_init (GtkColorEditorClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkcoloreditor.ui");
"/org/gtk/libgtk/ui/gtkcoloreditor.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkColorEditor, overlay);
gtk_widget_class_bind_template_child_private (widget_class, GtkColorEditor, grid);
......
......@@ -2756,9 +2756,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
* themes.
*/
if (variant)
resource_path = g_strdup_printf ("/org/gtk/libgtk/%s-%s.css", name, variant);
resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s-%s.css", name, variant);
else
resource_path = g_strdup_printf ("/org/gtk/libgtk/%s.css", name);
resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s.css", name);
if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL))
{
......
......@@ -587,7 +587,7 @@ gtk_dialog_class_init (GtkDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkdialog.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkdialog.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, vbox);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, headerbar);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkDialog, action_area);
......
......@@ -470,7 +470,7 @@ gtk_file_chooser_button_class_init (GtkFileChooserButtonClass * class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkfilechooserbutton.ui");
"/org/gtk/libgtk/ui/gtkfilechooserbutton.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserButton, model);
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserButton, button);
......
......@@ -7421,7 +7421,7 @@ _gtk_file_chooser_default_class_init (GtkFileChooserDefaultClass *class)
/* Bind class to template */
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkfilechooserdefault.ui");
"/org/gtk/libgtk/ui/gtkfilechooserdefault.ui");
/* A *lot* of widgets that we need to handle .... */
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserDefault, browse_widgets_box);
......
......@@ -248,7 +248,7 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkfilechooserdialog.ui");
"/org/gtk/libgtk/ui/gtkfilechooserdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkFileChooserDialog, widget);
gtk_widget_class_bind_template_callback (widget_class, response_cb);
......
......@@ -544,7 +544,7 @@ gtk_font_button_class_init (GtkFontButtonClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkfontbutton.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkfontbutton.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, font_label);
gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, size_label);
gtk_widget_class_bind_template_child_private (widget_class, GtkFontButton, font_size_box);
......
......@@ -136,7 +136,7 @@ gtk_font_chooser_dialog_class_init (GtkFontChooserDialogClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkfontchooserdialog.ui");
"/org/gtk/libgtk/ui/gtkfontchooserdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserDialog, fontchooser);
gtk_widget_class_bind_template_callback (widget_class, font_activated_cb);
......
......@@ -490,7 +490,7 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
/* Bind class to template */
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkfontchooserwidget.ui");
"/org/gtk/libgtk/ui/gtkfontchooserwidget.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, search_entry);
gtk_widget_class_bind_template_child_private (widget_class, GtkFontChooserWidget, family_face_list);
......
......@@ -579,7 +579,7 @@ gtk_info_bar_class_init (GtkInfoBarClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkinfobar.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkinfobar.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, content_area);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, action_area);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkInfoBar, close_button);
......
......@@ -306,7 +306,7 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtklockbutton.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtklockbutton.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, box);
gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, image);
gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, label_lock);
......
......@@ -295,7 +295,7 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
GTK_PARAM_READABLE));
/* Setup Composite data */
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkmessagedialog.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkmessagedialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, image);
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, label);
gtk_widget_class_bind_template_child_private (widget_class, GtkMessageDialog, secondary_label);
......
......@@ -161,7 +161,7 @@ gtk_page_setup_unix_dialog_class_init (GtkPageSetupUnixDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkpagesetupunixdialog.ui");
"/org/gtk/libgtk/ui/gtkpagesetupunixdialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkPageSetupUnixDialog, printer_list);
gtk_widget_class_bind_template_child_private (widget_class, GtkPageSetupUnixDialog, page_setup_list);
......
......@@ -259,7 +259,7 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkpathbar.ui");
"/org/gtk/libgtk/ui/gtkpathbar.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, up_slider_button);
gtk_widget_class_bind_template_child_private (widget_class, GtkPathBar, down_slider_button);
......
......@@ -481,7 +481,7 @@ gtk_print_unix_dialog_class_init (GtkPrintUnixDialogClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkprintunixdialog.ui");
"/org/gtk/libgtk/ui/gtkprintunixdialog.ui");
/* GtkTreeView / GtkTreeModel */
gtk_widget_class_bind_template_child_private (widget_class, GtkPrintUnixDialog, printer_treeview);
......
......@@ -346,7 +346,7 @@ _gtk_recent_chooser_default_class_init (GtkRecentChooserDefaultClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkrecentchooserdefault.ui");
"/org/gtk/libgtk/ui/gtkrecentchooserdefault.ui");
gtk_widget_class_bind_template_child_private (widget_class, GtkRecentChooserDefault, filter_combo_hbox);
gtk_widget_class_bind_template_child_private (widget_class, GtkRecentChooserDefault, filter_combo);
......
......@@ -358,7 +358,7 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gtk/libgtk/gtkscalebutton.ui");
"/org/gtk/libgtk/ui/gtkscalebutton.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkScaleButton, plus_button);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkScaleButton, minus_button);
......
......@@ -421,7 +421,7 @@ gtk_search_bar_class_init (GtkSearchBarClass *klass)
g_object_class_install_properties (object_class, LAST_PROPERTY, widget_props);
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtksearchbar.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtksearchbar.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, tool_box);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, revealer);
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkSearchBar, box_center);
......
......@@ -179,7 +179,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkstatusbar.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkstatusbar.ui");
gtk_widget_class_bind_template_child_internal_private (widget_class, GtkStatusbar, message_area);
gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, frame);
gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, label);
......
......@@ -160,7 +160,7 @@ gtk_volume_button_class_init (GtkVolumeButtonClass *klass)
/* Bind class to template
*/
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/gtkvolumebutton.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtkvolumebutton.ui");
gtk_widget_class_bind_template_callback (widget_class, cb_query_tooltip);
gtk_widget_class_bind_template_callback (widget_class, cb_value_changed);
}
......
......@@ -49,42 +49,42 @@ examples/application9/prefs.ui
examples/application9/window.ui
examples/bloatpad.c
examples/plugman.c
gtk/gtkaboutdialog.ui
gtk/gtkaboutdialog.ui.h
gtk/gtkappchooserdialog.ui
gtk/gtkappchooserdialog.ui.h
gtk/gtkapplication-quartz.ui
gtk/gtkapplication-quartz.ui.h
gtk/gtkassistant.ui
gtk/gtkassistant.ui.h
gtk/gtkcolorchooserdialog.ui
gtk/gtkcolorchooserdialog.ui.h
gtk/gtkcoloreditor.ui
gtk/gtkcoloreditor.ui.h
gtk/gtkfilechooserbutton.ui
gtk/gtkfilechooserbutton.ui.h
gtk/gtkfilechooserdefault.ui
gtk/gtkfilechooserdefault.ui.h
gtk/gtkfontbutton.ui
gtk/gtkfontbutton.ui.h
gtk/gtkfontchooserdialog.ui
gtk/gtkfontchooserdialog.ui.h
gtk/gtkfontchooserwidget.ui
gtk/gtkfontchooserwidget.ui.h
gtk/gtklockbutton.ui
gtk/gtklockbutton.ui.h
gtk/gtkmessagedialog.ui
gtk/gtkmessagedialog.ui.h
gtk/gtkpagesetupunixdialog.ui
gtk/gtkpagesetupunixdialog.ui.h
gtk/gtkpathbar.ui
gtk/gtkpathbar.ui.h
gtk/gtkprintunixdialog.ui
gtk/gtkprintunixdialog.ui.h
gtk/gtkrecentchooserdefault.ui
gtk/gtkrecentchooserdefault.ui.h
gtk/gtkvolumebutton.ui
gtk/gtkvolumebutton.ui.h
gtk/resources/ui/gtkaboutdialog.ui
gtk/resources/ui/gtkaboutdialog.ui.h
gtk/resources/ui/gtkappchooserdialog.ui
gtk/resources/ui/gtkappchooserdialog.ui.h
gtk/resources/ui/gtkapplication-quartz.ui
gtk/resources/ui/gtkapplication-quartz.ui.h
gtk/resources/ui/gtkassistant.ui
gtk/resources/ui/gtkassistant.ui.h
gtk/resources/ui/gtkcolorchooserdialog.ui
gtk/resources/ui/gtkcolorchooserdialog.ui.h
gtk/resources/ui/gtkcoloreditor.ui
gtk/resources/ui/gtkcoloreditor.ui.h
gtk/resources/ui/gtkfilechooserbutton.ui
gtk/resources/ui/gtkfilechooserbutton.ui.h
gtk/resources/ui/gtkfilechooserdefault.ui
gtk/resources/ui/gtkfilechooserdefault.ui.h
gtk/resources/ui/gtkfontbutton.ui
gtk/resources/ui/gtkfontbutton.ui.h
gtk/resources/ui/gtkfontchooserdialog.ui
gtk/resources/ui/gtkfontchooserdialog.ui.h
gtk/resources/ui/gtkfontchooserwidget.ui
gtk/resources/ui/gtkfontchooserwidget.ui.h
gtk/resources/ui/gtklockbutton.ui
gtk/resources/ui/gtklockbutton.ui.h
gtk/resources/ui/gtkmessagedialog.ui
gtk/resources/ui/gtkmessagedialog.ui.h
gtk/resources/ui/gtkpagesetupunixdialog.ui
gtk/resources/ui/gtkpagesetupunixdialog.ui.h
gtk/resources/ui/gtkpathbar.ui
gtk/resources/ui/gtkpathbar.ui.h
gtk/resources/ui/gtkprintunixdialog.ui
gtk/resources/ui/gtkprintunixdialog.ui.h
gtk/resources/ui/gtkrecentchooserdefault.ui
gtk/resources/ui/gtkrecentchooserdefault.ui.h
gtk/resources/ui/gtkvolumebutton.ui
gtk/resources/ui/gtkvolumebutton.ui.h
tests/testfilechooser.c
testsuite/a11y/accessible-name.ui
testsuite/a11y/assistant.ui
......
......@@ -289,27 +289,27 @@ modules/printbackends/file/gtkprintbackendfile.c
modules/printbackends/lpr/gtkprintbackendlpr.c
modules/printbackends/papi/gtkprintbackendpapi.c
modules/printbackends/test/gtkprintbackendtest.c
gtk/gtkaboutdialog.ui.h
gtk/gtkappchooserdialog.ui.h
gtk/gtkappchooserwidget.ui.h
gtk/gtkapplication-quartz.ui.h
gtk/gtkassistant.ui.h
gtk/gtkcolorchooserdialog.ui.h
gtk/gtkcoloreditor.ui.h
gtk/gtkdialog.ui.h
gtk/gtkfilechooserbutton.ui.h
gtk/gtkfilechooserdefault.ui.h
gtk/gtkfilechooserdialog.ui.h
gtk/gtkfontbutton.ui.h
gtk/gtkfontchooserdialog.ui.h
gtk/gtkfontchooserwidget.ui.h
gtk/gtkinfobar.ui.h
gtk/gtklockbutton.ui.h
gtk/gtkmessagedialog.ui.h
gtk/gtkpagesetupunixdialog.ui.h
gtk/gtkpathbar.ui.h
gtk/gtkprintunixdialog.ui.h
gtk/gtkrecentchooserdefault.ui.h
gtk/gtkscalebutton.ui.h
gtk/gtkstatusbar.ui.h
gtk/gtkvolumebutton.ui.h
gtk/resources/ui/gtkaboutdialog.ui.h
gtk/resources/ui/gtkappchooserdialog.ui.h
gtk/resources/ui/gtkappchooserwidget.ui.h
gtk/resources/ui/gtkapplication-quartz.ui.h
gtk/resources/ui/gtkassistant.ui.h
gtk/resources/ui/gtkcolorchooserdialog.ui.h
gtk/resources/ui/gtkcoloreditor.ui.h
gtk/resources/ui/gtkdialog.ui.h
gtk/resources/ui/gtkfilechooserbutton.ui.h
gtk/resources/ui/gtkfilechooserdefault.ui.h
gtk/resources/ui/gtkfilechooserdialog.ui.h
gtk/resources/ui/gtkfontbutton.ui.h
gtk/resources/ui/gtkfontchooserdialog.ui.h
gtk/resources/ui/gtkfontchooserwidget.ui.h
gtk/resources/ui/gtkinfobar.ui.h
gtk/resources/ui/gtklockbutton.ui.h
gtk/resources/ui/gtkmessagedialog.ui.h
gtk/resources/ui/gtkpagesetupunixdialog.ui.h
gtk/resources/ui/gtkpathbar.ui.h
gtk/resources/ui/gtkprintunixdialog.ui.h
gtk/resources/ui/gtkrecentchooserdefault.ui.h
gtk/resources/ui/gtkscalebutton.ui.h
gtk/resources/ui/gtkstatusbar.ui.h
gtk/resources/ui/gtkvolumebutton.ui.h
......@@ -49,24 +49,24 @@ examples/application9/prefs.ui
examples/application9/window.ui
examples/bloatpad.c
examples/plugman.c
gtk/gtkaboutdialog.ui
gtk/gtkappchooserdialog.ui
gtk/gtkapplication-quartz.ui
gtk/gtkassistant.ui
gtk/gtkcolorchooserdialog.ui
gtk/gtkcoloreditor.ui
gtk/gtkfilechooserbutton.ui
gtk/gtkfilechooserdefault.ui
gtk/gtkfontbutton.ui
gtk/gtkfontchooserdialog.ui
gtk/gtkfontchooserwidget.ui
gtk/gtklockbutton.ui
gtk/gtkmessagedialog.ui
gtk/gtkpagesetupunixdialog.ui
gtk/gtkpathbar.ui
gtk/gtkprintunixdialog.ui
gtk/gtkrecentchooserdefault.ui
gtk/gtkvolumebutton.ui
gtk/resources/ui/gtkaboutdialog.ui
gtk/resources/ui/gtkappchooserdialog.ui
gtk/resources/ui/gtkapplication-quartz.ui
gtk/resources/ui/gtkassistant.ui
gtk/resources/ui/gtkcolorchooserdialog.ui
gtk/resources/ui/gtkcoloreditor.ui
gtk/resources/ui/gtkfilechooserbutton.ui
gtk/resources/ui/gtkfilechooserdefault.ui
gtk/resources/ui/gtkfontbutton.ui
gtk/resources/ui/gtkfontchooserdialog.ui
gtk/resources/ui/gtkfontchooserwidget.ui
gtk/resources/ui/gtklockbutton.ui