Use of gdouble instead of gfloat in GtkFormFieldFloat

because gfloat is not precise.
Added test.

diff --git a/libgtkform/fieldfloat.c b/libgtkform/fieldfloat.c
index cc426244f68d6df23c01eb3cd1a1873fbf924feb..43791049daf4cc0e396880963cf85e59ed5ad5f8 100644 (file)
--- a/libgtkform/fieldfloat.c
+++ b/libgtkform/fieldfloat.c
@@ -206,7 +206,7 @@ gchar
                        char *cur = g_strdup (setlocale (LC_NUMERIC, NULL));
                        gda_locale_changed ();
 
-                       gfloat fval = g_strtod (value, NULL);
+                       gdouble fval = g_strtod (value, NULL);
 
                        setlocale (LC_NUMERIC, "C");
                        gda_locale_changed ();
@@ -443,7 +443,7 @@ gtk_form_field_float_set_from_datamodel (GtkFormField *field, GdaDataModel *dm,
 {
        gboolean ret = FALSE;
        GtkFormFieldFloatPrivate *priv;
-       gfloat value;
+       gdouble value;
        gchar *field_name;
 
        g_return_val_if_fail (IS_GTK_FORM_FIELD_FLOAT (field), FALSE);
@@ -453,7 +453,7 @@ gtk_form_field_float_set_from_datamodel (GtkFormField *field, GdaDataModel *dm,
 
        field_name = gtk_form_field_get_field_name (field);
 
-       value = gdaex_data_model_get_field_value_float_at (dm, row, field_name);
+       value = gdaex_data_model_get_field_value_double_at (dm, row, field_name);
 
        setlocale (LC_NUMERIC, "");
        gda_locale_changed ();

diff --git a/test/Makefile.am b/test/Makefile.am
index c3ee566ebf8d0c3605b813ef4ada689ae97702ba..c42ec12d16b471f3c0c0b1a6d63f523eb107d0e2 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,6 +6,7 @@ AM_CPPFLAGS = $(GTKFORM_CFLAGS) \
               -DGUIDIR="\"@abs_builddir@\""
 
 noinst_PROGRAMS = test \
+                  double \
                   from_xml \
                   from_xml_with_db
 

diff --git a/test/double.c b/test/double.c
new file mode 100644 (file)
index 0000000..de10d93
--- /dev/null
+++ b/test/double.c
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2013 Andrea Zagli <azagli@libero.it>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include <string.h>
+
+#include <gtk/gtk.h>
+
+#include <libgdaex/libgdaex.h>
+#include <libgtkform/form.h>
+
+GtkWidget *w;
+
+GdaEx *gdaex;
+
+GtkForm *form;
+
+G_MODULE_EXPORT void
+on_btn_save_clicked (GtkButton *button,
+                         gpointer user_data)
+{
+       gchar *sql;
+       GdaDataModel *dm;
+
+       sql = gtk_form_get_sql (form, GTK_FORM_SQL_UPDATE);
+       g_message("SQL UPDATE %s",sql);
+       gdaex_execute (gdaex, sql);
+       g_free (sql);
+
+       sql = gtk_form_get_sql (form, GTK_FORM_SQL_SELECT);
+
+       dm = gdaex_query (gdaex, sql);
+       g_free (sql);
+       if (dm != NULL && gda_data_model_get_n_rows (dm) > 0)
+               {
+                       gtk_form_fill_from_datamodel (form, dm, 0);
+               }
+}
+
+int
+main (int argc, char **argv)
+{
+       GError *error;
+       GtkBuilder *gtkbuilder;
+
+       gchar *sql;
+       GdaDataModel *dm;
+
+       gtk_init (&argc, &argv);
+
+       gdaex = gdaex_new_from_string ("PostgreSQL://HOST=localhost;USERNAME=postgres;PASSWORD=postgres;DB_NAME=prove");
+       if (gdaex == NULL)
+               {
+                       return 0;
+               }
+
+       gtkbuilder = gtk_builder_new ();
+
+       error = NULL;
+       gtk_builder_add_objects_from_file (gtkbuilder, GUIDIR "/test_db.gui",
+                                          g_strsplit_set ("w_double", "|", -1),
+                                          &error);
+       if (error != NULL)
+               {
+                       g_error ("Errore: %s", error->message);
+               }
+
+       form = gtk_form_new_from_file (GUIDIR "/double.xml", gtkbuilder);
+       if (form == NULL) return 0;
+
+       w = GTK_WIDGET (gtk_builder_get_object (gtkbuilder, "w_double"));
+
+       gtk_builder_connect_signals (gtkbuilder, NULL);
+
+       sql = gtk_form_get_sql (form, GTK_FORM_SQL_SELECT);
+
+       dm = gdaex_query (gdaex, sql);
+       g_free (sql);
+       if (dm != NULL && gda_data_model_get_n_rows (dm) > 0)
+               {
+                       gtk_form_fill_from_datamodel (form, dm, 0);
+               }
+
+       gtk_widget_show_all (w);
+
+       gtk_main ();
+
+       return 0;
+}
\ No newline at end of file

diff --git a/test/double.xml b/test/double.xml
new file mode 100644 (file)
index 0000000..8a3c64c
--- /dev/null
+++ b/test/double.xml
@@ -0,0 +1,17 @@
+<gtkform>
+
+       <table>gtkform_double</table>
+
+       <widget type="entry" name="entry1">
+               <field type="integer" name="id">
+                       <is-key>t</is-key>
+               </field>
+       </widget>
+
+       <widget type="entry" name="entry2">
+               <field type="float" name="amount">
+                       <decimals>2</decimals>
+               </field>
+       </widget>
+
+</gtkform>

diff --git a/test/test_db.gui b/test/test_db.gui
index bdeaf3f17311b256089161718812290ecf20dc86..b50ae34e26940142b906b9704f2cc8024d53a723 100644 (file)
--- a/test/test_db.gui
+++ b/test/test_db.gui
@@ -1,29 +1,76 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy toplevel-contextual -->
+  <requires lib="gtk+" version="2.24"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="upper">100</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="lstore_customers">
+    <columns>
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkListStore" id="lstore_nation">
+    <columns>
+      <!-- column-name id -->
+      <column type="guint"/>
+      <!-- column-name name -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0">1</col>
+        <col id="1" translatable="yes">China</col>
+      </row>
+      <row>
+        <col id="0">2</col>
+        <col id="1" translatable="yes">Germany</col>
+      </row>
+      <row>
+        <col id="0">3</col>
+        <col id="1" translatable="yes">India</col>
+      </row>
+      <row>
+        <col id="0">4</col>
+        <col id="1" translatable="yes">Italy</col>
+      </row>
+      <row>
+        <col id="0">6</col>
+        <col id="1" translatable="yes">USA</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkWindow" id="wMain">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">test libform</property>
     <property name="default_width">600</property>
     <property name="default_height">440</property>
-    <signal name="delete_event" handler="gtk_main_quit"/>
+    <signal name="delete-event" handler="gtk_main_quit" swapped="no"/>
     <child>
-      <object class="GtkVBox" id="vbox1">
+      <object class="GtkVBox" id="vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">3</property>
-        <property name="orientation">vertical</property>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkTable" id="table3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">3</property>
             <property name="n_rows">9</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">3</property>
             <property name="row_spacing">3</property>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkLabel" id="label8">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">ID</property>
               </object>
@@ -33,8 +80,9 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Name</property>
               </object>
@@ -48,6 +96,7 @@
             <child>
               <object class="GtkLabel" id="lbl_id">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
               </object>
               <packing>
@@ -62,6 +111,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">200</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -74,6 +127,7 @@
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Age</property>
               </object>
@@ -88,6 +142,10 @@
               <object class="GtkSpinButton" id="spn_age">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
                 <property name="adjustment">adjustment2</property>
                 <property name="climb_rate">1</property>
               </object>
@@ -102,6 +160,7 @@
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Nation</property>
               </object>
@@ -115,6 +174,7 @@
             <child>
               <object class="GtkLabel" id="label9">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Married</property>
               </object>
@@ -145,6 +205,7 @@
             <child>
               <object class="GtkLabel" id="label10">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Description</property>
               </object>
@@ -178,6 +239,7 @@
             <child>
               <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Birthday</property>
               </object>
@@ -191,6 +253,7 @@
             <child>
               <object class="GtkComboBox" id="cb_nation">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="model">lstore_nation</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext2"/>
@@ -213,7 +276,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="max_length">10</property>
-                <property name="invisible_char">&#x2022;</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -225,6 +292,7 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Sex</property>
               </object>
@@ -238,6 +306,7 @@
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkRadioButton" id="rbtnNone">
                     <property name="label" translatable="yes">None</property>
@@ -248,6 +317,8 @@
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -261,6 +332,8 @@
                     <property name="group">rbtnNone</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -274,6 +347,8 @@
                     <property name="group">rbtnNone</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -288,6 +363,7 @@
             <child>
               <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Income</property>
               </object>
@@ -302,7 +378,11 @@
               <object class="GtkEntry" id="txt_income">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="invisible_char">&#x2022;</property>
+                <property name="invisible_char">•</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -315,6 +395,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -324,6 +405,7 @@
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="btn_new">
@@ -334,7 +416,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btn_new_clicked"/>
+                <signal name="clicked" handler="on_btn_new_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -351,7 +433,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btn_save_clicked"/>
+                <signal name="clicked" handler="on_btn_save_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -368,7 +450,7 @@
                 <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btn_delete_clicked"/>
+                <signal name="clicked" handler="on_btn_delete_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -379,6 +461,7 @@
             <child>
               <object class="GtkComboBox" id="cb_customers">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="model">lstore_customers</property>
                 <child>
                   <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -400,7 +483,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btn_open_clicked"/>
+                <signal name="clicked" handler="on_btn_open_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -415,7 +498,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btn_cancel_clicked"/>
+                <signal name="clicked" handler="on_btn_cancel_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -433,10 +516,12 @@
         <child>
           <object class="GtkTable" id="table2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="n_columns">2</property>
             <child>
               <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">SQL</property>
               </object>
@@ -466,54 +551,128 @@
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">3</property>
           </packing>
         </child>
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment2">
-    <property name="value">1</property>
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
-  <object class="GtkListStore" id="lstore_customers">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkListStore" id="lstore_nation">
-    <columns>
-      <!-- column-name id -->
-      <column type="guint"/>
-      <!-- column-name name -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0">1</col>
-        <col id="1" translatable="yes">China</col>
-      </row>
-      <row>
-        <col id="0">2</col>
-        <col id="1" translatable="yes">Germany</col>
-      </row>
-      <row>
-        <col id="0">3</col>
-        <col id="1" translatable="yes">India</col>
-      </row>
-      <row>
-        <col id="0">4</col>
-        <col id="1" translatable="yes">Italy</col>
-      </row>
-      <row>
-        <col id="0">6</col>
-        <col id="1" translatable="yes">USA</col>
-      </row>
-    </data>
+  <object class="GtkWindow" id="w_double">
+    <property name="can_focus">False</property>
+    <signal name="delete-event" handler="gtk_main_quit" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">2</property>
+            <child>
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">ID</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label12">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Importo</property>
+              </object>
+              <packing>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="editable">False</property>
+                <property name="invisible_char">●</property>
+                <property name="text" translatable="yes">1</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="entry2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+                <property name="primary_icon_activatable">False</property>
+                <property name="secondary_icon_activatable">False</property>
+                <property name="primary_icon_sensitive">True</property>
+                <property name="secondary_icon_sensitive">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkButton" id="button1">
+                <property name="label">gtk-save</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_btn_save_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="button2">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="gtk_main_quit" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
   </object>
 </interface>