GNOME.org
 

[epiphany] Move all UI files under src/resources/gtk

commit 051174744b2331413cd128648d4d52505f28596c
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Jan 16 19:19:20 2017 -0600

    Move all UI files under src/resources/gtk

 src/Makefile.am                                    |   63 ++++++++++----------
 src/clear-data-dialog.c                            |    2 +-
 src/cookies-dialog.c                               |    2 +-
 src/ephy-encoding-dialog.c                         |    2 +-
 src/ephy-encoding-row.c                            |    2 +-
 src/ephy-history-window.c                          |    2 +-
 src/ephy-shell.c                                   |    6 +--
 src/prefs-dialog.c                                 |    4 +-
 src/resources/epiphany.gresource.xml               |   20 +++---
 .../application-menu.ui}                           |    0
 src/resources/{ => gtk}/clear-data-dialog.ui       |    0
 src/resources/{ => gtk}/cookies-dialog.ui          |    0
 src/resources/{ => gtk}/encoding-dialog.ui         |    0
 src/resources/{ => gtk}/encoding-row.ui            |    0
 src/resources/{ => gtk}/history-dialog.ui          |    0
 src/resources/{ => gtk}/passwords-dialog.ui        |    0
 src/resources/{ => gtk}/prefs-dialog.ui            |    0
 src/resources/{ => gtk}/prefs-lang-dialog.ui       |    0
 src/resources/{ => gtk}/shortcuts-dialog.ui        |    0
 src/window-commands.c                              |    2 +-
 20 files changed, 50 insertions(+), 55 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ea316e7..1f0d1f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
diff --git a/src/clear-data-dialog.c b/src/clear-data-dialog.c
index fa39b1b..4f38df8 100644
--- a/src/clear-data-dialog.c
+++ b/src/clear-data-dialog.c
@@ -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);
diff --git a/src/cookies-dialog.c b/src/cookies-dialog.c
index b8e1384..b124b27 100644
--- a/src/cookies-dialog.c
+++ b/src/cookies-dialog.c
@@ -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);
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index d35a573..0f76cbe 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -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);
diff --git a/src/ephy-encoding-row.c b/src/ephy-encoding-row.c
index a109fbf..2779767 100644
--- a/src/ephy-encoding-row.c
+++ b/src/ephy-encoding-row.c
@@ -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);
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index e8a39d2..4bc4094 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -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);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 486517c..c2cd61c 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -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 {
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index a89bc51..d5ae902 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -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"));
diff --git a/src/resources/epiphany.gresource.xml b/src/resources/epiphany.gresource.xml
index 8edcf2b..eca494b 100644
--- a/src/resources/epiphany.gresource.xml
+++ b/src/resources/epiphany.gresource.xml
@@ -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>
diff --git a/src/resources/epiphany-application-menu.ui b/src/resources/gtk/application-menu.ui
similarity index 100%
rename from src/resources/epiphany-application-menu.ui
rename to src/resources/gtk/application-menu.ui
diff --git a/src/resources/clear-data-dialog.ui b/src/resources/gtk/clear-data-dialog.ui
similarity index 100%
rename from src/resources/clear-data-dialog.ui
rename to src/resources/gtk/clear-data-dialog.ui
diff --git a/src/resources/cookies-dialog.ui b/src/resources/gtk/cookies-dialog.ui
similarity index 100%
rename from src/resources/cookies-dialog.ui
rename to src/resources/gtk/cookies-dialog.ui
diff --git a/src/resources/encoding-dialog.ui b/src/resources/gtk/encoding-dialog.ui
similarity index 100%
rename from src/resources/encoding-dialog.ui
rename to src/resources/gtk/encoding-dialog.ui
diff --git a/src/resources/encoding-row.ui b/src/resources/gtk/encoding-row.ui
similarity index 100%
rename from src/resources/encoding-row.ui
rename to src/resources/gtk/encoding-row.ui
diff --git a/src/resources/history-dialog.ui b/src/resources/gtk/history-dialog.ui
similarity index 100%
rename from src/resources/history-dialog.ui
rename to src/resources/gtk/history-dialog.ui
diff --git a/src/resources/passwords-dialog.ui b/src/resources/gtk/passwords-dialog.ui
similarity index 100%
rename from src/resources/passwords-dialog.ui
rename to src/resources/gtk/passwords-dialog.ui
diff --git a/src/resources/prefs-dialog.ui b/src/resources/gtk/prefs-dialog.ui
similarity index 100%
rename from src/resources/prefs-dialog.ui
rename to src/resources/gtk/prefs-dialog.ui
diff --git a/src/resources/prefs-lang-dialog.ui b/src/resources/gtk/prefs-lang-dialog.ui
similarity index 100%
rename from src/resources/prefs-lang-dialog.ui
rename to src/resources/gtk/prefs-lang-dialog.ui
diff --git a/src/resources/shortcuts-dialog.ui b/src/resources/gtk/shortcuts-dialog.ui
similarity index 100%
rename from src/resources/shortcuts-dialog.ui
rename to src/resources/gtk/shortcuts-dialog.ui
diff --git a/src/window-commands.c b/src/window-commands.c
index f712bb3..5559841 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -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,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]