[glabels] Renamed builder files to use '.ui' extension.



commit d88c0c2aa50950095fbff6fef46732d586333522
Author: Jim Evins <evins snaught com>
Date:   Wed May 12 23:46:32 2010 -0400

    Renamed builder files to use '.ui' extension.

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 +-
 data/builder/Makefile.am                           |   15 ---------------
 data/ui/Makefile.am                                |   15 +++++++++++++++
 .../media-select.builder => ui/media-select.ui}    |    0
 .../merge-properties-dialog.ui}                    |    0
 .../new-label-dialog.ui}                           |    0
 .../object-editor.builder => ui/object-editor.ui}  |    0
 .../prefs-dialog.builder => ui/prefs-dialog.ui}    |    0
 .../print-op-dialog-custom-widget.ui}              |    0
 .../property-bar.builder => ui/property-bar.ui}    |    0
 .../template-designer.ui}                          |    0
 src/media-select.c                                 |    2 +-
 src/merge-properties-dialog.c                      |    2 +-
 src/new-label-dialog.c                             |    2 +-
 src/object-editor.c                                |    2 +-
 src/prefs-dialog.c                                 |    2 +-
 src/print-op-dialog.c                              |    2 +-
 src/template-designer.c                            |    2 +-
 src/ui-property-bar.c                              |    2 +-
 20 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d58f8a5..61d6f9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,7 +252,7 @@ src/stock-pixmaps/Makefile
 data/Makefile
 data/pixmaps/Makefile
 data/mime/Makefile
-data/builder/Makefile
+data/ui/Makefile
 data/desktop/Makefile
 data/man/Makefile
 templates/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index c285ea2..1a11481 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = desktop builder man mime pixmaps
+SUBDIRS = desktop man mime pixmaps ui
 
 
diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
new file mode 100644
index 0000000..833eb26
--- /dev/null
+++ b/data/ui/Makefile.am
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+
+builderdir = $(datadir)/$(GLABELS_BRANCH)/ui/
+
+builder_DATA = \
+	property-bar.ui				\
+	print-op-dialog-custom-widget.ui	\
+	media-select.ui				\
+	new-label-dialog.ui			\
+	merge-properties-dialog.ui		\
+	template-designer.ui			\
+	prefs-dialog.ui				\
+	object-editor.ui
+
+EXTRA_DIST = $(builder_DATA)
diff --git a/data/builder/media-select.builder b/data/ui/media-select.ui
similarity index 100%
rename from data/builder/media-select.builder
rename to data/ui/media-select.ui
diff --git a/data/builder/merge-properties-dialog.builder b/data/ui/merge-properties-dialog.ui
similarity index 100%
rename from data/builder/merge-properties-dialog.builder
rename to data/ui/merge-properties-dialog.ui
diff --git a/data/builder/new-label-dialog.builder b/data/ui/new-label-dialog.ui
similarity index 100%
rename from data/builder/new-label-dialog.builder
rename to data/ui/new-label-dialog.ui
diff --git a/data/builder/object-editor.builder b/data/ui/object-editor.ui
similarity index 100%
rename from data/builder/object-editor.builder
rename to data/ui/object-editor.ui
diff --git a/data/builder/prefs-dialog.builder b/data/ui/prefs-dialog.ui
similarity index 100%
rename from data/builder/prefs-dialog.builder
rename to data/ui/prefs-dialog.ui
diff --git a/data/builder/print-op-dialog-custom-widget.builder b/data/ui/print-op-dialog-custom-widget.ui
similarity index 100%
rename from data/builder/print-op-dialog-custom-widget.builder
rename to data/ui/print-op-dialog-custom-widget.ui
diff --git a/data/builder/property-bar.builder b/data/ui/property-bar.ui
similarity index 100%
rename from data/builder/property-bar.builder
rename to data/ui/property-bar.ui
diff --git a/data/builder/template-designer.builder b/data/ui/template-designer.ui
similarity index 100%
rename from data/builder/template-designer.builder
rename to data/ui/template-designer.ui
diff --git a/src/media-select.c b/src/media-select.c
index cb8712f..1169278 100644
--- a/src/media-select.c
+++ b/src/media-select.c
@@ -274,7 +274,7 @@ gl_media_select_construct (glMediaSelect *this)
         g_return_if_fail (this->priv != NULL);
 
         builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "media-select.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "media-select.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/merge-properties-dialog.c b/src/merge-properties-dialog.c
