Commit 05117474 authored by Michael Catanzaro's avatar Michael Catanzaro

Move all UI files under src/resources/gtk

parent acfe3978
......@@ -142,38 +142,37 @@ libephymain_la_LIBADD = \
$(WEBKIT2GTK_LIBS)
RESOURCE_FILES = \
resources/about.css \
resources/about.ini \
resources/channel-insecure-symbolic.png \
resources/computer-fail-symbolic.png \
resources/clear-data-dialog.ui \
resources/cookies-dialog.ui \
resources/encoding-dialog.ui \
resources/encoding-row.ui \
resources/epiphany-application-menu.ui \
resources/epiphany.css \
resources/error.css \
resources/error.html \
resources/gtk/menus.ui \
resources/gtk/page-menu-popover.ui \
resources/history-dialog.ui \
resources/incognito.png \
resources/mime-types-permissions.xml \
resources/missing-thumbnail.png \
resources/network-error-symbolic.png \
resources/passwords-dialog.ui \
resources/prefs-dialog.ui \
resources/prefs-lang-dialog.ui \
resources/prism.css \
resources/prism.js \
resources/shortcuts-dialog.ui \
resources/ephy-bookmark-tag-symbolic.svg \
resources/ephy-bookmarks-symbolic.svg \
resources/gtk/bookmark-properties-grid.ui \
resources/gtk/bookmark-row.ui \
resources/gtk/bookmarks-popover.ui \
resources/gtk/menus.ui \
$(NULL)
resources/about.css \
resources/about.ini \
resources/channel-insecure-symbolic.png \
resources/computer-fail-symbolic.png \
resources/ephy-bookmark-tag-symbolic.svg \
resources/ephy-bookmarks-symbolic.svg \
resources/epiphany.css \
resources/error.css \
resources/error.html \
resources/gtk/application-menu.ui \
resources/gtk/bookmark-properties-grid.ui \
resources/gtk/bookmark-row.ui \
resources/gtk/bookmarks-popover.ui \
resources/gtk/clear-data-dialog.ui \
resources/gtk/cookies-dialog.ui \
resources/gtk/encoding-dialog.ui \
resources/gtk/encoding-row.ui \
resources/gtk/history-dialog.ui \
resources/gtk/menus.ui \
resources/gtk/page-menu-popover.ui \
resources/gtk/passwords-dialog.ui \
resources/gtk/prefs-dialog.ui \
resources/gtk/prefs-lang-dialog.ui \
resources/gtk/shortcuts-dialog.ui \
resources/incognito.png \
resources/mime-types-permissions.xml \
resources/missing-thumbnail.png \
resources/network-error-symbolic.png \
resources/prism.css \
resources/prism.js
epiphany-resources.c: resources/epiphany.gresource.xml $(RESOURCE_FILES)
$(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source --c-name epiphany $(srcdir)/resources/epiphany.gresource.xml
......
......@@ -134,7 +134,7 @@ clear_data_dialog_class_init (ClearDataDialogClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/epiphany/clear-data-dialog.ui");
"/org/gnome/epiphany/gtk/clear-data-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, ClearDataDialog, cookies_checkbutton);
gtk_widget_class_bind_template_child (widget_class, ClearDataDialog, cache_checkbutton);
......
......@@ -237,7 +237,7 @@ ephy_cookies_dialog_class_init (EphyCookiesDialogClass *klass)
object_class->finalize = ephy_cookies_dialog_finalize;
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/epiphany/cookies-dialog.ui");
"/org/gnome/epiphany/gtk/cookies-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, EphyCookiesDialog, liststore);
gtk_widget_class_bind_template_child (widget_class, EphyCookiesDialog, treemodelfilter);
......
......@@ -501,7 +501,7 @@ ephy_encoding_dialog_class_init (EphyEncodingDialogClass *klass)
g_object_class_install_properties (object_class, LAST_PROP, obj_properties);
/* load from UI file */
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/epiphany/encoding-dialog.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/epiphany/gtk/encoding-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, EphyEncodingDialog, type_stack);
gtk_widget_class_bind_template_child (widget_class, EphyEncodingDialog, default_switch);
......
......@@ -134,7 +134,7 @@ ephy_encoding_row_class_init (EphyEncodingRowClass *klass)
g_object_class_install_properties (object_class, LAST_PROP, obj_properties);
/* load from UI file */
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/epiphany/encoding-row.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/epiphany/gtk/encoding-row.ui");
gtk_widget_class_bind_template_child (widget_class, EphyEncodingRow, encoding_label);
gtk_widget_class_bind_template_child (widget_class, EphyEncodingRow, selected_image);
......
......@@ -660,7 +660,7 @@ ephy_history_window_class_init (EphyHistoryWindowClass *klass)
g_object_class_install_properties (object_class, LAST_PROP, obj_properties);
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/epiphany/history-dialog.ui");
"/org/gnome/epiphany/gtk/history-dialog.ui");
gtk_widget_class_bind_template_child (widget_class, EphyHistoryWindow, liststore);
gtk_widget_class_bind_template_child (widget_class, EphyHistoryWindow, treeview);
gtk_widget_class_bind_template_child (widget_class, EphyHistoryWindow, tree_selection);
......
......@@ -353,7 +353,7 @@ ephy_shell_startup (GApplication *application)
builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder,
"/org/gnome/epiphany/epiphany-application-menu.ui",
"/org/gnome/epiphany/gtk/application-menu.ui",
NULL);
mode = ephy_embed_shell_get_mode (embed_shell);
......@@ -382,10 +382,6 @@ ephy_shell_startup (GApplication *application)
G_CALLBACK (sync_tokens_load_finished_cb), NULL);
#endif
builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder,
"/org/gnome/epiphany/epiphany-application-menu.ui",
NULL);
gtk_application_set_app_menu (GTK_APPLICATION (application),
G_MENU_MODEL (gtk_builder_get_object (builder, "app-menu")));
} else {
......
......@@ -569,7 +569,7 @@ prefs_dialog_class_init (PrefsDialogClass *klass)
object_class->finalize = prefs_dialog_finalize;
gtk_widget_class_set_template_from_resource (widget_class,
"/org/gnome/epiphany/prefs-dialog.ui");
"/org/gnome/epiphany/gtk/prefs-dialog.ui");
/* general */
gtk_widget_class_bind_template_child (widget_class, PrefsDialog, new_tab_homepage_radiobutton);
gtk_widget_class_bind_template_child (widget_class, PrefsDialog, blank_homepage_radiobutton);
......@@ -938,7 +938,7 @@ setup_add_language_dialog (PrefsDialog *dialog)
guint i;
GtkBuilder *builder;
builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/prefs-lang-dialog.ui");
builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/prefs-lang-dialog.ui");
ad = GTK_WIDGET (gtk_builder_get_object (builder, "add_language_dialog"));
add_button = GTK_WIDGET (gtk_builder_get_object (builder, "add_button"));
treeview = GTK_TREE_VIEW (gtk_builder_get_object (builder, "languages_treeview"));
......
......@@ -14,21 +14,21 @@
<file alias="page-templates/error.css" compressed="true">error.css</file>
<file alias="page-templates/error.html" compressed="true">error.html</file>
<file preprocess="xml-stripblanks" compressed="true">mime-types-permissions.xml</file>
<file preprocess="xml-stripblanks" compressed="true">clear-data-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">cookies-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">encoding-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">encoding-row.ui</file>
<file preprocess="xml-stripblanks" compressed="true">epiphany-application-menu.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/application-menu.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-properties-grid.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/bookmark-row.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/bookmarks-popover.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/clear-data-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/cookies-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/encoding-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/encoding-row.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/history-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/menus.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/page-menu-popover.ui</file>
<file preprocess="xml-stripblanks" compressed="true">history-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">passwords-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">prefs-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">prefs-lang-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">shortcuts-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/passwords-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/prefs-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/prefs-lang-dialog.ui</file>
<file preprocess="xml-stripblanks" compressed="true">gtk/shortcuts-dialog.ui</file>
</gresource>
<gresource prefix="/org/gnome/Epiphany/icons">
<file compressed="true" alias="scalable/actions/ephy-bookmarks-symbolic.svg">ephy-bookmarks-symbolic.svg</file>
......
......@@ -536,7 +536,7 @@ window_cmd_show_shortcuts (GSimpleAction *action,
if (shortcuts_window == NULL) {
GtkBuilder *builder;
builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/shortcuts-dialog.ui");
builder = gtk_builder_new_from_resource ("/org/gnome/epiphany/gtk/shortcuts-dialog.ui");
shortcuts_window = GTK_WIDGET (gtk_builder_get_object (builder, "shortcuts-dialog"));
g_signal_connect (shortcuts_window,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment