GNOME.org
 

[glom] Move some non-layout print_layout code back out of mode_design

commit 740dd5f28a78ce90d3b21b964048387e10d5cb57
Author: Murray Cumming <murrayc murrayc com>
Date:   Thu Sep 3 19:45:10 2009 +0200

    Move some non-layout print_layout code back out of mode_design
    
    	* glom/mode_design/print_layouts/canvas_layout_item.[h|cc]:
    	* glom/mode_design/print_layouts/canvas_print_layout.[h|cc]:
    	Moved to glom/print_layout/, because they are used by client-only mode
    	too.
    	* glom/Makefile_glom.am, *.[h|cc]: Adapted.
    	* po/POTFILES.in: Update for moved files.

 ChangeLog                                          |   11 ++++
 Makefile_glom.am                                   |    8 ++--
 configure.ac                                       |    1 +
 glom/base_db.cc                                    |    3 +-
 glom/base_db.h                                     |   13 +++--
 glom/filechooser_export.cc                         |   29 ++++++++---
 glom/filechooser_export.h                          |    8 +++-
 .../print_layouts/window_print_layout_edit.cc      |    2 +-
 .../print_layouts/window_print_layout_edit.h       |    2 +-
 .../canvas_layout_item.cc                          |    0
 .../canvas_layout_item.h                           |    0
 .../canvas_print_layout.cc                         |   43 ++++++++++-------
 .../canvas_print_layout.h                          |    7 ++-
 glom/printoperation_printlayout.h                  |    2 +-
 glom/utility_widgets/datawidget.cc                 |   11 ----
 glom/utility_widgets/datawidget.h                  |    2 +-
 po/ChangeLog                                       |    6 ++
 po/POTFILES.in                                     |   50 ++++++++++----------
 18 files changed, 119 insertions(+), 79 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 45fbc5e..40bcabc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-09-03  Murray Cumming  <murrayc murrayc com>
 
+	Move some non-layout print_layout code back out of mode_design
+
+	* glom/mode_design/print_layouts/canvas_layout_item.[h|cc]:
+	* glom/mode_design/print_layouts/canvas_print_layout.[h|cc]:
+	Moved to glom/print_layout/, because they are used by client-only mode 
+	too.
+	* glom/Makefile_glom.am, *.[h|cc]: Adapted.
+	* po/POTFILES.in: Update for moved files.
+
+2009-09-03  Murray Cumming  <murrayc murrayc com>
+
 	Moved many developer-mode files into glom/mode_design/ now that our 
 	non-recursive build allows that without linker errors.
 
diff --git a/Makefile_glom.am b/Makefile_glom.am
index 3730aa4..e0fc8b9 100644
--- a/Makefile_glom.am
+++ b/Makefile_glom.am
@@ -102,6 +102,10 @@ glom_glom_SOURCES =							\
 	glom/mode_find/notebook_find.h					\
 	glom/navigation/box_tables.cc					\
 	glom/navigation/box_tables.h					\
+	glom/print_layout/canvas_layout_item.cc				\
+	glom/print_layoutscanvas_layout_item.h				\
+	glom/print_layout/canvas_print_layout.cc			\
+	glom/print_layout/canvas_print_layout.h				\
 	glom/python_embed/glom_python.cc				\
 	glom/python_embed/glom_python.h					\
 	glom/report_builder.cc						\
@@ -279,10 +283,6 @@ glom_glom_SOURCES +=							\
 	glom/mode_design/relationships_overview/printoperation_relationshipsoverview.h	\
 	glom/mode_design/print_layouts/box_print_layouts.cc		\
 	glom/mode_design/print_layouts/box_print_layouts.h		\
-	glom/mode_design/print_layouts/canvas_layout_item.cc		\
-	glom/mode_design/print_layouts/canvas_layout_item.h		\
-	glom/mode_design/print_layouts/canvas_print_layout.cc		\
-	glom/mode_design/print_layouts/canvas_print_layout.h		\
 	glom/mode_design/print_layouts/dialog_text_formatting.cc	\
 	glom/mode_design/print_layouts/dialog_text_formatting.h		\
 	glom/mode_design/print_layouts/print_layout_toolbar.cc		\
