glom r1710 - in trunk: . docs/user-guide glom glom/libglom glom/mode_data glom/mode_design/users glom/reports glom/utility_widgets/adddel glom/utility_widgets/db_adddel

[murrayc svn gnome org]

Author: murrayc
Date: Tue Oct 21 08:25:01 2008
New Revision: 1710
URL: http://svn.gnome.org/viewvc/glom?rev=1710&view=rev

Log:
Increased version

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/docs/user-guide/Makefile.am
   trunk/glom/dialog_database_preferences.cc
   trunk/glom/dialog_existing_or_new.cc
   trunk/glom/dialog_existing_or_new.h
   trunk/glom/dialog_import_csv.cc
   trunk/glom/libglom/connectionpool.cc
   trunk/glom/mode_data/dialog_choose_field.cc
   trunk/glom/mode_data/dialog_choose_field.h
   trunk/glom/mode_data/dialog_layout_details.cc
   trunk/glom/mode_design/users/dialog_groups_list.cc
   trunk/glom/reports/dialog_layout_report.cc
   trunk/glom/utility_widgets/adddel/adddel.cc
   trunk/glom/utility_widgets/db_adddel/db_adddel.cc
   trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct 21 08:25:01 2008
@@ -4,7 +4,7 @@
 AM_CONFIG_HEADER(config.h)
 
 # Package name and version number:
-AM_INIT_AUTOMAKE(glom, 1.7.3)
+AM_INIT_AUTOMAKE(glom, 1.8.0)
 
 AM_MAINTAINER_MODE
 

Modified: trunk/docs/user-guide/Makefile.am
==============================================================================
--- trunk/docs/user-guide/Makefile.am	(original)
+++ trunk/docs/user-guide/Makefile.am	Tue Oct 21 08:25:01 2008
@@ -12,7 +12,7 @@
 	figures/glom_data_list.png \
 	figures/glom_design_layout_list.png \
 	figures/glom_design_reports_vertical_group.png \
-	figures/glom_import.png
+	figures/glom_import.png \
 	figures/start.png \
 	figures/glom_design_fields_dialog_calculated.png \
 	figures/glom_design_reports_details.png \

Modified: trunk/glom/dialog_database_preferences.cc
==============================================================================
--- trunk/glom/dialog_database_preferences.cc	(original)
+++ trunk/glom/dialog_database_preferences.cc	Tue Oct 21 08:25:01 2008
@@ -77,7 +77,7 @@
   if(path_string.empty())
     return;
 
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_autoincrements->get_iter(path);

Modified: trunk/glom/dialog_existing_or_new.cc
==============================================================================
--- trunk/glom/dialog_existing_or_new.cc	(original)
+++ trunk/glom/dialog_existing_or_new.cc	Tue Oct 21 08:25:01 2008
@@ -742,13 +742,13 @@
 }
 #endif // !G_OS_WIN32
 
-void Dialog_ExistingOrNew::on_existing_row_activated(const Gtk::TreePath& path, Gtk::TreeViewColumn* column)
+void Dialog_ExistingOrNew::on_existing_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column)
 {
   if(m_select_button->is_sensitive())
     on_select_clicked();
 }
 
-void Dialog_ExistingOrNew::on_existing_button_clicked(const Gtk::TreePath& path)
+void Dialog_ExistingOrNew::on_existing_button_clicked(const Gtk::TreeModel::Path& path)
 {
   m_existing_view->get_selection()->select(path);
 
@@ -756,13 +756,13 @@
     on_select_clicked();
 }
 
-void Dialog_ExistingOrNew::on_new_row_activated(const Gtk::TreePath& path, Gtk::TreeViewColumn* column)
+void Dialog_ExistingOrNew::on_new_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column)
 {
   if(m_select_button->is_sensitive())
     on_select_clicked();
 }
 
