[glom] Move icons/ and ui/ in to data/

From: Murray Cumming <murrayc src gnome org>
To: commits-list gnome org
Cc:
Subject: [glom] Move icons/ and ui/ in to data/
Date: Tue, 22 Oct 2013 11:38:49 +0000 (UTC)
commit 868f3322278c531cbde9b2dd76e726a3dcd63b88
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 22 11:56:25 2013 +0200

    Move icons/ and ui/ in to data/
    
    Because this is common in GNOME applications.

 Makefile.am                                        |  142 ++++++++++----------
 Makefile_glom.am                                   |   12 +-
 {icons => data/icons}/16x16/glom.png               |  Bin 688 -> 688 bytes
 {icons => data/icons}/16x16/glom.svg               |    0
 {icons => data/icons}/22x22/glom.png               |  Bin 952 -> 952 bytes
 {icons => data/icons}/22x22/glom.svg               |    0
 {icons => data/icons}/24x24/glom.png               |  Bin 961 -> 961 bytes
 {icons => data/icons}/32x32/glom.png               |  Bin 1639 -> 1639 bytes
 {icons => data/icons}/32x32/glom.svg               |    0
 {icons => data/icons}/48x48/glom.png               |  Bin 2567 -> 2567 bytes
 {icons => data/icons}/glom-button.png              |  Bin 220 -> 220 bytes
 {icons => data/icons}/glom-field.png               |  Bin 128 -> 128 bytes
 {icons => data/icons}/glom-group.png               |  Bin 137 -> 137 bytes
 data/icons/glom-icons.gresource.xml                |   22 +++
 {icons => data/icons}/glom-image.png               |  Bin 367 -> 367 bytes
 {icons => data/icons}/glom-line-horizontal.png     |  Bin 610 -> 610 bytes
 {icons => data/icons}/glom-line-vertical.png       |  Bin 615 -> 615 bytes
 {icons => data/icons}/glom-notebook.png            |  Bin 166 -> 166 bytes
 {icons => data/icons}/glom-related-records.png     |  Bin 221 -> 221 bytes
 {icons => data/icons}/glom-text.png                |  Bin 113 -> 113 bytes
 {icons => data/icons}/glom_icon_large.png          |  Bin 14655 -> 14655 bytes
 {icons => data/icons}/scalable/glom.svg            |    0
 {icons => data/icons}/win32/glom.ico               |  Bin 9662 -> 9662 bytes
 {ui => data/ui}/developer/box_formatting.glade     |    0
 {ui => data/ui}/developer/box_print_layouts.glade  |    0
 {ui => data/ui}/developer/box_reports.glade        |    0
 .../ui}/developer/dialog_add_related_table.glade   |    0
 .../ui}/developer/dialog_change_language.glade     |    0
 .../ui}/developer/dialog_choose_field.glade        |    0
 .../ui}/developer/dialog_choose_relationship.glade |    0
 {ui => data/ui}/developer/dialog_choose_user.glade |    0
 .../developer/dialog_database_preferences.glade    |    0
 .../developer/dialog_error_create_database.glade   |    0
 .../ui}/developer/dialog_field_summary.glade       |    0
 {ui => data/ui}/developer/dialog_fieldslist.glade  |    0
 {ui => data/ui}/developer/dialog_flowtable.glade   |    0
 {ui => data/ui}/developer/dialog_group_by.glade    |    0
 .../ui}/developer/dialog_initial_password.glade    |    0
 .../developer/dialog_layout_field_properties.glade |    0
 {ui => data/ui}/developer/dialog_line.glade        |    0
 {ui => data/ui}/developer/dialog_new_group.glade   |    0
 .../ui}/developer/dialog_new_library_script.glade  |    0
 {ui => data/ui}/developer/dialog_notebook.glade    |    0
 .../developer/dialog_relationships_overview.glade  |    0
 .../ui}/developer/dialog_script_library.glade      |    0
 {ui => data/ui}/developer/dialog_sort_fields.glade |    0
 .../ui}/developer/dialog_translation_copy.glade    |    0
 .../dialog_translation_identify_original.glade     |    0
 {ui => data/ui}/developer/dialog_user.glade        |    0
 .../ui}/developer/window_button_script.glade       |    0
 {ui => data/ui}/developer/window_data_layout.glade |    0
 .../ui}/developer/window_data_layout_export.glade  |    0
 {ui => data/ui}/developer/window_design.glade      |    0
 .../ui}/developer/window_field_calculation.glade   |    0
 .../developer/window_field_definition_edit.glade   |    0
 {ui => data/ui}/developer/window_groups.glade      |    0
 {ui => data/ui}/developer/window_imageobject.glade |    0
 .../ui}/developer/window_print_layout_edit.glade   |    0
 .../ui}/developer/window_report_layout.glade       |    0
 {ui => data/ui}/developer/window_text_format.glade |    0
 {ui => data/ui}/developer/window_textobject.glade  |    0
 .../ui}/developer/window_translations.glade        |    0
 {ui => data/ui}/developer/window_users.glade       |    0
 data/ui/glom-ui.gresource.xml                      |   65 +++++++++
 .../ui}/operator/box_navigation_tables.glade       |    0
 {ui => data/ui}/operator/dialog_choose_date.glade  |    0
 {ui => data/ui}/operator/dialog_connection.glade   |    0
 .../ui}/operator/dialog_data_invalid_format.glade  |    0
 .../ui}/operator/dialog_existing_or_new.glade      |    0
 {ui => data/ui}/operator/dialog_find_id.glade      |    0
 .../ui}/operator/dialog_image_load_progress.glade  |    0
 .../ui}/operator/dialog_image_save_progress.glade  |    0
 {ui => data/ui}/operator/dialog_import_csv.glade   |    0
 .../ui}/operator/dialog_import_csv_progress.glade  |    0
 {ui => data/ui}/operator/dialog_new_record.glade   |    0
 {ui => data/ui}/operator/window_main.glade         |    0
 glom/glade_utils.h                                 |    2 +-
 glom/utils_ui.cc                                   |    2 +-
 icons/glom-icons.gresource.xml                     |   22 ---
 ui/glom-ui.gresource.xml                           |   65 ---------
 80 files changed, 168 insertions(+), 164 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2980a2b..1b7571f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -102,60 +102,60 @@ dist_pkgdata_DATA = glom/glom_document.dtd
 
 
 EXTRA_DIST += \