diff --git a/configure.ac b/configure.ac
index 07d9fe0..1a2abba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,7 @@ 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],
       [REQUIRED_LIBGLOM_LIBS="$REQUIRED_LIBGLOM_LIBS iso-codes"])
 AS_IF([test "x$glom_host_win32" != xyes],
diff --git a/glom/base_db.cc b/glom/base_db.cc
index 390850b..e1a1095 100644
--- a/glom/base_db.cc
+++ b/glom/base_db.cc
@@ -1685,6 +1685,8 @@ Glib::RefPtr<Gnome::Gda::Connection> Base_DB::get_connection()
   return gda_connection;
 }
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
+
 bool Base_DB::insert_example_data(const Glib::ustring& table_name) const
 {
   //TODO_Performance: Avoid copying:
@@ -1889,7 +1891,6 @@ Base_DB::type_list_field_items Base_DB::offer_field_list(const Glib::ustring& ta
   return result;
 }
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
 sharedptr<LayoutItem_Field> Base_DB::offer_field_formatting(const sharedptr<const LayoutItem_Field>& start_field, const Glib::ustring& table_name, Gtk::Window* transient_for)
 {
   sharedptr<LayoutItem_Field> result;
diff --git a/glom/base_db.h b/glom/base_db.h
index ec93ab2..a2939bc 100644
--- a/glom/base_db.h
+++ b/glom/base_db.h
@@ -112,10 +112,11 @@ public:
   sharedptr<Field> change_column(const Glib::ustring& table_name, const sharedptr<const Field>& field_old, const sharedptr<const Field>& field, Gtk::Window* parent_window) const;
 
   bool change_columns(const Glib::ustring& table_name, const type_vec_const_fields& old_fields, type_vec_fields& fields, Gtk::Window* parent_window) const;
-#endif //GLOM_ENABLE_CLIENT_ONLY
 
   bool insert_example_data(const Glib::ustring& table_name) const;
 
+#endif //GLOM_ENABLE_CLIENT_ONLY
+
   //TODO: This is not a very good place for this function.
   /// Get the active layout platform for the document, or get a suitable default.
   static Glib::ustring get_active_layout_platform(Document* document);
@@ -125,6 +126,10 @@ public:
 
 protected:
 
+  typedef std::list< sharedptr<LayoutItem_Field> > type_list_field_items;
+  typedef std::list< sharedptr<const LayoutItem_Field> > type_list_const_field_items;
+
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   /** Allow the user to select a field from the list of fields for the table.
    */
   sharedptr<LayoutItem_Field> offer_field_list_select_one_field(const Glib::ustring& table_name, Gtk::Window* transient_for = 0);
@@ -134,16 +139,12 @@ protected:
    */
   sharedptr<LayoutItem_Field> offer_field_list_select_one_field(const sharedptr<const LayoutItem_Field>& start_field, const Glib::ustring& table_name, Gtk::Window* transient_for = 0);
   
-    
-  typedef std::list< sharedptr<LayoutItem_Field> > type_list_field_items;
-  typedef std::list< sharedptr<const LayoutItem_Field> > type_list_const_field_items;
   
   /** Allow the user to select fields from the list of fields for the table.
    */
   type_list_field_items offer_field_list(const Glib::ustring& table_name, Gtk::Window* transient_for = 0);
   
-  
-#ifndef GLOM_ENABLE_CLIENT_ONLY
+
   sharedptr<LayoutItem_Field> offer_field_formatting(const sharedptr<const LayoutItem_Field>& start_field, const Glib::ustring& table_name, Gtk::Window* transient_for = 0);
   sharedptr<LayoutItem_Text> offer_textobject(const sharedptr<LayoutItem_Text>& start_textobject, Gtk::Window* transient_for = 0, bool show_title = true);
   sharedptr<LayoutItem_Image> offer_imageobject(const sharedptr<LayoutItem_Image>& start_imageobject, Gtk::Window* transient_for = 0, bool show_title = true);
diff --git a/glom/filechooser_export.cc b/glom/filechooser_export.cc
index 53626e7..93cc6ca 100644
--- a/glom/filechooser_export.cc
+++ b/glom/filechooser_export.cc
@@ -31,21 +31,27 @@ namespace Glom
 FileChooser_Export::FileChooser_Export()
 : Gtk::FileChooserDialog(_("Export To File."), Gtk::FILE_CHOOSER_ACTION_SAVE),
   m_extra_widget(false, Utils::DEFAULT_SPACING_SMALL),
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   m_button_format(_("Define Data _Format"), true /* use mnenomic */),
   m_pDialogLayout(0),
+#endif //GLOM_ENABLE_CLIENT_ONLY
   m_document(0)
 {
   add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
   add_button(_("Export"), Gtk::RESPONSE_OK);
 
   m_extra_widget.pack_start(m_button_format, Gtk::PACK_SHRINK);
+
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   m_button_format.signal_clicked().connect(
     sigc::mem_fun(*this, &FileChooser_Export::on_button_define_layout) );
   m_button_format.show();
+#endif
 
   set_extra_widget(m_extra_widget);
   m_extra_widget.show();
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   //TODO: Use a generic layout dialog?
 #ifdef GLIBMM_EXCEPTIONS_ENABLED  
   Glib::RefPtr<Gtk::Builder> refXml = Gtk::Builder::create_from_file(Utils::get_glade_file_path("glom_developer.glade"), "window_data_layout_export");
@@ -65,12 +71,15 @@ FileChooser_Export::FileChooser_Export()
       m_pDialogLayout->signal_hide().connect( sigc::mem_fun(*this, &FileChooser_Export::on_dialog_layout_hide) );
     }
   }
+#endif //GLOM_ENABLE_CLIENT_ONLY
 }
 
 FileChooser_Export::~FileChooser_Export()
 {
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   delete m_pDialogLayout;
   m_pDialogLayout = 0;
+#endif //GLOM_ENABLE_CLIENT_ONLY
 }
 
 void FileChooser_Export::set_export_layout(const Document::type_list_layout_groups& layout_groups, const Glib::ustring& table_name, Document* document)