-void Dialog_ExistingOrNew::on_new_button_clicked(const Gtk::TreePath& path)
+void Dialog_ExistingOrNew::on_new_button_clicked(const Gtk::TreeModel::Path& path)
 {
   m_new_view->get_selection()->select(path);
 

Modified: trunk/glom/dialog_existing_or_new.h
==============================================================================
--- trunk/glom/dialog_existing_or_new.h	(original)
+++ trunk/glom/dialog_existing_or_new.h	Tue Oct 21 08:25:01 2008
@@ -64,15 +64,15 @@
 #endif
 
 protected:
-  Action get_action_impl(Gtk::TreeIter& iter) const;
+  Action get_action_impl(Gtk::TreeModel::iterator& iter) const;
 
-  std::auto_ptr<Gtk::TreeIter> create_dummy_item_existing(const Gtk::TreeIter& parent, const Glib::ustring& text);
-  std::auto_ptr<Gtk::TreeIter> create_dummy_item_new(const Gtk::TreeIter& parent, const Glib::ustring& text);
+  std::auto_ptr<Gtk::TreeModel::iterator> create_dummy_item_existing(const Gtk::TreeModel::iterator& parent, const Glib::ustring& text);
+  std::auto_ptr<Gtk::TreeModel::iterator> create_dummy_item_new(const Gtk::TreeModel::iterator& parent, const Glib::ustring& text);
 
-  void existing_icon_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeIter& iter);
-  void existing_title_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeIter& iter);
-  void new_icon_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeIter& iter);
-  void new_title_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeIter& iter);
+  void existing_icon_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
+  void existing_title_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
+  void new_icon_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
+  void new_title_data_func(Gtk::CellRenderer* renderer, const Gtk::TreeModel::iterator& iter);
 
   void on_switch_page(GtkNotebookPage* page, guint page_num);
   void on_existing_selection_changed();
@@ -98,10 +98,10 @@
   void on_service_removed(const Glib::ustring& name, const Glib::ustring& type);
 #endif
 
-  void on_existing_row_activated(const Gtk::TreePath& path, Gtk::TreeViewColumn* column);
-  void on_existing_button_clicked(const Gtk::TreePath& path);
-  void on_new_row_activated(const Gtk::TreePath& path, Gtk::TreeViewColumn* column);
-  void on_new_button_clicked(const Gtk::TreePath& path);
+  void on_existing_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
+  void on_existing_button_clicked(const Gtk::TreeModel::Path& path);
+  void on_new_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* column);
+  void on_new_button_clicked(const Gtk::TreeModel::Path& path);
 
   void on_select_clicked();
 
@@ -171,21 +171,21 @@
   Gtk::CellRendererPixbuf m_new_icon_renderer;
   Gtk::CellRendererText m_new_title_renderer;
 
-  Gtk::TreeIter m_iter_existing_recent;
+  Gtk::TreeModel::iterator m_iter_existing_recent;
 #ifndef G_OS_WIN32
-  Gtk::TreeIter m_iter_existing_network;
+  Gtk::TreeModel::iterator m_iter_existing_network;
 #endif
-  Gtk::TreeIter m_iter_existing_other;
+  Gtk::TreeModel::iterator m_iter_existing_other;
 
-  Gtk::TreeIter m_iter_new_empty;
-  Gtk::TreeIter m_iter_new_template;
+  Gtk::TreeModel::iterator m_iter_new_empty;
+  Gtk::TreeModel::iterator m_iter_new_template;
 
   // Dummy children to indicate that a parent item has no (real) children
 #ifndef G_OS_WIN32
-  std::auto_ptr<Gtk::TreeIter> m_iter_existing_network_dummy;
+  std::auto_ptr<Gtk::TreeModel::iterator> m_iter_existing_network_dummy;
 #endif
-  std::auto_ptr<Gtk::TreeIter> m_iter_existing_recent_dummy;
-  std::auto_ptr<Gtk::TreeIter> m_iter_new_template_dummy;
+  std::auto_ptr<Gtk::TreeModel::iterator> m_iter_existing_recent_dummy;
+  std::auto_ptr<Gtk::TreeModel::iterator> m_iter_new_template_dummy;
 
 #ifndef GLOM_ENABLE_CLIENT_ONLY
   Glib::RefPtr<Gio::File> m_examples_dir;

Modified: trunk/glom/dialog_import_csv.cc
==============================================================================
--- trunk/glom/dialog_import_csv.cc	(original)
+++ trunk/glom/dialog_import_csv.cc	Tue Oct 21 08:25:01 2008
@@ -923,7 +923,7 @@
       
       // Update the rows, so they are redrawn, doing a conversion to the new type.
       const Gtk::TreeNodeChildren& sample_children = m_sample_model->children();
-      // Create a TreePath with initial index 0. We need a TreePath for the row_changed() call
+      // Create a TreeModel::Path with initial index 0. We need a TreeModel::Path for the row_changed() call
       Gtk::TreeModel::Path path("0");
 
       for(Gtk::TreeModel::iterator sample_iter = sample_children.begin(); sample_iter != sample_children.end(); ++ sample_iter)