-       ui/operator/box_navigation_tables.glade \
-       ui/operator/dialog_choose_date.glade \
-       ui/operator/dialog_connection.glade \
-       ui/operator/dialog_data_invalid_format.glade \
-       ui/operator/dialog_existing_or_new.glade \
-       ui/operator/dialog_find_id.glade \
-       ui/operator/dialog_image_load_progress.glade \
-       ui/operator/dialog_image_save_progress.glade \
-       ui/operator/dialog_import_csv.glade \
-       ui/operator/dialog_import_csv_progress.glade \
-       ui/operator/dialog_new_record.glade \
-       ui/operator/window_main.glade
+       data/ui/operator/box_navigation_tables.glade \
+       data/ui/operator/dialog_choose_date.glade \
+       data/ui/operator/dialog_connection.glade \
+       data/ui/operator/dialog_data_invalid_format.glade \
+       data/ui/operator/dialog_existing_or_new.glade \
+       data/ui/operator/dialog_find_id.glade \
+       data/ui/operator/dialog_image_load_progress.glade \
+       data/ui/operator/dialog_image_save_progress.glade \
+       data/ui/operator/dialog_import_csv.glade \
+       data/ui/operator/dialog_import_csv_progress.glade \
+       data/ui/operator/dialog_new_record.glade \
+       data/ui/operator/window_main.glade
                
 EXTRA_DIST += \