@@ -82,16 +91,19 @@ void FileChooser_Export::set_export_layout(const Document::type_list_layout_grou
     std::cerr << "FileChooser_Export::set_export_layout() document is NULL." << std::endl;
 }
 
+//We only allow a full export in client-only mode, 
+//to avoid building a large part of the layout definition code.
+#ifndef GLOM_ENABLE_CLIENT_ONLY
 void FileChooser_Export::on_button_define_layout()
 {
-  if(m_pDialogLayout)
-  {
-    m_pDialogLayout->set_layout_groups(m_layout_groups, m_document, m_table_name); //TODO: Use m_TableFields?
-    m_pDialogLayout->set_transient_for(*this);
-    set_modal(false);
-    m_pDialogLayout->set_modal();
-    m_pDialogLayout->show();
-  }
+  if(!m_pDialogLayout)
+    return;
+
+  m_pDialogLayout->set_layout_groups(m_layout_groups, m_document, m_table_name); //TODO: Use m_TableFields?
+  m_pDialogLayout->set_transient_for(*this);
+  set_modal(false);
+  m_pDialogLayout->set_modal();
+  m_pDialogLayout->show();
 }
 
 void FileChooser_Export::on_dialog_layout_hide()
@@ -99,6 +111,7 @@ void FileChooser_Export::on_dialog_layout_hide()
   if(m_pDialogLayout)
     m_pDialogLayout->get_layout_groups(m_layout_groups);
 }