Modified: trunk/glom/libglom/connectionpool.cc
==============================================================================
--- trunk/glom/libglom/connectionpool.cc	(original)
+++ trunk/glom/libglom/connectionpool.cc	Tue Oct 21 08:25:01 2008
@@ -65,7 +65,7 @@
 #include <string.h> // for memset
 #include "gst-package.h"
 
-/* TODO: Should this be used in clientonly mode? */
+/* TODO: Should this be used in client-only mode? */
 
 #ifndef G_OS_WIN32
 static EpcProtocol publish_protocol = EPC_PROTOCOL_HTTPS;

Modified: trunk/glom/mode_data/dialog_choose_field.cc
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.cc	(original)
+++ trunk/glom/mode_data/dialog_choose_field.cc	Tue Oct 21 08:25:01 2008
@@ -216,7 +216,7 @@
   return field;
 }
 
-void Dialog_ChooseField::on_row_activated(const Gtk::TreePath& /* path */, Gtk::TreeViewColumn* /* view_column */)
+void Dialog_ChooseField::on_row_activated(const Gtk::TreeModel::Path& /* path */, Gtk::TreeViewColumn* /* view_column */)
 {
   response(Gtk::RESPONSE_OK);
 }

Modified: trunk/glom/mode_data/dialog_choose_field.h
==============================================================================
--- trunk/glom/mode_data/dialog_choose_field.h	(original)
+++ trunk/glom/mode_data/dialog_choose_field.h	Tue Oct 21 08:25:01 2008
@@ -53,7 +53,7 @@
 
 protected:
 
-  virtual void on_row_activated(const Gtk::TreePath& path, Gtk::TreeViewColumn* view_column);
+  virtual void on_row_activated(const Gtk::TreeModel::Path& path, Gtk::TreeViewColumn* view_column);
   virtual void on_treeview_selection_changed();
   virtual void on_combo_relationship_changed();
   virtual void on_checkbutton_related_relationships_toggled();

Modified: trunk/glom/mode_data/dialog_layout_details.cc
==============================================================================
--- trunk/glom/mode_data/dialog_layout_details.cc	(original)
+++ trunk/glom/mode_data/dialog_layout_details.cc	Tue Oct 21 08:25:01 2008
@@ -944,7 +944,7 @@
         {
           *field = *chosenitem; //TODO_Performance.
           m_modified = true;
-          //m_model_parts->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+          //m_model_parts->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
         }
       }
     }