-       ui/developer/dialog_add_related_table.glade \
-       ui/developer/dialog_change_language.glade \
-       ui/developer/dialog_choose_field.glade \
-       ui/developer/dialog_choose_relationship.glade \
-       ui/developer/dialog_choose_user.glade \
-       ui/developer/dialog_database_preferences.glade \
-       ui/developer/dialog_error_create_database.glade \
-       ui/developer/dialog_fieldslist.glade \
-       ui/developer/dialog_field_summary.glade \
-       ui/developer/dialog_flowtable.glade \
-       ui/developer/dialog_group_by.glade \
-       ui/developer/dialog_initial_password.glade \
-       ui/developer/dialog_line.glade \
-       ui/developer/dialog_layout_field_properties.glade \
-       ui/developer/dialog_new_group.glade \
-       ui/developer/dialog_new_library_script.glade \
-       ui/developer/dialog_notebook.glade \
-       ui/developer/dialog_relationships_overview.glade \
-       ui/developer/dialog_script_library.glade \
-       ui/developer/dialog_sort_fields.glade \
-       ui/developer/dialog_translation_copy.glade \
-       ui/developer/dialog_translation_identify_original.glade \
-       ui/developer/dialog_user.glade \
-       ui/developer/window_button_script.glade \
-       ui/developer/window_data_layout_export.glade \
-       ui/developer/window_data_layout.glade \
-       ui/developer/window_design.glade \
-       ui/developer/window_field_calculation.glade \
-       ui/developer/window_field_definition_edit.glade \
-       ui/developer/box_formatting.glade \
-       ui/developer/window_groups.glade \
-       ui/developer/window_imageobject.glade \
-       ui/developer/window_print_layout_edit.glade \
-       ui/developer/box_print_layouts.glade \
-       ui/developer/window_report_layout.glade \
-       ui/developer/box_reports.glade \
-       ui/developer/window_text_format.glade \
-       ui/developer/window_textobject.glade \
-       ui/developer/window_translations.glade \
-       ui/developer/window_users.glade
+       data/ui/developer/dialog_add_related_table.glade \
+       data/ui/developer/dialog_change_language.glade \
+       data/ui/developer/dialog_choose_field.glade \
+       data/ui/developer/dialog_choose_relationship.glade \
+       data/ui/developer/dialog_choose_user.glade \
+       data/ui/developer/dialog_database_preferences.glade \
+       data/ui/developer/dialog_error_create_database.glade \
+       data/ui/developer/dialog_fieldslist.glade \
+       data/ui/developer/dialog_field_summary.glade \
+       data/ui/developer/dialog_flowtable.glade \
+       data/ui/developer/dialog_group_by.glade \
+       data/ui/developer/dialog_initial_password.glade \
+       data/ui/developer/dialog_line.glade \
+       data/ui/developer/dialog_layout_field_properties.glade \
+       data/ui/developer/dialog_new_group.glade \
+       data/ui/developer/dialog_new_library_script.glade \
+       data/ui/developer/dialog_notebook.glade \
+       data/ui/developer/dialog_relationships_overview.glade \
+       data/ui/developer/dialog_script_library.glade \
+       data/ui/developer/dialog_sort_fields.glade \
+       data/ui/developer/dialog_translation_copy.glade \
+       data/ui/developer/dialog_translation_identify_original.glade \
+       data/ui/developer/dialog_user.glade \
+       data/ui/developer/window_button_script.glade \
+       data/ui/developer/window_data_layout_export.glade \
+       data/ui/developer/window_data_layout.glade \
+       data/ui/developer/window_design.glade \
+       data/ui/developer/window_field_calculation.glade \
+       data/ui/developer/window_field_definition_edit.glade \
+       data/ui/developer/box_formatting.glade \
+       data/ui/developer/window_groups.glade \
+       data/ui/developer/window_imageobject.glade \
+       data/ui/developer/window_print_layout_edit.glade \
+       data/ui/developer/box_print_layouts.glade \
+       data/ui/developer/window_report_layout.glade \
+       data/ui/developer/box_reports.glade \
+       data/ui/developer/window_text_format.glade \
+       data/ui/developer/window_textobject.glade \
+       data/ui/developer/window_translations.glade \
+       data/ui/developer/window_users.glade
 
 xsltdir = $(pkgdatadir)/xslt
 dist_xslt_DATA = xslt/print_report_to_html.xsl
@@ -190,27 +190,31 @@ appicon32dir = $(iconthemedir)/32x32/apps
 appicon48dir = $(iconthemedir)/48x48/apps
 appiconscdir = $(iconthemedir)/scalable/apps
 