+#endif //GLOM_ENABLE_CLIENT_ONLY
 
 void FileChooser_Export::get_layout_groups(Document::type_list_layout_groups& layout_groups) const
 {
diff --git a/glom/filechooser_export.h b/glom/filechooser_export.h
index 71b0e49..018c6d2 100644
--- a/glom/filechooser_export.h
+++ b/glom/filechooser_export.h
@@ -42,14 +42,20 @@ public:
 
 private:
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   void on_button_define_layout();
   void on_dialog_layout_hide();
+#endif
 
   //Member widgets:
   Gtk::HBox m_extra_widget;
+
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   Gtk::Button m_button_format;
-  Glib::ustring m_table_name;
   Dialog_Layout_Export* m_pDialogLayout;
+#endif //GLOM_ENABLE_CLIENT_ONLY
+
+  Glib::ustring m_table_name;
 
   Document::type_list_layout_groups m_layout_groups;
   Document* m_document;
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.cc b/glom/mode_design/print_layouts/window_print_layout_edit.cc
index e76894f..3caf432 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.cc
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.cc
@@ -21,7 +21,7 @@
 
 #include "window_print_layout_edit.h"
 #include <glom/box_db_table.h>
-#include "canvas_layout_item.h"
+#include <glom/print_layout/canvas_layout_item.h>
 #include <libglom/data_structure/layout/layoutitem_line.h>
 #include <libglom/data_structure/layout/layoutitem_portal.h>
 //#include <libgnome/gnome-i18n.h>
diff --git a/glom/mode_design/print_layouts/window_print_layout_edit.h b/glom/mode_design/print_layouts/window_print_layout_edit.h
index e8f366a..9b399a2 100644
--- a/glom/mode_design/print_layouts/window_print_layout_edit.h
+++ b/glom/mode_design/print_layouts/window_print_layout_edit.h
@@ -22,7 +22,7 @@
 #define WINDOW_PRINT_LAYOUT_EDIT_H
 
 #include <libglom/data_structure/print_layout.h>
-#include <glom/mode_design/print_layouts/canvas_print_layout.h>
+#include <glom/print_layout/canvas_print_layout.h>
 #include <glom/mode_design/print_layouts/print_layout_toolbar.h>
 #include <glom/mode_design/print_layouts/print_layout_toolbar_button.h>
 #include <libglom/document/document.h>
diff --git a/glom/mode_design/print_layouts/canvas_layout_item.cc b/glom/print_layout/canvas_layout_item.cc
similarity index 100%
rename from glom/mode_design/print_layouts/canvas_layout_item.cc
rename to glom/print_layout/canvas_layout_item.cc
diff --git a/glom/mode_design/print_layouts/canvas_layout_item.h b/glom/print_layout/canvas_layout_item.h
similarity index 100%
rename from glom/mode_design/print_layouts/canvas_layout_item.h
rename to glom/print_layout/canvas_layout_item.h
diff --git a/glom/mode_design/print_layouts/canvas_print_layout.cc b/glom/print_layout/canvas_print_layout.cc
similarity index 99%
rename from glom/mode_design/print_layouts/canvas_print_layout.cc
rename to glom/print_layout/canvas_print_layout.cc
index 64b9979..89e13a3 100644
--- a/glom/mode_design/print_layouts/canvas_print_layout.cc
+++ b/glom/print_layout/canvas_print_layout.cc
@@ -48,7 +48,9 @@ Canvas_PrintLayout::Canvas_PrintLayout()
 : m_modified(false),
   m_dialog_format(0)
 {
+  #ifndef GLOM_ENABLE_CLIENT_ONLY
   setup_context_menu();
+  #endif
 
   //Use millimeters, because that's something that is meaningful to the user,
   //and we can use it with Gtk::PageSetup too:
@@ -149,12 +151,14 @@ void Canvas_PrintLayout::add_canvas_layout_item(const Glib::RefPtr<CanvasLayoutI
   CanvasEditable::add_item(item, m_items_group);
   item->raise();
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   //Connect signals handlers:
   //TODO: Avoid the bind of a RefPtr. It has been known to cause memory/ref-counting problems: 
   item->signal_show_context().connect(
     sigc::bind(
       sigc::mem_fun(*this, &Canvas_PrintLayout::on_item_show_context_menu), 
       item) );
+#endif //GLOM_ENABLE_CLIENT_ONLY
 
 }
 
@@ -209,7 +213,7 @@ void Canvas_PrintLayout::fill_layout_group(const sharedptr<LayoutGroup>& group)
   }
 }
 
