GNOME.org
 

[glom] Moved more design-only classes to glom/mode_design/

commit a30d42a1ea3067968dea212cf337e533eae9f19b
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Sep 4 01:43:56 2009 +0200

    Moved more design-only classes to glom/mode_design/
    
    * glom/libglom/data_structure/iso_codes.[h|cc]:
     * glom/utility_widgets/comboentry_currency.cc
    * glom/mode_design/translation/:
    Moved to glom/mode_design/.
    * glom/Makefile_glom.am, *.[h|cc]:
    * po/POTFILES.in: Adapted.
    * configure.ac: Make use of iso-codes dependent on client-only, not
    maemo, because that actually makes sense.

 ChangeLog                                          |   13 ++++++++++
 Makefile_glom.am                                   |   26 ++++++++++---------
 Makefile_libglom.am                                |    8 +----
 configure.ac                                       |    9 ++++---
 glom/application.cc                                |    4 +-
 .../comboentry_currency.cc                         |    2 +-
 .../comboentry_currency.h                          |    2 +-
 .../data_structure => mode_design}/iso_codes.cc    |    4 +-
 .../data_structure => mode_design}/iso_codes.h     |    6 ++--
 glom/mode_design/layout/dialog_choose_field.h      |    2 +-
 .../layout/layout_item_dialogs/box_formatting.h    |    2 +-
 .../layout_item_dialogs/dialog_field_layout.h      |    2 +-
 .../layout/layout_item_dialogs/dialog_group_by.h   |    2 +-
 .../translation/combobox_locale.cc                 |    2 +-
 .../translation/combobox_locale.h                  |    3 +-
 .../translation/dialog_change_language.cc          |    0
 .../translation/dialog_change_language.h           |    0
 .../translation/dialog_copy_translation.cc         |    0
 .../translation/dialog_copy_translation.h          |    0
 .../translation/dialog_identify_original.cc        |    2 +-
 .../translation/dialog_identify_original.h         |    0
 .../translation/window_translations.cc             |    0
 .../translation/window_translations.h              |    0
 po/POTFILES.in                                     |    6 ++--
 24 files changed, 54 insertions(+), 41 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b1656b3..210bd1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-04  Murray Cumming  <murrayc murrayc com>
+
+	Moved more design-only classes to glom/mode_design/
+
+	* glom/libglom/data_structure/iso_codes.[h|cc]:
+ 	* glom/utility_widgets/comboentry_currency.cc
+	* glom/mode_design/translation/:	
+	Moved to glom/mode_design/.
+	* glom/Makefile_glom.am, *.[h|cc]: 
+	* po/POTFILES.in: Adapted.
+	* configure.ac: Make use of iso-codes dependent on client-only, not 
+	maemo, because that actually makes sense.
+
 1.11.1:
 
 2009-09-03  Murray Cumming  <murrayc murrayc com>
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 9b75905..a619535 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -118,8 +118,6 @@ glom_glom_SOURCES =							\
 	glom/utility_widgets/checkglom.h				\
 	glom/utility_widgets/combo_textglade.cc				\
 	glom/utility_widgets/combo_textglade.h				\
-	glom/utility_widgets/comboentry_currency.cc			\
-	glom/utility_widgets/comboentry_currency.h			\
 	glom/utility_widgets/comboentryglom.cc				\
 	glom/utility_widgets/comboentryglom.h				\
 	glom/utility_widgets/comboglom.cc				\
@@ -221,6 +219,8 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/dialog_fields.h				\
 	glom/mode_design/dialog_relationships.cc			\
 	glom/mode_design/dialog_relationships.h				\
+	glom/mode_design/iso_codes.cc					\
+	glom/mode_design/iso_codes.h					\
 	glom/mode_design/fields/box_db_table_definition.cc		\
 	glom/mode_design/fields/box_db_table_definition.h		\
 	glom/mode_design/fields/combo_fieldtype.cc			\
@@ -309,16 +309,18 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/users/dialog_user.h				\
 	glom/mode_design/users/dialog_users_list.cc			\
 	glom/mode_design/users/dialog_users_list.h			\