index 196cdfc..d3eadc1 100644
--- a/src/merge-properties-dialog.c
+++ b/src/merge-properties-dialog.c
@@ -166,7 +166,7 @@ gl_merge_properties_dialog_init (glMergePropertiesDialog *dialog)
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
         builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "merge-properties-dialog.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "merge-properties-dialog.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/new-label-dialog.c b/src/new-label-dialog.c
index aa0f04b..dc26ab8 100644
--- a/src/new-label-dialog.c
+++ b/src/new-label-dialog.c
@@ -169,7 +169,7 @@ gl_new_label_dialog_init (glNewLabelDialog *this)
         this->priv = g_new0 (glNewLabelDialogPrivate, 1);
 
         builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "new-label-dialog.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "new-label-dialog.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
         if (error) {
diff --git a/src/object-editor.c b/src/object-editor.c
index 3f74261..dfc44fe 100644
--- a/src/object-editor.c
+++ b/src/object-editor.c
@@ -129,7 +129,7 @@ gl_object_editor_init (glObjectEditor *editor)
 
         editor->priv->builder = gtk_builder_new ();
 
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "object-editor.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "object-editor.ui", NULL);
         gtk_builder_add_objects_from_file (editor->priv->builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index d797386..9cca2c2 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -150,7 +150,7 @@ gl_prefs_dialog_init (glPrefsDialog *dialog)
 	dialog->priv = g_new0 (glPrefsDialogPrivate, 1);
 
         dialog->priv->builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "prefs-dialog.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "prefs-dialog.ui", NULL);
         gtk_builder_add_objects_from_file (dialog->priv->builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/print-op-dialog.c b/src/print-op-dialog.c
index fc693df..dea9ff6 100644
--- a/src/print-op-dialog.c
+++ b/src/print-op-dialog.c
@@ -253,7 +253,7 @@ create_custom_widget_cb (GtkPrintOperation *operation,
         op->priv->labels_per_sheet = lgl_template_frame_get_n_labels (frame);
 
 	builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "print-op-dialog-custom-widget.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "print-op-dialog-custom-widget.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/template-designer.c b/src/template-designer.c
index fc38b4b..891648a 100644
--- a/src/template-designer.c
+++ b/src/template-designer.c
@@ -314,7 +314,7 @@ gl_template_designer_init (glTemplateDesigner *dialog)
 	dialog->priv = g_new0 (glTemplateDesignerPrivate, 1);
 
         dialog->priv->builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "template-designer.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "template-designer.ui", NULL);
         gtk_builder_add_objects_from_file (dialog->priv->builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {
diff --git a/src/ui-property-bar.c b/src/ui-property-bar.c
index 69592fb..c2e82df 100644
--- a/src/ui-property-bar.c
+++ b/src/ui-property-bar.c
@@ -243,7 +243,7 @@ gl_ui_property_bar_construct (glUIPropertyBar   *this)
 	this->priv->stop_signals = TRUE;
 
         builder = gtk_builder_new ();
-        builder_filename = g_build_filename (GLABELS_DATA_DIR, "builder", "property-bar.builder", NULL);
+        builder_filename = g_build_filename (GLABELS_DATA_DIR, "ui", "property-bar.ui", NULL);
         gtk_builder_add_objects_from_file (builder, builder_filename, object_ids, &error);
         g_free (builder_filename);
 	if (error) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]