[glom] DbUtils::get_fields_for_table_from_database(): Get default value too.



commit ebaac04c1506025eb03a4e63fda907f907236bf5
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 13 11:09:33 2013 +0100

    DbUtils::get_fields_for_table_from_database(): Get default value too.
    
    * glom/libglom/db_utils.cc: Previously libgda got this wrong,
      but it has been fixed for a while now and we depend on newer
      versions.

 glom/libglom/db_utils.cc                          |    7 +++----
 glom/mode_design/fields/dialog_fielddefinition.cc |    5 ++++-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/glom/libglom/db_utils.cc b/glom/libglom/db_utils.cc
index b2994ab..0f85d75 100644
--- a/glom/libglom/db_utils.cc
+++ b/glom/libglom/db_utils.cc
@@ -929,11 +929,10 @@ type_vec_fields get_fields_for_table_from_database(const Glib::ustring& table_na
 
 
         //Get the default value:
-        /* libgda does not return this correctly yet. TODO: check bug 
http://bugzilla.gnome.org/show_bug.cgi?id=143576
-        const Gnome::Gda::Value value_defaultvalue = 
data_model_fields->get_value_at(DATAMODEL_FIELDS_COL_DEFAULTVALUE, row);
-        if(value_defaultG_VALUE_TYPE(value.gobj()) ==  G_TYPE_STRING)
+        const Gnome::Gda::Value value_defaultvalue =
+          data_model_fields->get_value_at(DATAMODEL_FIELDS_COL_DEFAULTVALUE, row);
+        if(value_defaultvalue.get_value_type() ==  G_TYPE_STRING)
           field_info->set_default_value(value_defaultvalue);
-        */
 
         //Get whether it can be null:
         const Gnome::Gda::Value value_notnull = 
data_model_fields->get_value_at(DATAMODEL_FIELDS_COL_NOTNULL, row);
diff --git a/glom/mode_design/fields/dialog_fielddefinition.cc 
b/glom/mode_design/fields/dialog_fielddefinition.cc
index b62dbb1..9d34886 100644
--- a/glom/mode_design/fields/dialog_fielddefinition.cc
+++ b/glom/mode_design/fields/dialog_fielddefinition.cc
@@ -144,7 +144,10 @@ void Dialog_FieldDefinition::set_field(const sharedptr<const Field>& field, cons
 
   Gtk::Label* pLabel = m_pDataWidget_DefaultValueSimple->get_label();
   if(!pLabel->get_text().empty())
-    m_pBox_DefaultValueSimple->pack_start(*pLabel);
+  {
+    pLabel->set_valign(Gtk::ALIGN_START); //Because the widget might be multiline.
+    m_pBox_DefaultValueSimple->pack_start(*pLabel, Gtk::PACK_SHRINK);
+  }
 
   m_pBox_DefaultValueSimple->pack_end(*m_pDataWidget_DefaultValueSimple, Gtk::PACK_EXPAND_WIDGET);
   m_pDataWidget_DefaultValueSimple->set_value(default_value);


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