-	glom/translation/combobox_locale.cc				\
-	glom/translation/combobox_locale.h				\
-	glom/translation/dialog_change_language.cc			\
-	glom/translation/dialog_change_language.h			\
-	glom/translation/dialog_copy_translation.cc			\
-	glom/translation/dialog_copy_translation.h			\
-	glom/translation/dialog_identify_original.cc			\
-	glom/translation/dialog_identify_original.h			\
-	glom/translation/window_translations.cc				\
-	glom/translation/window_translations.h				\
+	glom/mode_design/comboentry_currency.cc				\
+	glom/mode_design/comboentry_currency.h				\
+	glom/mode_design/translation/combobox_locale.cc				\
+	glom/mode_design/translation/combobox_locale.h				\
+	glom/mode_design/translation/dialog_change_language.cc			\
+	glom/mode_design/translation/dialog_change_language.h			\
+	glom/mode_design/translation/dialog_copy_translation.cc			\
+	glom/mode_design/translation/dialog_copy_translation.h			\
+	glom/mode_design/translation/dialog_identify_original.cc			\
+	glom/mode_design/translation/dialog_identify_original.h			\
+	glom/mode_design/translation/window_translations.cc				\
+	glom/mode_design/translation/window_translations.h				\
 	glom/utility_widgets/filechooserdialog_saveextras.cc		\
 	glom/utility_widgets/filechooserdialog_saveextras.h		\
 	glom/utility_widgets/flowtable_dnd.cc				\
diff --git a/Makefile_libglom.am b/Makefile_libglom.am
index 7dbd6f1..1220ff5 100644
--- a/Makefile_libglom.am
+++ b/Makefile_libglom.am
@@ -30,7 +30,6 @@ libglom_data_structure_include_HEADERS =			\
 	glom/libglom/data_structure/foundset.h			\
 	glom/libglom/data_structure/glomconversions.h		\
 	glom/libglom/data_structure/groupinfo.h			\
-	glom/libglom/data_structure/iso_codes.h			\
 	glom/libglom/data_structure/numeric_format.h		\
 	glom/libglom/data_structure/parameternamegenerator.h	\
 	glom/libglom/data_structure/print_layout.h		\
@@ -103,7 +102,6 @@ glom_libglom_libglom_1_12_la_SOURCES =					\
 	glom/libglom/data_structure/foundset.cc				\
 	glom/libglom/data_structure/glomconversions.cc			\
 	glom/libglom/data_structure/groupinfo.cc			\
-	glom/libglom/data_structure/iso_codes.cc			\
 	glom/libglom/data_structure/numeric_format.cc			\
 	glom/libglom/data_structure/parameternamegenerator.cc		\
 	glom/libglom/data_structure/print_layout.cc			\
@@ -148,23 +146,21 @@ glom_libglom_libglom_1_12_la_SOURCES =					\
 	glom/libglom/python_embed/pygdavalue_conversions.c		\
 	glom/libglom/python_embed/pygdavalue_conversions.h
 
-if GLOM_ENABLE_POSTGRESQL
 glom_libglom_libglom_1_12_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres.cc	\
 	glom/libglom/connectionpool_backends/postgres.h		\
 	glom/libglom/connectionpool_backends/postgres_central.cc\
 	glom/libglom/connectionpool_backends/postgres_central.h
+
 if !GLOM_ENABLE_CLIENT_ONLY
 glom_libglom_libglom_1_12_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/postgres_self.cc	\
 	glom/libglom/connectionpool_backends/postgres_self.h
 endif
-endif
-if GLOM_ENABLE_SQLITE
+
 glom_libglom_libglom_1_12_la_SOURCES +=				\
 	glom/libglom/connectionpool_backends/sqlite.cc		\
 	glom/libglom/connectionpool_backends/sqlite.h
