[nautilus] resources: organize the resource files in a separate folder
- From: Felipe Borges <felipeborges src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] resources: organize the resource files in a separate folder
- Date: Thu, 12 Nov 2015 13:30:11 +0000 (UTC)
commit be5a5e9e9f688c7df4685c611c6d298b3a3a15fa
Author: Felipe Borges <felipeborges gnome org>
Date: Thu Nov 12 11:51:22 2015 +0100
resources: organize the resource files in a separate folder
https://bugzilla.gnome.org/show_bug.cgi?id=757978
src/Makefile.am | 10 +++---
src/nautilus-application-actions.c | 2 +-
src/nautilus-application.c | 2 +-
src/nautilus-bookmarks-window.c | 2 +-
src/nautilus-file-management-properties.c | 2 +-
src/nautilus-files-view.c | 16 ++++++------
src/nautilus-pathbar.c | 2 +-
src/nautilus-progress-info-widget.c | 2 +-
src/nautilus-toolbar.c | 4 +-
src/nautilus-window.c | 2 +-
src/nautilus.gresource.xml | 27 --------------------
src/{ => resources/css}/Adwaita.css | 0
src/resources/nautilus.gresource.xml | 27 ++++++++++++++++++++
src/{ => resources/ui}/nautilus-app-menu.ui | 0
.../ui}/nautilus-bookmarks-window.ui | 0
.../ui}/nautilus-create-folder-dialog.ui | 0
.../ui}/nautilus-file-management-properties.ui | 0
.../ui/nautilus-files-view-context-menus.ui} | 0
src/{ => resources/ui}/nautilus-folder-is-empty.ui | 0
.../ui}/nautilus-move-to-trash-shortcut-changed.ui | 0
.../ui}/nautilus-no-search-results.ui | 0
.../ui/nautilus-pathbar-context-menu.ui} | 0
.../ui/nautilus-progress-info-widget.ui} | 0
.../ui}/nautilus-remote-warning-bar.ui | 0
.../ui}/nautilus-rename-file-popover.ui | 0
.../ui/nautilus-toolbar-action-menu.ui} | 0
.../ui/nautilus-toolbar-ui.ui} | 0
.../ui/nautilus-toolbar-view-menu.ui} | 0
src/{ => resources/ui}/nautilus-window.ui | 0
29 files changed, 49 insertions(+), 49 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 6ebc320..9cc1c42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -83,11 +83,11 @@ headers = \
nautilus-special-location-bar.h \
$(NULL)
-resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/nautilus.gresource.xml)
-nautilus-resources.c: nautilus.gresource.xml $(resource_files)
- glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name nautilus
$(srcdir)/nautilus.gresource.xml
-nautilus-resources.h: nautilus.gresource.xml $(resource_files)
- glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name nautilus
$(srcdir)/nautilus.gresource.xml
+resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir)/resources --generate-dependencies
$(srcdir)/resources/nautilus.gresource.xml)
+nautilus-resources.c: resources/nautilus.gresource.xml $(resource_files)
+ glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-source --c-name
nautilus $(srcdir)/resources/nautilus.gresource.xml
+nautilus-resources.h: resources/nautilus.gresource.xml $(resource_files)
+ glib-compile-resources --target=$@ --sourcedir=$(srcdir)/resources --generate-header --c-name
nautilus $(srcdir)/resources/nautilus.gresource.xml
nautilus-enum-types.h: stamp-nautilus-enum-types.h
$(AM_V_GEN)true
diff --git a/src/nautilus-application-actions.c b/src/nautilus-application-actions.c
index 9a4dfaa..0f30071 100644
--- a/src/nautilus-application-actions.c
+++ b/src/nautilus-application-actions.c
@@ -208,7 +208,7 @@ nautilus_init_application_actions (NautilusApplication *app)
app);
builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/nautilus-app-menu.ui", &error);
+ gtk_builder_add_from_resource (builder, "/org/gnome/nautilus/ui/nautilus-app-menu.ui", &error);
if (error == NULL) {
gtk_application_set_app_menu (GTK_APPLICATION (app),
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 2187692..2e3530b 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -979,7 +979,7 @@ theme_changed (GtkSettings *settings)
GFile *file;
provider = gtk_css_provider_new ();
- file = g_file_new_for_uri ("resource:///org/gnome/nautilus/Adwaita.css");
+ file = g_file_new_for_uri ("resource:///org/gnome/nautilus/css/Adwaita.css");
gtk_css_provider_load_from_file (provider, file, NULL);
g_object_unref (file);
}
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index d034544..c081d91 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -695,7 +695,7 @@ nautilus_bookmarks_window_constructed (GObject *object)
builder = gtk_builder_new ();
if (!gtk_builder_add_from_resource (builder,
- "/org/gnome/nautilus/nautilus-bookmarks-window.ui",
+ "/org/gnome/nautilus/ui/nautilus-bookmarks-window.ui",
&error)) {
g_object_unref (builder);
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index ee30b78..e9abf0a 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -659,7 +659,7 @@ nautilus_file_management_properties_dialog_show (GtkWindow *window)
builder = gtk_builder_new ();
gtk_builder_add_from_resource (builder,
- "/org/gnome/nautilus/nautilus-file-management-properties.ui",
+ "/org/gnome/nautilus/ui/nautilus-file-management-properties.ui",
NULL);
nautilus_file_management_properties_dialog_setup (builder, window);
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 813e55f..8f6fc37 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -1251,7 +1251,7 @@ action_show_move_to_trash_shortcut_changed_dialog (GSimpleAction *action,
show_dialog_preference = g_settings_get_boolean (nautilus_preferences,
NAUTILUS_PREFERENCES_SHOW_MOVE_TO_TRASH_SHORTCUT_CHANGED_DIALOG);
if (show_dialog_preference) {
- builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/nautilus-move-to-trash-shortcut-changed.ui");
+ builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/ui/nautilus-move-to-trash-shortcut-changed.ui");
dialog = GTK_WINDOW (gtk_builder_get_object (builder,
"move_to_trash_shortcut_changed_dialog"));
gtk_window_set_transient_for (dialog, GTK_WINDOW (nautilus_files_view_get_window (view)));
@@ -2062,7 +2062,7 @@ nautilus_files_view_rename_file_popover_new (NautilusFilesView *view,
if (view->details->rename_file_popover != NULL)
return;
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-rename-file-popover.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-rename-file-popover.ui");
label_file_name = GTK_WIDGET (gtk_builder_get_object (builder, "name_label"));
widget_data = g_new (FileNameWidgetData, 1);
@@ -2127,7 +2127,7 @@ nautilus_files_view_new_folder_dialog_new (NautilusFilesView *view,
GtkWidget *label_file_name;
GtkBuilder *builder;
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-create-folder-dialog.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-create-folder-dialog.ui");
label_file_name = GTK_WIDGET (gtk_builder_get_object (builder, "name_label"));
widget_data = g_new (FileNameWidgetData, 1);
@@ -6663,7 +6663,7 @@ real_update_context_menus (NautilusFilesView *view)
g_clear_object (&view->details->selection_menu);
GtkBuilder *builder;
- builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/nautilus-files-view-context-menus.xml");
+ builder = gtk_builder_new_from_resource
("/org/gnome/nautilus/ui/nautilus-files-view-context-menus.ui");
view->details->background_menu = g_object_ref (G_MENU (gtk_builder_get_object (builder,
"background-menu")));
view->details->selection_menu = g_object_ref (G_MENU (gtk_builder_get_object (builder,
"selection-menu")));
g_object_unref (builder);
@@ -7962,7 +7962,7 @@ nautilus_files_view_init (NautilusFilesView *view)
NautilusFilesViewDetails);
/* View menu */
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-toolbar-view-menu.xml");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-view-menu.ui");
view->details->view_menu_widget = g_object_ref (gtk_builder_get_object (builder,
"view_menu_widget"));
view->details->zoom_level_scale = GTK_WIDGET (gtk_builder_get_object (builder, "zoom_level_scale"));
view->details->zoom_adjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder,
"zoom_adjustment"));
@@ -7984,7 +7984,7 @@ nautilus_files_view_init (NautilusFilesView *view)
view->details->overlay = gtk_overlay_new ();
gtk_widget_set_vexpand (view->details->overlay, TRUE);
gtk_widget_set_hexpand (view->details->overlay, TRUE);
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-remote-warning-bar.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-remote-warning-bar.ui");
view->details->remote_warning_bar = GTK_WIDGET (gtk_builder_get_object (builder,
"remote_warning_bar"));
gtk_container_add (GTK_CONTAINER (view), view->details->overlay);
gtk_container_add (GTK_CONTAINER (view), view->details->remote_warning_bar);
@@ -8014,12 +8014,12 @@ nautilus_files_view_init (NautilusFilesView *view)
gtk_container_add (GTK_CONTAINER (view->details->overlay), view->details->scrolled_window);
/* Empty states */
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-no-search-results.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-no-search-results.ui");
view->details->no_search_results_widget = GTK_WIDGET (gtk_builder_get_object (builder,
"no_search_results"));
gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay),
view->details->no_search_results_widget);
g_object_unref (builder);
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-folder-is-empty.ui");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-folder-is-empty.ui");
view->details->folder_is_empty_widget = GTK_WIDGET (gtk_builder_get_object (builder,
"folder_is_empty"));
gtk_overlay_add_overlay (GTK_OVERLAY (view->details->overlay),
view->details->folder_is_empty_widget);
g_object_unref (builder);
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 8e8319a..057b842 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -303,7 +303,7 @@ nautilus_path_bar_init (NautilusPathBar *path_bar)
G_ACTION_GROUP (path_bar->priv->action_group));
/* Context menu */
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-pathbar-context-menu.xml");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-pathbar-context-menu.ui");
path_bar->priv->context_menu = g_object_ref (G_MENU (gtk_builder_get_object (builder,
"pathbar-menu")));
g_object_unref (builder);
diff --git a/src/nautilus-progress-info-widget.c b/src/nautilus-progress-info-widget.c
index 452284b..e1c71ac 100644
--- a/src/nautilus-progress-info-widget.c
+++ b/src/nautilus-progress-info-widget.c
@@ -183,7 +183,7 @@ nautilus_progress_info_widget_class_init (NautilusProgressInfoWidgetClass *klass
g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
gtk_widget_class_set_template_from_resource (widget_class,
- "/org/gnome/nautilus/nautilus-progress-info-widget.xml");
+
"/org/gnome/nautilus/ui/nautilus-progress-info-widget.ui");
gtk_widget_class_bind_template_child_private (widget_class, NautilusProgressInfoWidget, status);
gtk_widget_class_bind_template_child_private (widget_class, NautilusProgressInfoWidget, details);
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index 2f02e74..a57ade6 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -743,7 +743,7 @@ nautilus_toolbar_init (NautilusToolbar *self)
gtk_container_add (GTK_CONTAINER (self->priv->location_entry_container),
self->priv->location_entry);
- builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/nautilus-toolbar-action-menu.xml");
+ builder = gtk_builder_new_from_resource ("/org/gnome/nautilus/ui/nautilus-toolbar-action-menu.ui");
self->priv->action_menu = G_MENU (gtk_builder_get_object (builder, "action-menu"));
gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (self->priv->action_button),
G_MENU_MODEL (self->priv->action_menu));
@@ -858,7 +858,7 @@ nautilus_toolbar_class_init (NautilusToolbarClass *klass)
g_object_class_install_properties (oclass, NUM_PROPERTIES, properties);
gtk_widget_class_set_template_from_resource (widget_class,
- "/org/gnome/nautilus/nautilus-toolbar-ui.xml");
+ "/org/gnome/nautilus/ui/nautilus-toolbar-ui.ui");
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_button);
gtk_widget_class_bind_template_child_private (widget_class, NautilusToolbar, operations_icon);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 8e7230e..6a15bf2 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -2478,7 +2478,7 @@ nautilus_window_class_init (NautilusWindowClass *class)
class->close = real_window_close;
gtk_widget_class_set_template_from_resource (wclass,
- "/org/gnome/nautilus/nautilus-window.ui");
+ "/org/gnome/nautilus/ui/nautilus-window.ui");
gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, toolbar);
gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, content_paned);
gtk_widget_class_bind_template_child_private (wclass, NautilusWindow, sidebar);
diff --git a/src/Adwaita.css b/src/resources/css/Adwaita.css
similarity index 100%
rename from src/Adwaita.css
rename to src/resources/css/Adwaita.css
diff --git a/src/resources/nautilus.gresource.xml b/src/resources/nautilus.gresource.xml
new file mode 100644
index 0000000..a88b103
--- /dev/null
+++ b/src/resources/nautilus.gresource.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+ <gresource prefix="/org/gnome/nautilus">
+ <file compressed="true">ui/nautilus-bookmarks-window.ui</file>
+ <file compressed="true">ui/nautilus-file-management-properties.ui</file>
+ <file>ui/nautilus-app-menu.ui</file>
+ <file>ui/nautilus-pathbar-context-menu.ui</file>
+ <file>ui/nautilus-toolbar-ui.ui</file>
+ <file>ui/nautilus-toolbar-view-menu.ui</file>
+ <file>ui/nautilus-toolbar-action-menu.ui</file>
+ <file>ui/nautilus-create-folder-dialog.ui</file>
+ <file>ui/nautilus-rename-file-popover.ui</file>
+ <file>ui/nautilus-files-view-context-menus.ui</file>
+ <file>ui/nautilus-progress-info-widget.ui</file>
+ <file>ui/nautilus-move-to-trash-shortcut-changed.ui</file>
+ <file>ui/nautilus-window.ui</file>
+ <file>ui/nautilus-no-search-results.ui</file>
+ <file>ui/nautilus-folder-is-empty.ui</file>
+ <file>ui/nautilus-remote-warning-bar.ui</file>
+ <file alias="gtk/gtkplacesview.ui">../gtk/gtkplacesview.ui</file>
+ <file alias="gtk/gtkplacesviewrow.ui">../gtk/gtkplacesviewrow.ui</file>
+ <file alias="icons/thumbnail_frame.png">../../icons/thumbnail_frame.png</file>
+ <file alias="icons/filmholes.png">../../icons/filmholes.png</file>
+ <file alias="icons/knob.png">../../icons/knob.png</file>
+ <file>css/Adwaita.css</file>
+ </gresource>
+</gresources>
diff --git a/src/nautilus-app-menu.ui b/src/resources/ui/nautilus-app-menu.ui
similarity index 100%
rename from src/nautilus-app-menu.ui
rename to src/resources/ui/nautilus-app-menu.ui
diff --git a/src/nautilus-bookmarks-window.ui b/src/resources/ui/nautilus-bookmarks-window.ui
similarity index 100%
rename from src/nautilus-bookmarks-window.ui
rename to src/resources/ui/nautilus-bookmarks-window.ui
diff --git a/src/nautilus-create-folder-dialog.ui b/src/resources/ui/nautilus-create-folder-dialog.ui
similarity index 100%
rename from src/nautilus-create-folder-dialog.ui
rename to src/resources/ui/nautilus-create-folder-dialog.ui
diff --git a/src/nautilus-file-management-properties.ui
b/src/resources/ui/nautilus-file-management-properties.ui
similarity index 100%
rename from src/nautilus-file-management-properties.ui
rename to src/resources/ui/nautilus-file-management-properties.ui
diff --git a/src/nautilus-files-view-context-menus.xml b/src/resources/ui/nautilus-files-view-context-menus.ui
similarity index 100%
rename from src/nautilus-files-view-context-menus.xml
rename to src/resources/ui/nautilus-files-view-context-menus.ui
diff --git a/src/nautilus-folder-is-empty.ui b/src/resources/ui/nautilus-folder-is-empty.ui
similarity index 100%
rename from src/nautilus-folder-is-empty.ui
rename to src/resources/ui/nautilus-folder-is-empty.ui
diff --git a/src/nautilus-move-to-trash-shortcut-changed.ui
b/src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui
similarity index 100%
rename from src/nautilus-move-to-trash-shortcut-changed.ui
rename to src/resources/ui/nautilus-move-to-trash-shortcut-changed.ui
diff --git a/src/nautilus-no-search-results.ui b/src/resources/ui/nautilus-no-search-results.ui
similarity index 100%
rename from src/nautilus-no-search-results.ui
rename to src/resources/ui/nautilus-no-search-results.ui
diff --git a/src/nautilus-pathbar-context-menu.xml b/src/resources/ui/nautilus-pathbar-context-menu.ui
similarity index 100%
rename from src/nautilus-pathbar-context-menu.xml
rename to src/resources/ui/nautilus-pathbar-context-menu.ui
diff --git a/src/nautilus-progress-info-widget.xml b/src/resources/ui/nautilus-progress-info-widget.ui
similarity index 100%
rename from src/nautilus-progress-info-widget.xml
rename to src/resources/ui/nautilus-progress-info-widget.ui
diff --git a/src/nautilus-remote-warning-bar.ui b/src/resources/ui/nautilus-remote-warning-bar.ui
similarity index 100%
rename from src/nautilus-remote-warning-bar.ui
rename to src/resources/ui/nautilus-remote-warning-bar.ui
diff --git a/src/nautilus-rename-file-popover.ui b/src/resources/ui/nautilus-rename-file-popover.ui
similarity index 100%
rename from src/nautilus-rename-file-popover.ui
rename to src/resources/ui/nautilus-rename-file-popover.ui
diff --git a/src/nautilus-toolbar-action-menu.xml b/src/resources/ui/nautilus-toolbar-action-menu.ui
similarity index 100%
rename from src/nautilus-toolbar-action-menu.xml
rename to src/resources/ui/nautilus-toolbar-action-menu.ui
diff --git a/src/nautilus-toolbar-ui.xml b/src/resources/ui/nautilus-toolbar-ui.ui
similarity index 100%
rename from src/nautilus-toolbar-ui.xml
rename to src/resources/ui/nautilus-toolbar-ui.ui
diff --git a/src/nautilus-toolbar-view-menu.xml b/src/resources/ui/nautilus-toolbar-view-menu.ui
similarity index 100%
rename from src/nautilus-toolbar-view-menu.xml
rename to src/resources/ui/nautilus-toolbar-view-menu.ui
diff --git a/src/nautilus-window.ui b/src/resources/ui/nautilus-window.ui
similarity index 100%
rename from src/nautilus-window.ui
rename to src/resources/ui/nautilus-window.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