-dist_appicon16_DATA = icons/16x16/glom.png
-dist_appicon22_DATA = icons/22x22/glom.png
-dist_appicon24_DATA = icons/24x24/glom.png
-dist_appicon32_DATA = icons/32x32/glom.png
-dist_appicon48_DATA = icons/48x48/glom.png
-dist_appiconsc_DATA = icons/scalable/glom.svg
+dist_appicon16_DATA = data/icons/16x16/glom.png
+dist_appicon22_DATA = data/icons/22x22/glom.png
+dist_appicon24_DATA = data/icons/24x24/glom.png
+dist_appicon32_DATA = data/icons/32x32/glom.png
+dist_appicon48_DATA = data/icons/48x48/glom.png
+dist_appiconsc_DATA = data/icons/scalable/glom.svg
 
-noinst_icons = icons/16x16/glom.svg icons/22x22/glom.svg icons/32x32/glom.svg icons/win32/glom.ico
+noinst_icons = \
+       data/icons/16x16/glom.svg \
+       data/icons/22x22/glom.svg \
+       data/icons/32x32/glom.svg \
+       data/icons/win32/glom.ico
 
 # These icons are used for toolpalette buttons, and an about dialog:
 icons_for_resources = \
-       icons/glom-button.png           \
-       icons/glom-field.png            \
-       icons/glom-group.png            \
-       icons/glom-image.png            \
-       icons/glom-line-horizontal.png  \
-       icons/glom-line-vertical.png    \
-       icons/glom-notebook.png         \
-       icons/glom-related-records.png  \
-       icons/glom-text.png \
-       icons/48x48/glom.png
+       data/icons/glom-button.png \
+       data/icons/glom-field.png \
+       data/icons/glom-group.png \
+       data/icons/glom-image.png \
+       data/icons/glom-line-horizontal.png \
+       data/icons/glom-line-vertical.png \
+       data/icons/glom-notebook.png \
+       data/icons/glom-related-records.png \
+       data/icons/glom-text.png \
+       data/icons/48x48/glom.png
 
 EXTRA_DIST += $(icons_for_resources)
 
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 9da5182..3b67e57 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -30,9 +30,9 @@ glom_glom_CPPFLAGS = $(glom_includes) $(GLOM_CFLAGS) $(PYTHON_CPPFLAGS) $(BOOST_
 
 # Generate the GResource source file for .glade files:
 # TODO: Do not use all .glade files in the client-only build.
-glom_ui_resource_file = ui/glom-ui.gresource.xml
-BUILT_SOURCES = ui/glom-ui-resources.c
-ui/glom-ui-resources.c: $(glom_ui_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies 
$(glom_ui_resource_file))
+glom_ui_resource_file = data/ui/glom-ui.gresource.xml
+BUILT_SOURCES = data/ui/glom-ui-resources.c
+data/ui/glom-ui-resources.c: $(glom_ui_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_ui_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_ui_resource_file)
 
 # Generate the GResource source file for example .glom files:
@@ -42,9 +42,9 @@ examples/glom-examples-resources.c: $(glom_examples_resource_file) $(shell $(GLI
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_examples_resource_file)
 
 # Generate the GResource source file for icon files:
-glom_icons_resource_file = icons/glom-icons.gresource.xml
-BUILT_SOURCES += icons/glom-icons-resources.c
-icons/glom-icons-resources.c: $(glom_icons_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_icons_resource_file))
+glom_icons_resource_file = data/icons/glom-icons.gresource.xml
+BUILT_SOURCES += data/icons/glom-icons-resources.c
+data/icons/glom-icons-resources.c: $(glom_icons_resource_file) $(shell $(GLIB_COMPILE_RESOURCES) 
--generate-dependencies $(glom_icons_resource_file))
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source 
$(glom_icons_resource_file)
 
 EXTRA_DIST = \
diff --git a/icons/16x16/glom.svg b/data/icons/16x16/glom.svg
similarity index 100%
rename from icons/16x16/glom.svg
rename to data/icons/16x16/glom.svg
diff --git a/icons/22x22/glom.svg b/data/icons/22x22/glom.svg
similarity index 100%
rename from icons/22x22/glom.svg
rename to data/icons/22x22/glom.svg
diff --git a/icons/32x32/glom.svg b/data/icons/32x32/glom.svg
similarity index 100%
rename from icons/32x32/glom.svg
rename to data/icons/32x32/glom.svg
diff --git a/data/icons/glom-icons.gresource.xml b/data/icons/glom-icons.gresource.xml
new file mode 100644
index 0000000..da90473
--- /dev/null
+++ b/data/icons/glom-icons.gresource.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/glom">
+    <file>data/icons/glom-button.png</file>
+    <file>data/icons/glom-field.png</file>
+    <file>data/icons/glom-group.png</file>
+    <file>data/icons/glom-image.png</file>
+    <file>data/icons/glom-line-horizontal.png</file>
+    <file>data/icons/glom-line-vertical.png</file>
+    <file>data/icons/glom-notebook.png</file>
+    <file>data/icons/glom-related-records.png</file>
+    <file>data/icons/glom-text.png</file>
+    <file>data/icons/48x48/glom.png</file>
+  </gresource>
+</gresources>
+
+
+
+
+ 
+
+
diff --git a/icons/scalable/glom.svg b/data/icons/scalable/glom.svg
similarity index 100%
rename from icons/scalable/glom.svg
rename to data/icons/scalable/glom.svg
diff --git a/ui/developer/box_formatting.glade b/data/ui/developer/box_formatting.glade
similarity index 100%
rename from ui/developer/box_formatting.glade
rename to data/ui/developer/box_formatting.glade
diff --git a/ui/developer/box_print_layouts.glade b/data/ui/developer/box_print_layouts.glade
similarity index 100%
rename from ui/developer/box_print_layouts.glade
rename to data/ui/developer/box_print_layouts.glade
diff --git a/ui/developer/box_reports.glade b/data/ui/developer/box_reports.glade
similarity index 100%
rename from ui/developer/box_reports.glade
rename to data/ui/developer/box_reports.glade
diff --git a/ui/developer/dialog_add_related_table.glade b/data/ui/developer/dialog_add_related_table.glade
similarity index 100%
rename from ui/developer/dialog_add_related_table.glade
rename to data/ui/developer/dialog_add_related_table.glade
diff --git a/ui/developer/dialog_change_language.glade b/data/ui/developer/dialog_change_language.glade
similarity index 100%
rename from ui/developer/dialog_change_language.glade
rename to data/ui/developer/dialog_change_language.glade
diff --git a/ui/developer/dialog_choose_field.glade b/data/ui/developer/dialog_choose_field.glade
similarity index 100%
rename from ui/developer/dialog_choose_field.glade
rename to data/ui/developer/dialog_choose_field.glade
diff --git a/ui/developer/dialog_choose_relationship.glade 
b/data/ui/developer/dialog_choose_relationship.glade
similarity index 100%
rename from ui/developer/dialog_choose_relationship.glade
rename to data/ui/developer/dialog_choose_relationship.glade
diff --git a/ui/developer/dialog_choose_user.glade b/data/ui/developer/dialog_choose_user.glade
similarity index 100%
rename from ui/developer/dialog_choose_user.glade
rename to data/ui/developer/dialog_choose_user.glade
diff --git a/ui/developer/dialog_database_preferences.glade 
b/data/ui/developer/dialog_database_preferences.glade
similarity index 100%
rename from ui/developer/dialog_database_preferences.glade
rename to data/ui/developer/dialog_database_preferences.glade
diff --git a/ui/developer/dialog_error_create_database.glade 
b/data/ui/developer/dialog_error_create_database.glade
similarity index 100%
rename from ui/developer/dialog_error_create_database.glade
rename to data/ui/developer/dialog_error_create_database.glade
diff --git a/ui/developer/dialog_field_summary.glade b/data/ui/developer/dialog_field_summary.glade
similarity index 100%
rename from ui/developer/dialog_field_summary.glade
rename to data/ui/developer/dialog_field_summary.glade
diff --git a/ui/developer/dialog_fieldslist.glade b/data/ui/developer/dialog_fieldslist.glade
similarity index 100%
rename from ui/developer/dialog_fieldslist.glade
rename to data/ui/developer/dialog_fieldslist.glade
diff --git a/ui/developer/dialog_flowtable.glade b/data/ui/developer/dialog_flowtable.glade
similarity index 100%
rename from ui/developer/dialog_flowtable.glade
rename to data/ui/developer/dialog_flowtable.glade
diff --git a/ui/developer/dialog_group_by.glade b/data/ui/developer/dialog_group_by.glade
similarity index 100%
rename from ui/developer/dialog_group_by.glade
rename to data/ui/developer/dialog_group_by.glade
diff --git a/ui/developer/dialog_initial_password.glade b/data/ui/developer/dialog_initial_password.glade
similarity index 100%
rename from ui/developer/dialog_initial_password.glade
rename to data/ui/developer/dialog_initial_password.glade
diff --git a/ui/developer/dialog_layout_field_properties.glade 
b/data/ui/developer/dialog_layout_field_properties.glade
similarity index 100%
rename from ui/developer/dialog_layout_field_properties.glade
rename to data/ui/developer/dialog_layout_field_properties.glade
diff --git a/ui/developer/dialog_line.glade b/data/ui/developer/dialog_line.glade
similarity index 100%
rename from ui/developer/dialog_line.glade
rename to data/ui/developer/dialog_line.glade
diff --git a/ui/developer/dialog_new_group.glade b/data/ui/developer/dialog_new_group.glade
similarity index 100%
rename from ui/developer/dialog_new_group.glade
rename to data/ui/developer/dialog_new_group.glade
diff --git a/ui/developer/dialog_new_library_script.glade b/data/ui/developer/dialog_new_library_script.glade
similarity index 100%
rename from ui/developer/dialog_new_library_script.glade
rename to data/ui/developer/dialog_new_library_script.glade
diff --git a/ui/developer/dialog_notebook.glade b/data/ui/developer/dialog_notebook.glade
similarity index 100%
rename from ui/developer/dialog_notebook.glade
rename to data/ui/developer/dialog_notebook.glade
diff --git a/ui/developer/dialog_relationships_overview.glade 
b/data/ui/developer/dialog_relationships_overview.glade
similarity index 100%
rename from ui/developer/dialog_relationships_overview.glade
rename to data/ui/developer/dialog_relationships_overview.glade
diff --git a/ui/developer/dialog_script_library.glade b/data/ui/developer/dialog_script_library.glade
similarity index 100%
rename from ui/developer/dialog_script_library.glade
rename to data/ui/developer/dialog_script_library.glade
diff --git a/ui/developer/dialog_sort_fields.glade b/data/ui/developer/dialog_sort_fields.glade
similarity index 100%
rename from ui/developer/dialog_sort_fields.glade
rename to data/ui/developer/dialog_sort_fields.glade
diff --git a/ui/developer/dialog_translation_copy.glade b/data/ui/developer/dialog_translation_copy.glade
similarity index 100%
rename from ui/developer/dialog_translation_copy.glade
rename to data/ui/developer/dialog_translation_copy.glade
diff --git a/ui/developer/dialog_translation_identify_original.glade 
b/data/ui/developer/dialog_translation_identify_original.glade
similarity index 100%
rename from ui/developer/dialog_translation_identify_original.glade
rename to data/ui/developer/dialog_translation_identify_original.glade
diff --git a/ui/developer/dialog_user.glade b/data/ui/developer/dialog_user.glade
similarity index 100%
rename from ui/developer/dialog_user.glade
rename to data/ui/developer/dialog_user.glade
diff --git a/ui/developer/window_button_script.glade b/data/ui/developer/window_button_script.glade
similarity index 100%
rename from ui/developer/window_button_script.glade
rename to data/ui/developer/window_button_script.glade
diff --git a/ui/developer/window_data_layout.glade b/data/ui/developer/window_data_layout.glade
similarity index 100%
rename from ui/developer/window_data_layout.glade
rename to data/ui/developer/window_data_layout.glade
diff --git a/ui/developer/window_data_layout_export.glade b/data/ui/developer/window_data_layout_export.glade
similarity index 100%
rename from ui/developer/window_data_layout_export.glade
rename to data/ui/developer/window_data_layout_export.glade
diff --git a/ui/developer/window_design.glade b/data/ui/developer/window_design.glade
similarity index 100%
rename from ui/developer/window_design.glade
rename to data/ui/developer/window_design.glade
diff --git a/ui/developer/window_field_calculation.glade b/data/ui/developer/window_field_calculation.glade
similarity index 100%
rename from ui/developer/window_field_calculation.glade
rename to data/ui/developer/window_field_calculation.glade
diff --git a/ui/developer/window_field_definition_edit.glade 
b/data/ui/developer/window_field_definition_edit.glade
similarity index 100%
rename from ui/developer/window_field_definition_edit.glade
rename to data/ui/developer/window_field_definition_edit.glade
diff --git a/ui/developer/window_groups.glade b/data/ui/developer/window_groups.glade
similarity index 100%
rename from ui/developer/window_groups.glade
rename to data/ui/developer/window_groups.glade
diff --git a/ui/developer/window_imageobject.glade b/data/ui/developer/window_imageobject.glade
similarity index 100%
rename from ui/developer/window_imageobject.glade
rename to data/ui/developer/window_imageobject.glade
diff --git a/ui/developer/window_print_layout_edit.glade b/data/ui/developer/window_print_layout_edit.glade
similarity index 100%
rename from ui/developer/window_print_layout_edit.glade
rename to data/ui/developer/window_print_layout_edit.glade
diff --git a/ui/developer/window_report_layout.glade b/data/ui/developer/window_report_layout.glade
similarity index 100%
rename from ui/developer/window_report_layout.glade
rename to data/ui/developer/window_report_layout.glade
diff --git a/ui/developer/window_text_format.glade b/data/ui/developer/window_text_format.glade
similarity index 100%
rename from ui/developer/window_text_format.glade
rename to data/ui/developer/window_text_format.glade
diff --git a/ui/developer/window_textobject.glade b/data/ui/developer/window_textobject.glade
similarity index 100%
rename from ui/developer/window_textobject.glade
rename to data/ui/developer/window_textobject.glade
diff --git a/ui/developer/window_translations.glade b/data/ui/developer/window_translations.glade
similarity index 100%
rename from ui/developer/window_translations.glade
rename to data/ui/developer/window_translations.glade
diff --git a/ui/developer/window_users.glade b/data/ui/developer/window_users.glade
similarity index 100%
rename from ui/developer/window_users.glade
rename to data/ui/developer/window_users.glade
diff --git a/data/ui/glom-ui.gresource.xml b/data/ui/glom-ui.gresource.xml
new file mode 100644
index 0000000..3371ea5
--- /dev/null
+++ b/data/ui/glom-ui.gresource.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/glom">
+    <file preprocess="xml-stripblanks">data/ui/developer/box_formatting.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/box_print_layouts.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/box_reports.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_add_related_table.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_change_language.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_choose_field.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_choose_relationship.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_choose_user.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_database_preferences.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_error_create_database.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_fieldslist.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_field_summary.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_flowtable.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_group_by.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_initial_password.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_layout_field_properties.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_line.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_new_group.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_new_library_script.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_notebook.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_relationships_overview.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_script_library.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_sort_fields.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_translation_copy.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_translation_identify_original.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/dialog_user.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_button_script.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_data_layout_export.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_data_layout.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_design.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_field_calculation.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_field_definition_edit.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_groups.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_imageobject.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_print_layout_edit.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_report_layout.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_text_format.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_textobject.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_translations.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/developer/window_users.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/box_navigation_tables.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_choose_date.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_connection.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_data_invalid_format.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_existing_or_new.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_find_id.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_image_load_progress.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_image_save_progress.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_import_csv.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_import_csv_progress.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/dialog_new_record.glade</file>
+    <file preprocess="xml-stripblanks">data/ui/operator/window_main.glade</file>
+
+  </gresource>
+</gresources>
+
+
+
+
+ 
+
+
diff --git a/ui/operator/box_navigation_tables.glade b/data/ui/operator/box_navigation_tables.glade
similarity index 100%
rename from ui/operator/box_navigation_tables.glade
rename to data/ui/operator/box_navigation_tables.glade
diff --git a/ui/operator/dialog_choose_date.glade b/data/ui/operator/dialog_choose_date.glade
similarity index 100%
rename from ui/operator/dialog_choose_date.glade
rename to data/ui/operator/dialog_choose_date.glade
diff --git a/ui/operator/dialog_connection.glade b/data/ui/operator/dialog_connection.glade
similarity index 100%
rename from ui/operator/dialog_connection.glade
rename to data/ui/operator/dialog_connection.glade
diff --git a/ui/operator/dialog_data_invalid_format.glade b/data/ui/operator/dialog_data_invalid_format.glade
similarity index 100%
rename from ui/operator/dialog_data_invalid_format.glade
rename to data/ui/operator/dialog_data_invalid_format.glade
diff --git a/ui/operator/dialog_existing_or_new.glade b/data/ui/operator/dialog_existing_or_new.glade
similarity index 100%
rename from ui/operator/dialog_existing_or_new.glade
rename to data/ui/operator/dialog_existing_or_new.glade
diff --git a/ui/operator/dialog_find_id.glade b/data/ui/operator/dialog_find_id.glade
similarity index 100%
rename from ui/operator/dialog_find_id.glade
rename to data/ui/operator/dialog_find_id.glade
diff --git a/ui/operator/dialog_image_load_progress.glade b/data/ui/operator/dialog_image_load_progress.glade
similarity index 100%
rename from ui/operator/dialog_image_load_progress.glade
rename to data/ui/operator/dialog_image_load_progress.glade
diff --git a/ui/operator/dialog_image_save_progress.glade b/data/ui/operator/dialog_image_save_progress.glade
similarity index 100%
rename from ui/operator/dialog_image_save_progress.glade
rename to data/ui/operator/dialog_image_save_progress.glade
diff --git a/ui/operator/dialog_import_csv.glade b/data/ui/operator/dialog_import_csv.glade
similarity index 100%
rename from ui/operator/dialog_import_csv.glade
rename to data/ui/operator/dialog_import_csv.glade
diff --git a/ui/operator/dialog_import_csv_progress.glade b/data/ui/operator/dialog_import_csv_progress.glade
similarity index 100%
rename from ui/operator/dialog_import_csv_progress.glade
rename to data/ui/operator/dialog_import_csv_progress.glade
diff --git a/ui/operator/dialog_new_record.glade b/data/ui/operator/dialog_new_record.glade
similarity index 100%
rename from ui/operator/dialog_new_record.glade
rename to data/ui/operator/dialog_new_record.glade
diff --git a/ui/operator/window_main.glade b/data/ui/operator/window_main.glade
similarity index 100%
rename from ui/operator/window_main.glade
rename to data/ui/operator/window_main.glade
diff --git a/glom/glade_utils.h b/glom/glade_utils.h
index ca6ed6d..2e44667 100644
--- a/glom/glade_utils.h
+++ b/glom/glade_utils.h
@@ -38,7 +38,7 @@ namespace Utils
 inline std::string get_glade_resource_path(const std::string& filename)
 {
   // This is the same prefix that is in the *gresource.xml.in file.
-  return "/org/gnome/glom/ui/" + filename;
+  return "/org/gnome/glom/data/ui/" + filename;
 }
 
 /** This assumes that there are no other top-level windows in the glade file.
diff --git a/glom/utils_ui.cc b/glom/utils_ui.cc
index 909b5d7..b38ee7e 100644
--- a/glom/utils_ui.cc
+++ b/glom/utils_ui.cc
@@ -522,7 +522,7 @@ void Utils::show_report_in_browser(const std::string& filepath, Gtk::Window* par
 
 std::string Utils::get_icon_path(const Glib::ustring& filename)
 {
-  return  "/org/gnome/glom/icons/" + filename;
+  return  "/org/gnome/glom/data/icons/" + filename;
 }
 
 bool Utils::script_check_for_pygtk2_with_warning(const Glib::ustring& script, Gtk::Window* parent_window)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]