-endif
 
 glom_libglom_libglom_1_12_la_LIBADD = $(LIBGLOM_LIBS) $(PYTHON_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 1a2abba..ad73a44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,18 +138,19 @@ AC_ARG_ENABLE([maemo-launcher],
 # libgda >= 4.1.2 is also OK, but not 4.1.<2.
 REQUIRED_LIBGLOM_LIBS='gthread-2.0 giomm-2.4 libxml++-2.6 pygda-4.0 >= 2.25.3 pygobject-2.0 >= 2.6.0 libgdamm-4.0 >= 3.99.14 libgda-4.0 >= 4.0.4 libgda-postgres-4.0'
 
-//TODO: Why is iso-codes disabled for maemo? murrayc.
-AS_IF([test "x$glom_enable_maemo" != xyes && test "x$glom_host_win32" != xyes],
+# TODO: Package iso-codes for Windows?
+AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS iso-codes"])
+
 AS_IF([test "x$glom_host_win32" != xyes],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS libepc-1.0 >= 0.3.1 avahi-ui"])
 
 # Libraries used by Glom:
 REQUIRED_GLOM_LIBS="$REQUIRED_LIBGLOM_LIBS gtkmm-2.4 >= 2.14 gthread-2.0 gconfmm-2.6 libxml++-2.6 libxslt >= 1.1.10 goocanvasmm-1.0 >= 0.14.0"
 
-# Do not require gtksourceviewmm in client only mode
+# Do not require gtksourceviewmm or iso-codes in client only mode
 AS_IF([test "x$glom_enable_client_only" != xyes],
-      [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS gtksourceviewmm-2.0"])
+      [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS gtksourceviewmm-2.0 iso-codes"])
 AS_IF([test "x$glom_enable_sqlite" = xyes],
       [REQUIRED_GLOM_LIBS="$REQUIRED_GLOM_LIBS libgda-sqlite-4.0"])
 AS_IF([test "x$glom_enable_maemo" = xyes],
diff --git a/glom/application.cc b/glom/application.cc
index a481ac0..cfd8ed6 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -26,8 +26,8 @@
 #include <glom/dialog_progress_creating.h>
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
-#include <glom/translation/dialog_change_language.h>
-#include <glom/translation/window_translations.h>
+#include <glom/mode_design/translation/dialog_change_language.h>
+#include <glom/mode_design/translation/window_translations.h>
 #include <glom/utility_widgets/filechooserdialog_saveextras.h>
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/glom/utility_widgets/comboentry_currency.cc b/glom/mode_design/comboentry_currency.cc
similarity index 97%
rename from glom/utility_widgets/comboentry_currency.cc
rename to glom/mode_design/comboentry_currency.cc
index 41ea89f..4fbc1be 100644
--- a/glom/utility_widgets/comboentry_currency.cc
+++ b/glom/mode_design/comboentry_currency.cc
@@ -20,7 +20,7 @@
 
 #include "comboentry_currency.h"
 #include <gtk/gtkcomboboxentry.h>
-#include <libglom/data_structure/iso_codes.h>
+#include <glom/mode_design/iso_codes.h>
 
 namespace Glom
 {
diff --git a/glom/utility_widgets/comboentry_currency.h b/glom/mode_design/comboentry_currency.h
similarity index 95%
rename from glom/utility_widgets/comboentry_currency.h
rename to glom/mode_design/comboentry_currency.h
index 0182745..b2dfb0e 100644
--- a/glom/utility_widgets/comboentry_currency.h
+++ b/glom/mode_design/comboentry_currency.h
@@ -21,7 +21,6 @@
 #ifndef GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
 #define GLOM_MODE_DESIGN_COMBOENTRY_CURRENCY_HH
 
-#include <libglom/data_structure/iso_codes.h>
 #include <gtkmm/comboboxentry.h>
 #include <gtkmm/builder.h>
 
@@ -31,6 +30,7 @@
 namespace Glom
 {
 
+/// A ComboBox that allows the user to choose, or enter, a currency symbol.
 class ComboEntry_Currency : public Gtk::ComboBoxEntry
 {
 public:
diff --git a/glom/libglom/data_structure/iso_codes.cc b/glom/mode_design/iso_codes.cc
similarity index 99%
rename from glom/libglom/data_structure/iso_codes.cc
rename to glom/mode_design/iso_codes.cc
index 5e649c2..8353016 100644
--- a/glom/libglom/data_structure/iso_codes.cc
+++ b/glom/mode_design/iso_codes.cc
@@ -18,9 +18,9 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <libglom/libglom_config.h> //For ISO_CODES_PREFIX.
+#include "config.h" //For ISO_CODES_PREFIX.
 
-#include <libglom/data_structure/iso_codes.h>
+#include <glom/mode_design/iso_codes.h>
 #include <libxml++/libxml++.h>
 #include <libglom/document/document.h>
 #include <libglom/utils.h>
diff --git a/glom/libglom/data_structure/iso_codes.h b/glom/mode_design/iso_codes.h
similarity index 91%
rename from glom/libglom/data_structure/iso_codes.h
rename to glom/mode_design/iso_codes.h
index 8f782c3..5e11371 100644
--- a/glom/libglom/data_structure/iso_codes.h
+++ b/glom/mode_design/iso_codes.h
@@ -18,8 +18,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef GLOM_DATASTRUCTURE_ISO_CODES_H
-#define GLOM_DATASTRUCTURE_ISO_CODES_H
+#ifndef GLOM_MODE_DESIGN_ISO_CODES_H
+#define GLOM_MODE_DESIGN_ISO_CODES_H
 
 #include <libglom/data_structure/field.h>
 #include <libglom/data_structure/numeric_format.h>
@@ -55,5 +55,5 @@ Glib::ustring get_locale_name(const Glib::ustring& locale_id);
 
 } //namespace Glom
 
-#endif //GLOM_DATASTRUCTURE_ISO_CODES_H
+#endif //GLOM_MODE_DESIGN_ISO_CODES_H
 
diff --git a/glom/mode_design/layout/dialog_choose_field.h b/glom/mode_design/layout/dialog_choose_field.h
index 8392303..41ad7f7 100644
--- a/glom/mode_design/layout/dialog_choose_field.h
+++ b/glom/mode_design/layout/dialog_choose_field.h
@@ -27,7 +27,7 @@
 #include <glom/box_withbuttons.h>
 #include <glom/utility_widgets/combo_textglade.h>
 #include <glom/mode_design/layout/combobox_relationship.h>
-#include <glom/utility_widgets/comboentry_currency.h>
+#include <glom/mode_design/comboentry_currency.h>
 
 namespace Glom
 {
diff --git a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
index 9901f9f..c4d8ea5 100644
--- a/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
+++ b/glom/mode_design/layout/layout_item_dialogs/box_formatting.h
@@ -25,7 +25,7 @@
 #include <glom/utility_widgets/dialog_properties.h>
 #include <libglom/document/document.h>
 #include <glom/box_withbuttons.h>
-#include <glom/utility_widgets/comboentry_currency.h>
+#include <glom/mode_design/comboentry_currency.h>
 #include <glom/mode_design/layout/combobox_relationship.h>
 #include <glom/mode_design/layout/combobox_fields.h>
 
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
index a51415f..1d93f71 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.h
@@ -26,7 +26,7 @@
 #include <libglom/document/view.h>
 #include <glom/box_withbuttons.h>
 #include <glom/utility_widgets/combo_textglade.h>
-#include <glom/utility_widgets/comboentry_currency.h>
+#include <glom/mode_design/comboentry_currency.h>
 #include "box_formatting.h"
 
 namespace Glom
diff --git a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
index 12ca60a..b72ebdf 100644
--- a/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
+++ b/glom/mode_design/layout/layout_item_dialogs/dialog_group_by.h
@@ -26,7 +26,7 @@
 #include <libglom/document/document.h>
 #include <glom/box_withbuttons.h>
 #include <glom/utility_widgets/combo_textglade.h>
-#include <glom/utility_widgets/comboentry_currency.h>
+#include <glom/mode_design/comboentry_currency.h>
 #include "dialog_groupby_secondaryfields.h"
 #include "dialog_groupby_sortfields.h"
 #include "comboentry_borderwidth.h"
diff --git a/glom/translation/combobox_locale.cc b/glom/mode_design/translation/combobox_locale.cc
similarity index 98%
rename from glom/translation/combobox_locale.cc
rename to glom/mode_design/translation/combobox_locale.cc
index f5d0ae1..cf900a2 100644
--- a/glom/translation/combobox_locale.cc
+++ b/glom/mode_design/translation/combobox_locale.cc
@@ -20,7 +20,7 @@
 
 #include "combobox_locale.h"
 #include <gtk/gtkcomboboxentry.h>
-#include <libglom/data_structure/iso_codes.h>
+#include <glom/mode_design/iso_codes.h>
 
 namespace Glom
 {
diff --git a/glom/translation/combobox_locale.h b/glom/mode_design/translation/combobox_locale.h
similarity index 94%
rename from glom/translation/combobox_locale.h
rename to glom/mode_design/translation/combobox_locale.h
index 3d90080..dda0057 100644
--- a/glom/translation/combobox_locale.h
+++ b/glom/mode_design/translation/combobox_locale.h
@@ -21,7 +21,7 @@
 #ifndef GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
 #define GLOM_TRANSLATION_COMBOBOX_LOCALE_HH
 
-#include <libglom/data_structure/iso_codes.h>
+#include <glom/mode_design/iso_codes.h>
 #include <gtkmm/combobox.h>
 #include <gtkmm/builder.h>
 
@@ -31,6 +31,7 @@
 namespace Glom
 {
 
+/// A ComboBox that allows the user to choose a locale.
 class ComboBox_Locale : public Gtk::ComboBox
 {
 public:
diff --git a/glom/translation/dialog_change_language.cc b/glom/mode_design/translation/dialog_change_language.cc
similarity index 100%
rename from glom/translation/dialog_change_language.cc
rename to glom/mode_design/translation/dialog_change_language.cc
diff --git a/glom/translation/dialog_change_language.h b/glom/mode_design/translation/dialog_change_language.h
similarity index 100%
rename from glom/translation/dialog_change_language.h
rename to glom/mode_design/translation/dialog_change_language.h
diff --git a/glom/translation/dialog_copy_translation.cc b/glom/mode_design/translation/dialog_copy_translation.cc
similarity index 100%
rename from glom/translation/dialog_copy_translation.cc
rename to glom/mode_design/translation/dialog_copy_translation.cc
diff --git a/glom/translation/dialog_copy_translation.h b/glom/mode_design/translation/dialog_copy_translation.h
similarity index 100%
rename from glom/translation/dialog_copy_translation.h
rename to glom/mode_design/translation/dialog_copy_translation.h
diff --git a/glom/translation/dialog_identify_original.cc b/glom/mode_design/translation/dialog_identify_original.cc
similarity index 97%
rename from glom/translation/dialog_identify_original.cc
rename to glom/mode_design/translation/dialog_identify_original.cc
index 173aaae..dc8ef81 100644
--- a/glom/translation/dialog_identify_original.cc
+++ b/glom/mode_design/translation/dialog_identify_original.cc
@@ -19,7 +19,7 @@
  */
 
 #include "dialog_identify_original.h"
-#include <libglom/data_structure/iso_codes.h>
+#include <glom/mode_design/iso_codes.h>
 #include <glom/utils_ui.h> //For bold_message()).
 #include <glibmm/i18n.h>
 
diff --git a/glom/translation/dialog_identify_original.h b/glom/mode_design/translation/dialog_identify_original.h
similarity index 100%
rename from glom/translation/dialog_identify_original.h
rename to glom/mode_design/translation/dialog_identify_original.h
diff --git a/glom/translation/window_translations.cc b/glom/mode_design/translation/window_translations.cc
similarity index 100%
rename from glom/translation/window_translations.cc
rename to glom/mode_design/translation/window_translations.cc
diff --git a/glom/translation/window_translations.h b/glom/mode_design/translation/window_translations.h
similarity index 100%
rename from glom/translation/window_translations.h
rename to glom/mode_design/translation/window_translations.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 10787d9..4ff5ac3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -108,9 +108,9 @@ glom/navigation/box_tables.cc
 glom/print_layout/canvas_layout_item.cc
 glom/print_layout/canvas_print_layout.cc
 glom/python_embed/glom_python.cc
-glom/translation/combobox_locale.cc
-glom/translation/dialog_change_language.cc
-glom/translation/window_translations.cc
+glom/mode_design/translation/combobox_locale.cc
+glom/mode_design/translation/dialog_change_language.cc
+glom/mode_design/translation/window_translations.cc
 glom/utility_widgets/adddel/adddel.cc
 glom/utility_widgets/comboentryglom.cc
 glom/utility_widgets/datawidget.cc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]