@@ -1312,7 +1312,7 @@
 {
   if(!path_string.empty())
   {
-    Gtk::TreePath path(path_string);
+    Gtk::TreeModel::Path path(path_string);
 
     //Get the row from the path:
     Gtk::TreeModel::iterator iter = m_model_items->get_iter(path);
@@ -1337,7 +1337,7 @@
 {
   if(!path_string.empty())
   {
-    Gtk::TreePath path(path_string);
+    Gtk::TreeModel::Path path(path_string);
 
     //Get the row from the path:
     Gtk::TreeModel::iterator iter = m_model_items->get_iter(path);
@@ -1361,7 +1361,7 @@
 {
   if(!path_string.empty())
   {
-    Gtk::TreePath path(path_string);
+    Gtk::TreeModel::Path path(path_string);
 
     //Get the row from the path:
     Gtk::TreeModel::iterator iter = m_model_items->get_iter(path);
@@ -1391,7 +1391,7 @@
   if(path_string.empty())
     return;
 
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_items->get_iter(path);

Modified: trunk/glom/mode_design/users/dialog_groups_list.cc
==============================================================================
--- trunk/glom/mode_design/users/dialog_groups_list.cc	(original)
+++ trunk/glom/mode_design/users/dialog_groups_list.cc	Tue Oct 21 08:25:01 2008
@@ -503,7 +503,7 @@
 
 void Dialog_GroupsList::on_treeview_tables_toggled_view(const Glib::ustring& path_string)
 {
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_tables->get_iter(path);
@@ -542,7 +542,7 @@
 
 void Dialog_GroupsList::on_treeview_tables_toggled_edit(const Glib::ustring& path_string)
 {
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_tables->get_iter(path);
@@ -566,7 +566,7 @@
 
 void Dialog_GroupsList::on_treeview_tables_toggled_create(const Glib::ustring& path_string)
 {
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_tables->get_iter(path);
@@ -590,7 +590,7 @@
 
 void Dialog_GroupsList::on_treeview_tables_toggled_delete(const Glib::ustring& path_string)
 {
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_model_tables->get_iter(path);

Modified: trunk/glom/reports/dialog_layout_report.cc
==============================================================================
--- trunk/glom/reports/dialog_layout_report.cc	(original)
+++ trunk/glom/reports/dialog_layout_report.cc	Tue Oct 21 08:25:01 2008
@@ -661,7 +661,7 @@
     Gtk::TreeModel::iterator iter;
     if(parent)
     {
-      m_treeview_parts_main->expand_row( Gtk::TreePath(parent), true);
+      m_treeview_parts_main->expand_row( Gtk::TreeModel::Path(parent), true);
       iter = model->append(parent->children());
     }
     else
@@ -671,7 +671,7 @@
   }
 
   if(parent)
-    treeview->expand_row( Gtk::TreePath(parent), true);
+    treeview->expand_row( Gtk::TreeModel::Path(parent), true);
 
   enable_buttons();
 }
@@ -789,7 +789,7 @@
         if(field_chosen)
         {
           *field = *field_chosen;
-          model->row_changed(Gtk::TreePath(iter), iter);
+          model->row_changed(Gtk::TreeModel::Path(iter), iter);
         }
       }
     }
@@ -842,7 +842,7 @@
               {
                 *fieldsummary = *chosenitem; //TODO_Performance.
 
-                model->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+                model->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
                 m_modified = true;
               }
             }
@@ -865,7 +865,7 @@
           if(chosenitem)
           {
             *field = *chosenitem; //TODO_Performance.
-            model->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+            model->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
             m_modified = true;
           }
         }
@@ -878,7 +878,7 @@
             if(chosen)
             {
               *layout_item_text = *chosen;
-              model->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+              model->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
               m_modified = true;
             }
           }
@@ -891,7 +891,7 @@
               if(chosen)
               {
                 *layout_item_image = *chosen;
-                model->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+                model->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
                 m_modified = true;
               }
             }
@@ -923,7 +923,7 @@
                       if(chosenitem)
                       {
                         *group_by = *chosenitem;
-                        model->row_changed(Gtk::TreePath(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
+                        model->row_changed(Gtk::TreeModel::Path(iter), iter); //TODO: Add row_changed(iter) to gtkmm?
                         m_modified = true;
                       }
                     }

Modified: trunk/glom/utility_widgets/adddel/adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/adddel/adddel.cc	(original)
+++ trunk/glom/utility_widgets/adddel/adddel.cc	Tue Oct 21 08:25:01 2008
@@ -1116,7 +1116,7 @@
   if(path_string.empty())
     return;
 
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_refListStore->get_iter(path);
@@ -1191,7 +1191,7 @@
   if(path_string.empty())
     return;
 
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_refListStore->get_iter(path);
@@ -1306,7 +1306,7 @@
 
 void AddDel::on_treeview_cell_editing_started(Gtk::CellEditable* editable, const Glib::ustring& path_string, int model_column_index)
 {
-  Gtk::TreePath path(path_string);
+  Gtk::TreeModel::Path path(path_string);
 
   if(!m_refListStore)
     return;

Modified: trunk/glom/utility_widgets/db_adddel/db_adddel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/db_adddel.cc	(original)
+++ trunk/glom/utility_widgets/db_adddel/db_adddel.cc	Tue Oct 21 08:25:01 2008
@@ -1397,7 +1397,7 @@
   if(!m_refListStore)
     return;
 
-  const Gtk::TreePath path(path_string);
+  const Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_refListStore->get_iter(path);
@@ -1480,7 +1480,7 @@
   if(!m_refListStore)
     return;
 
-  const Gtk::TreePath path(path_string);
+  const Gtk::TreeModel::Path path(path_string);
 
   //Get the row from the path:
   Gtk::TreeModel::iterator iter = m_refListStore->get_iter(path);

Modified: trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc
==============================================================================
--- trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc	(original)
+++ trunk/glom/utility_widgets/db_adddel/glom_db_treemodel.cc	Tue Oct 21 08:25:01 2008
@@ -219,7 +219,7 @@
 
       TreeModel::iterator iter_out(model, iter);
 
-      const gboolean retval = cpp_model->get_iter_vfunc(Gtk::TreePath(path, true), iter_out);
+      const gboolean retval = cpp_model->get_iter_vfunc(Gtk::TreeModel::Path(path, true), iter_out);
 
       if(retval)
         *iter = *(iter_out.gobj());
@@ -963,7 +963,7 @@
     type_datamodel_row_index datamodel_row = get_datamodel_row_index_from_tree_row_iter(iter);
 
     //Remove the row.
-    Gtk::TreePath path_deleted = get_path(iter);
+    Gtk::TreeModel::Path path_deleted = get_path(iter);
 
     if(!(m_map_rows[datamodel_row].m_removed))
     {