glom r1848 - in trunk: . glom glom/libglom/data_structure glom/mode_design/fields

[murrayc svn gnome org]

Author: murrayc
Date: Thu Jan 15 17:25:57 2009
New Revision: 1848
URL: http://svn.gnome.org/viewvc/glom?rev=1848&view=rev

Log:
2009-01-15  Murray Cumming  <murrayc murrayc com>

* glom/glom.glade: initial dialog: Correct the button order, which 
seems to have been broken when re-saving with glade-2. The other 
dialogs seem OK.
* glom/libglom/data_structure/fieldtypes.cc: Constructor:
* glom/mode_design/fields/box_db_table_definition.cc: fill_fields(): 
Comment out some debug output.

Modified:
   trunk/ChangeLog
   trunk/glom/glom.glade
   trunk/glom/libglom/data_structure/fieldtypes.cc
   trunk/glom/mode_design/fields/box_db_table_definition.cc

Modified: trunk/glom/glom.glade
==============================================================================
--- trunk/glom/glom.glade	(original)
+++ trunk/glom/glom.glade	Thu Jan 15 17:25:57 2009
@@ -349,19 +349,7 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkButton" id="existing_or_new_button_select">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">_Select</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="button1">
+	    <widget class="GtkButton" id="helpbutton1">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-help</property>
@@ -384,6 +372,19 @@
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
+
+          <child>
+	    <widget class="GtkButton" id="existing_or_new_button_select">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">_Select</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	    </widget>
+	  </child>
+
 	</widget>
 	<packing>
 	  <property name="padding">0</property>

Modified: trunk/glom/libglom/data_structure/fieldtypes.cc
==============================================================================
--- trunk/glom/libglom/data_structure/fieldtypes.cc	(original)
+++ trunk/glom/libglom/data_structure/fieldtypes.cc	Thu Jan 15 17:25:57 2009
@@ -87,12 +87,12 @@
             const GType gdatype = gda_g_type_from_string(type_string.c_str());
 
             //Save it for later:
-            std::cout << "debug: schema_type_string=" << schema_type_string << ", gda type=" << gdatype << "(" << g_type_name(gdatype) << ")" << std::endl;
+            //std::cout << "debug: schema_type_string=" << schema_type_string << ", gda type=" << gdatype << "(" << g_type_name(gdatype) << ")" << std::endl;
             
             m_mapSchemaStringsToGdaTypes[schema_type_string] = gdatype;
 
             Glib::ustring gdatypestring = gda_g_type_to_string(gdatype); // TODO: What is this actually used for?
-            std::cout << "schema type: " << schema_type_string << " = gdatype " << (guint)gdatype << "(" << gdatypestring << ")" << std::endl;
+            //std::cout << "schema type: " << schema_type_string << " = gdatype " << (guint)gdatype << "(" << gdatypestring << ")" << std::endl;
             
             m_mapGdaTypesToSchemaStrings[gdatype] = schema_type_string; //We save it twice, to just to make searching easier, without using a predicate.
             

Modified: trunk/glom/mode_design/fields/box_db_table_definition.cc
==============================================================================
--- trunk/glom/mode_design/fields/box_db_table_definition.cc	(original)
+++ trunk/glom/mode_design/fields/box_db_table_definition.cc	Thu Jan 15 17:25:57 2009
@@ -590,7 +590,8 @@
 
 void Box_DB_Table_Definition::fill_fields()
 {
-  std::cout << "DEBUG: Box_DB_Table_Definition::fill_fields()" << std::endl;
+  //std::cout << "DEBUG: Box_DB_Table_Definition::fill_fields()" << std::endl;
+
   //Update the fields (also checking the actual database):
   m_vecFields = get_fields_for_table(m_table_name);
 }