[glom: 16/16] Merged from maemo5 branch.

[Murray Cumming <murrayc src gnome org>]

commit daff48974b9d769662b36b4e90709f0d55bdcc97
Merge: 2254876... e9a3437...
Author: Murray Cumming <murrayc murrayc com>
Date:   Mon Sep 21 18:16:05 2009 +0200

    Merged from maemo5 branch.

 ChangeLog                                          |   38 ++-
 Makefile_glom.am                                   |   12 +-
 glom/application.cc                                |  177 +++++---
 glom/application.h                                 |   34 ++-
 glom/bakery/app_withdoc_gtk.cc                     |   30 +-
 glom/base_db.cc                                    |    6 +-
 glom/box_reports.cc                                |    2 +
 glom/box_reports.h                                 |    2 +
 glom/frame_glom.cc                                 |   70 ++-
 glom/frame_glom.h                                  |   15 +-
 glom/main.cc                                       |    9 +-
 glom/mode_data/box_data.cc                         |    2 +-
 glom/mode_data/box_data_list.cc                    |    1 -
 glom/mode_data/box_data_list_related.cc            |    1 -
 glom/mode_data/notebook_data.cc                    |    5 +
 glom/navigation/box_tables.cc                      |    2 +
 glom/navigation/box_tables.h                       |    8 +-
 glom/navigation/maemo/pickerbutton_table.cc        |  119 +++++
 glom/navigation/maemo/pickerbutton_table.h         |   75 +++
 glom/utility_widgets/adddel/adddel.cc              |   10 -
 glom/utility_widgets/adddel/adddel.h               |    4 -
 .../utility_widgets/canvas/canvas_image_movable.cc |    4 +-
 glom/utility_widgets/datawidget.cc                 |   66 +---
 glom/utility_widgets/db_adddel/db_adddel.cc        |  503 ++++++++++++--------
 glom/utility_widgets/db_adddel/db_adddel.h         |   54 ++-
 .../db_adddel/db_adddel_withbuttons.cc             |    6 +-
 glom/utility_widgets/entryglom.cc                  |   16 +-
 glom/utility_widgets/entryglom.h                   |    1 -
 glom/utility_widgets/imageglom.cc                  |    4 +-
 glom/utility_widgets/textviewglom.cc               |    8 +-
 glom/utils_ui.cc                                   |   71 +++
 glom/utils_ui.h                                    |    3 +
 po/POTFILES.in                                     |    1 +
 tests/import/test_parsing.cc                       |   48 ++-
 tests/import/test_signals.cc                       |   21 +-
 35 files changed, 989 insertions(+), 439 deletions(-)
---
diff --cc glom/utility_widgets/db_adddel/db_adddel.cc
index d4a0881,de84771..9b136ab
--- a/glom/utility_widgets/db_adddel/db_adddel.cc
+++ b/glom/utility_widgets/db_adddel/db_adddel.cc
@@@ -490,29 -512,35 +512,35 @@@ bool DbAddDel::select_item(const Gtk::T
  
      treemodel_col += get_count_hidden_system_columns();
  
+     #ifdef GLOM_ENABLE_MAEMO
+     m_TreeView.select_iter(0, iter, true);
+     #else
      Glib::RefPtr<Gtk::TreeSelection> refTreeSelection = m_TreeView.get_selection();
-     if(refTreeSelection)
-     {
-       refTreeSelection->select(iter);
- 
-       Gtk::TreeModel::Path path = m_refListStore->get_path(iter);
 -    g_assert(refTreeSelection)
++    g_assert(refTreeSelection);
+     refTreeSelection->select(iter);
+     
+     Gtk::TreeModel::Path path = m_refListStore->get_path(iter);
  
-       guint view_column_index = 0;
-       const bool test = get_view_column_index(treemodel_col, view_column_index);
-       if(test)
+     guint view_column_index = 0;
+     const bool test = get_view_column_index(treemodel_col, view_column_index);
+     if(test)
+     {
+       Gtk::TreeView::Column* pColumn = m_TreeView.get_column(view_column_index);
+       if(pColumn)
        {
-         Gtk::TreeView::Column* pColumn = m_TreeView.get_column(view_column_index);
-         if(pColumn)
+         #ifndef GLOM_ENABLE_MAEMO
+         if(pColumn != m_treeviewcolumn_button) //This would activate the button. Let's avoid this, though it should never happen.
+         #endif //GLOM_ENABLE_MAEMO
          {
-           if(pColumn != m_treeviewcolumn_button) //This would activate the button. Let's avoid this, though it should never happen.
-             m_TreeView.set_cursor(path, *pColumn, start_editing);
+           m_TreeView.set_cursor(path, *pColumn, start_editing);
          }
-         else
-            g_warning("DbAddDel::select_item:TreeViewColumn not found.");
        }
        else
-            g_warning("DbAddDel::select_item:TreeViewColumn index not found. column=%d", treemodel_col);
+        g_warning("DbAddDel::select_item:TreeViewColumn not found.");
      }
+     else
+        g_warning("DbAddDel::select_item:TreeViewColumn index not found. column=%d", treemodel_col);
+     #endif //GLOM_ENABLE_MAEMO
  
      bResult = true;
    }