-
+#ifndef GLOM_ENABLE_CLIENT_ONLY
 void Canvas_PrintLayout::setup_context_menu()
 {
   m_context_menu_action_group = Gtk::ActionGroup::create();
@@ -285,23 +289,6 @@ void Canvas_PrintLayout::on_item_show_context_menu(guint button, guint32 activat
   m_context_menu->popup(button, activate_time);
 }
 
-void Canvas_PrintLayout::update_layout_position_from_canvas(const sharedptr<LayoutItem> layout_item, const Glib::RefPtr<const CanvasLayoutItem>& canvas_item)
-{
-  if(!layout_item || !canvas_item)
-    return;
-
-  //Get the actual position:
-  double x = 0;
-  double y = 0;
-  canvas_item->get_xy(x, y);
-  //std::cout << "Canvas_PrintLayout::update_layout_position_from_canvas(): x=" << x << std::endl;
-
-  double width = 0;
-  double height = 0;
-  canvas_item->get_width_height(width, height);
-  layout_item->set_print_layout_position(x, y, width, height); 
-}
-
 sharedptr<LayoutItem_Portal> Canvas_PrintLayout::offer_related_records(const sharedptr<LayoutItem_Portal>& portal, Gtk::Window* parent)
 {
   sharedptr<LayoutItem_Portal> result = portal;
@@ -460,6 +447,26 @@ void Canvas_PrintLayout::on_dialog_format_hide()
   m_dialog_format = 0;
 }
 
+#endif //GLOM_ENABLE_CLIENT_ONLY
+
+
+void Canvas_PrintLayout::update_layout_position_from_canvas(const sharedptr<LayoutItem> layout_item, const Glib::RefPtr<const CanvasLayoutItem>& canvas_item)
+{
+  if(!layout_item || !canvas_item)
+    return;
+
+  //Get the actual position:
+  double x = 0;
+  double y = 0;
+  canvas_item->get_xy(x, y);
+  //std::cout << "Canvas_PrintLayout::update_layout_position_from_canvas(): x=" << x << std::endl;
+
+  double width = 0;
+  double height = 0;
+  canvas_item->get_width_height(width, height);
+  layout_item->set_print_layout_position(x, y, width, height); 
+}
+
 Glib::RefPtr<Goocanvas::Polyline> Canvas_PrintLayout::create_margin_line(double x1, double y1, double x2, double y2)
 {
   Glib::RefPtr<Goocanvas::Polyline> line = 
diff --git a/glom/mode_design/print_layouts/canvas_print_layout.h b/glom/print_layout/canvas_print_layout.h
similarity index 97%
rename from glom/mode_design/print_layouts/canvas_print_layout.h
rename to glom/print_layout/canvas_print_layout.h
index a406187..34100a1 100644
--- a/glom/mode_design/print_layouts/canvas_print_layout.h
+++ b/glom/print_layout/canvas_print_layout.h
@@ -23,7 +23,7 @@
 
 #include <glom/base_db.h>
 #include <glom/utility_widgets/canvas/canvas_editable.h>
-#include <glom/mode_design/print_layouts/canvas_layout_item.h>
+#include <glom/print_layout/canvas_layout_item.h>
 #include <libglom/data_structure/print_layout.h>
 #include <gtkmm/uimanager.h>
 #include <gtkmm/toggleaction.h>
@@ -66,7 +66,10 @@ public:
   
 private:
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   void setup_context_menu();
+#endif
+
   void add_layout_group(const sharedptr<LayoutGroup>& group, bool is_top_level = false);
   void add_layout_group_children(const sharedptr<LayoutGroup>& group);
   void fill_layout_group(const sharedptr<LayoutGroup>& group);
@@ -80,6 +83,7 @@ private:
   
   type_vecLayoutFields get_portal_fields_to_show(const sharedptr<LayoutItem_Portal>& portal);
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   sharedptr<LayoutItem_Portal> offer_related_records(const sharedptr<LayoutItem_Portal>& portal, Gtk::Window* parent);
 
   void on_item_show_context_menu(guint button, guint32 activate_time, Glib::RefPtr<CanvasLayoutItem> item);
@@ -88,6 +92,7 @@ private:
   void on_context_menu_delete();
 
   void on_dialog_format_hide();
+#endif
 
   Glib::RefPtr<Goocanvas::Polyline> create_margin_line(double x1, double y1, double x2, double y2);
   static void update_layout_position_from_canvas(const sharedptr<LayoutItem> layout_item, const Glib::RefPtr<const CanvasLayoutItem>& canvas_item);
diff --git a/glom/printoperation_printlayout.h b/glom/printoperation_printlayout.h
index 8449bb9..9e281b9 100644
--- a/glom/printoperation_printlayout.h
+++ b/glom/printoperation_printlayout.h
@@ -17,7 +17,7 @@
 #ifndef GLOM_PRINT_OPERATION_PRINT_LAYOUT_H
 #define GLOM_PRINT_OPERATION_PRINT_LAYOUT_H
 
-#include <glom/mode_design/print_layouts/canvas_print_layout.h>
+#include <glom/print_layout/canvas_print_layout.h>
 #include <gtkmm/printoperation.h>
 #include <vector>
 
diff --git a/glom/utility_widgets/datawidget.cc b/glom/utility_widgets/datawidget.cc
index e27ff57..752e955 100644
--- a/glom/utility_widgets/datawidget.cc
+++ b/glom/utility_widgets/datawidget.cc
@@ -590,7 +590,6 @@ bool DataWidget::on_button_press_event(GdkEventButton *event)
 
   return Gtk::EventBox::on_button_press_event(event);
 }
-#endif // !GLOM_ENABLE_CLIENT_ONLY
 
 sharedptr<LayoutItem_Field> DataWidget::offer_field_list(const Glib::ustring& table_name)
 {
@@ -649,7 +648,6 @@ sharedptr<LayoutItem_Field> DataWidget::offer_field_list(const Glib::ustring& ta
   return result;
 }
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
 sharedptr<LayoutItem_Field> DataWidget::offer_field_layout(const sharedptr<const LayoutItem_Field>& start_field)
 {
   sharedptr<LayoutItem_Field> result;
@@ -685,16 +683,7 @@ sharedptr<LayoutItem_Field> DataWidget::offer_field_layout(const sharedptr<const
 
   return result;
 }
-#endif // !GLOM_ENABLE_CLIENT_ONLY
 
-/*
-void DataWidget::on_menupopup_add_item(LayoutWidgetBase::enumType item)
-{
-  signal_layout_item_added().emit(item);
-}
-*/
-
-#ifndef GLOM_ENABLE_CLIENT_ONLY
 void DataWidget::on_menupopup_activate_layout()
 {
   //finish_editing();
diff --git a/glom/utility_widgets/datawidget.h b/glom/utility_widgets/datawidget.h
index 11acaad..fd36f97 100644
--- a/glom/utility_widgets/datawidget.h
+++ b/glom/utility_widgets/datawidget.h
@@ -60,11 +60,11 @@ public:
   virtual void set_editable(bool editable = true);
   virtual void set_viewable(bool viewable = true);
 
+#ifndef GLOM_ENABLE_CLIENT_ONLY
   static sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field, Document* document, App_Glom* app);
   sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name);
   sharedptr<LayoutItem_Field> offer_field_list(const Glib::ustring& table_name, const sharedptr<const LayoutItem_Field>& start_field);
 
-#ifndef GLOM_ENABLE_CLIENT_ONLY
   sharedptr<LayoutItem_Field> offer_field_layout(const sharedptr<const LayoutItem_Field>& start_field);
 #endif // !GLOM_ENABLE_CLIENT_ONLY
 
diff --git a/po/ChangeLog b/po/ChangeLog
index 3e510fa..075770d 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-03  Murray Cumming  <murrayc murrayc-x61>
+
+	reviewed by: <delete if not using a buddy>
+
+	* POTFILES.in:
+
 2009-04-26  Mario Blättermann  <mariobl gnome org>
 
 	* de.po: Updated German translation
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5c0c556..10787d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,15 +5,11 @@ glom/application.cc
 glom/base_db.cc
 glom/base_db_table_data.cc
 glom/box_reports.cc
-glom/combobox_fields.cc
-glom/combobox_relationship.cc
 glom.desktop.in.in
 glom/dialog_connection.cc
-glom/dialog_database_preferences.cc
 glom/dialog_existing_or_new.cc
 glom/dialog_import_csv.cc
 glom/dialog_import_csv_progress.cc
-glom/dialog_new_self_hosted_connection.cc
 glom/filechooser_export.cc
 glom/frame_glom.cc
 glom/glom_developer.glade
@@ -24,16 +20,6 @@ glom/bakery/app.cc
 glom/bakery/app_withdoc_gtk.cc
 glom/bakery/app_withdoc.cc
 glom/bakery/dialog_offersave.cc
-glom/layout_item_dialogs/box_formatting.cc
-glom/layout_item_dialogs/combo_summarytype.cc
-glom/layout_item_dialogs/dialog_field_layout.cc
-glom/layout_item_dialogs/dialog_field_summary.cc
-glom/layout_item_dialogs/dialog_group_by.cc
-glom/layout_item_dialogs/dialog_groupby_secondaryfields.cc
-glom/layout_item_dialogs/dialog_groupby_sortfields.cc
-glom/layout_item_dialogs/dialog_imageobject.cc
-glom/layout_item_dialogs/dialog_notebook.cc
-glom/layout_item_dialogs/dialog_textobject.cc
 glom/libglom/connectionpool.cc
 glom/libglom/connectionpool_backends/postgres.cc
 glom/libglom/connectionpool_backends/postgres_central.cc
@@ -74,28 +60,42 @@ glom/mode_data/box_data_list.cc
 glom/mode_data/box_data_list_related.cc
 glom/mode_data/box_data_manyrecords.cc
 glom/mode_data/box_data_portal.cc
-glom/mode_data/dialog_choose_field.cc
-glom/mode_data/dialog_choose_relationship.cc
-glom/mode_data/dialog_layout_calendar_related.cc
-glom/mode_data/dialog_layout_details.cc
-glom/mode_data/dialog_layout_export.cc
-glom/mode_data/dialog_layout_list.cc
-glom/mode_data/dialog_layout_list_related.cc
 glom/mode_data/flowtablewithfields.cc
 glom/mode_data/notebook_data.cc
 glom/mode_design/box_db_table_relationships.cc
 glom/mode_design/dialog_add_related_table.cc
+glom/mode_design/dialog_database_preferences.cc
 glom/mode_design/dialog_design.cc
 glom/mode_design/dialog_fields.cc
+glom/mode_design/dialog_initial_password.cc
 glom/mode_design/dialog_relationships.cc
 glom/mode_design/fields/box_db_table_definition.cc
 glom/mode_design/fields/dialog_fieldcalculation.cc
 glom/mode_design/fields/dialog_fielddefinition.cc
+glom/mode_design/layout/combobox_fields.cc
+glom/mode_design/layout/combobox_relationship.cc
+glom/mode_design/layout/dialog_choose_field.cc
+glom/mode_design/layout/dialog_choose_relationship.cc
+glom/mode_design/layout/dialog_layout_calendar_related.cc
+glom/mode_design/layout/dialog_layout_details.cc
+glom/mode_design/layout/dialog_layout_export.cc
+glom/mode_design/layout/dialog_layout_list.cc
+glom/mode_design/layout/dialog_layout_list_related.cc
+glom/mode_design/layout/layout_item_dialogs/box_formatting.cc
+glom/mode_design/layout/layout_item_dialogs/combo_summarytype.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_field_layout.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_field_summary.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_group_by.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_groupby_secondaryfields.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_groupby_sortfields.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_imageobject.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_notebook.cc
+glom/mode_design/layout/layout_item_dialogs/dialog_textobject.cc
+glom/mode_design/report_layout/dialog_layout_report.cc
 glom/mode_design/print_layouts/box_print_layouts.cc
-glom/mode_design/print_layouts/canvas_layout_item.cc
-glom/mode_design/print_layouts/canvas_print_layout.cc
 glom/mode_design/print_layouts/print_layout_toolbar.cc
 glom/mode_design/print_layouts/window_print_layout_edit.cc
+glom/mode_design/relationships_overview/dialog_relationships_overview.cc
 glom/mode_design/script_library/dialog_new_script.cc
 glom/mode_design/script_library/dialog_script_library.cc
 glom/mode_design/users/dialog_groups_list.cc
@@ -105,9 +105,9 @@ glom/mode_find/box_data_details_find.cc
 glom/mode_find/box_data_list_find.cc
 glom/mode_find/notebook_find.cc
 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/relationships_overview/dialog_relationships_overview.cc
-glom/reports/dialog_layout_report.cc
 glom/translation/combobox_locale.cc
 glom/translation/dialog_change_language.cc
 glom/translation/window_translations.cc
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]