Added QueryEditorIWidget::get_value_visible.

diff --git a/data/libgdaex/gui/libgdaex.ui b/data/libgdaex/gui/libgdaex.ui
index 11d45bea2a5e53e1125b0e5ebc45e1ce23f30b82..e2fbb4a543e4b900e8bbe3fc3cd62fa37cfd91c5 100644 (file)
--- a/data/libgdaex/gui/libgdaex.ui
+++ b/data/libgdaex/gui/libgdaex.ui
@@ -58,10 +58,14 @@
       <column type="gchararray"/>
       <!-- column-name condition_from -->
       <column type="gchararray"/>
+      <!-- column-name condition_from_visible -->
+      <column type="gchararray"/>
       <!-- column-name condition_from_sql -->
       <column type="gchararray"/>
       <!-- column-name condition_to -->
       <column type="gchararray"/>
+      <!-- column-name condition_to_visible -->
+      <column type="gchararray"/>
       <!-- column-name condition_to_sql -->
       <column type="gchararray"/>
     </columns>
@@ -350,7 +354,7 @@
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext7"/>
                                   <attributes>
-                                    <attribute name="text">8</attribute>
+                                    <attribute name="text">9</attribute>
                                   </attributes>
                                 </child>
                               </object>
@@ -361,7 +365,7 @@
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext8"/>
                                   <attributes>
-                                    <attribute name="text">10</attribute>
+                                    <attribute name="text">12</attribute>
                                   </attributes>
                                 </child>
                               </object>

diff --git a/src/queryeditor.c b/src/queryeditor.c
index 731e0fd2e834241201ed008980f03912960979a0..c55e3a6758c203dad07e86d24ba472de5261dcc6 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -83,6 +83,10 @@ static void gdaex_query_editor_get_property (GObject *object,
                                GValue *value,
                                GParamSpec *pspec);
 
+static GdaExQueryEditorIWidget *gdaex_query_editor_iwidget_construct (GdaExQueryEditor *qe,
+                                                                                                                                         const gchar *type,
+                                                                                                                                         xmlNode *xnode);
+
 static void gdaex_query_editor_clean (GdaExQueryEditor *gdaex_query_editor);
 
 static gboolean _gdaex_query_editor_add_table (GdaExQueryEditor *qe,
@@ -269,8 +273,10 @@ enum
                COL_WHERE_CONDITION_TYPE,
                COL_WHERE_CONDITION_TYPE_VISIBLE,
                COL_WHERE_CONDITION_FROM,
+               COL_WHERE_CONDITION_FROM_VISIBLE,
                COL_WHERE_CONDITION_FROM_SQL,
                COL_WHERE_CONDITION_TO,
+               COL_WHERE_CONDITION_TO_VISIBLE,
                COL_WHERE_CONDITION_TO_SQL
        };
 
@@ -300,17 +306,18 @@ gdaex_query_editor_class_init (GdaExQueryEditorClass *klass)
         *
         */
        klass->iwidget_init_signal_id = g_signal_new ("iwidget-init",
-                                                                                       G_TYPE_FROM_CLASS (object_class),
-                                                                                       G_SIGNAL_RUN_LAST,
-                                                                                       0,
-                                                                                       NULL,
-                                                                                       NULL,
-                                                                                       _gdaex_query_editor_marshal_VOID__OBJECT_STRING_STRING,
-                                                                                       G_TYPE_NONE,
-                                                                                       3,
-                                                                                       G_TYPE_OBJECT,
-                                                                                       G_TYPE_STRING,
-                                                                                       G_TYPE_STRING);
+                                                                                                 G_TYPE_FROM_CLASS (object_class),
+                                                                                                 G_SIGNAL_RUN_LAST,
+                                                                                                 0,
+                                                                                                 NULL,
+                                                                                                 NULL,
+                                                                                                 _gdaex_query_editor_marshal_VOID__OBJECT_STRING_STRING_BOOLEAN,
+                                                                                                 G_TYPE_NONE,
+                                                                                                 4,
+                                                                                                 G_TYPE_OBJECT,
+                                                                                                 G_TYPE_STRING,
+                                                                                                 G_TYPE_STRING,
+                                                                                                 G_TYPE_BOOLEAN);
 }
 
 static void
@@ -1131,12 +1138,9 @@ typedef gboolean (* IWidgetXmlParsingFunc) (GdaExQueryEditorIWidget *, xmlNodePt
 static GdaExQueryEditorIWidget
 *gdaex_query_editor_iwidget_construct (GdaExQueryEditor *qe,
                                                                           const gchar *type,
-                                                                          const gchar *table_name,
-                                                                          const gchar *field_name,
                                                                           xmlNode *xnode)
 {
        GdaExQueryEditorPrivate *priv;
-       GdaExQueryEditorClass *klass;
 
        guint i;
 
@@ -1145,7 +1149,6 @@ static GdaExQueryEditorIWidget
 
        GdaExQueryEditorIWidget *iwidget;
 
-       klass = GDAEX_QUERY_EDITOR_GET_CLASS (qe);
        priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
 
        iwidget = NULL;
@@ -1160,12 +1163,6 @@ static GdaExQueryEditorIWidget
                                                        iwidget = iwidget_constructor ();
                                                        if (iwidget != NULL)
                                                                {
-                                                                       g_signal_emit (qe, klass->iwidget_init_signal_id,
-                                                                                                  0,
-                                                                                                  iwidget,
-                                                                                                  table_name,
-                                                                                                  field_name);
-
                                                                        if (g_module_symbol ((GModule *)g_ptr_array_index (priv->ar_modules, i),
                                                                                                                 g_strconcat (type, "_xml_parsing", NULL),
                                                                                                                 (gpointer *)&iwidget_xml_parsing))
@@ -1424,12 +1421,19 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
                                                                                                                {
                                                                                                                        field->iwidget_from = gdaex_query_editor_iwidget_construct (qe,
                                                                                                                                                                                                                                                type,
-                                                                                                                                                                                                                                               table_name,
-                                                                                                                                                                                                                                               field->name,
                                                                                                                                                                                                                                                cur);
                                                                                                                        if (field->iwidget_from == NULL)
                                                                                                                                {
-                                                                                                                                       g_warning (_("Unknown iwidget type «%s»."), type);
+                                                                                                                                       g_warning (_("Unknown iwidget_from type «%s»."), type);
+                                                                                                                               }
+                                                                                                                       else
+                                                                                                                               {
+                                                                                                                                       g_signal_emit (qe, klass->iwidget_init_signal_id,
+                                                                                                                                                                  0,
+                                                                                                                                                                  field->iwidget_from,
+                                                                                                                                                                  table_name,
+                                                                                                                                                                  field->name,
+                                                                                                                                                                  TRUE);
                                                                                                                                }
                                                                                                                }
                                                                                                        if (xmlStrcmp (cur->name, "widget") == 0
@@ -1437,9 +1441,20 @@ gdaex_query_editor_load_tables_from_xml (GdaExQueryEditor *qe,
                                                                                                                {
                                                                                                                        field->iwidget_to = gdaex_query_editor_iwidget_construct (qe,
                                                                                                                                                                                                                                          type,
-                                                                                                                                                                                                                                         table_name,
-                                                                                                                                                                                                                                         field->name,
                                                                                                                                                                                                                                          cur);
+                                                                                                                       if (field->iwidget_to == NULL)
+                                                                                                                               {
+                                                                                                                                       g_warning (_("Unknown iwidget_to type «%s»."), type);
+                                                                                                                               }
+                                                                                                                       else
+                                                                                                                               {
+                                                                                                                                       g_signal_emit (qe, klass->iwidget_init_signal_id,
+                                                                                                                                                                  0,
+                                                                                                                                                                  field->iwidget_from,
+                                                                                                                                                                  table_name,
+                                                                                                                                                                  field->name,
+                                                                                                                                                                  FALSE);
+                                                                                                                               }
                                                                                                                }
                                                                                                }
 
@@ -2686,6 +2701,8 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
                                                                                gchar *to;
                                                                                gchar *from_sql;
                                                                                gchar *to_sql;
+                                                                               gchar *from_visible;
+                                                                               gchar *to_visible;
 
                                                                                GdaExQueryEditorLinkType link_type;
                                                                                GdaExQueryEditorWhereType where_type;
@@ -2696,6 +2713,10 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
 
                                                                                from_sql = xmlGetProp (node_field, "from");
                                                                                to_sql = xmlGetProp (node_field, "to");
+                                                                               from_visible = xmlGetProp (node_field, "from_visible");
+                                                                               to_visible = xmlGetProp (node_field, "to_visible");
+
+
                                                                                if (field->type == GDAEX_QE_FIELD_TYPE_DATE)
                                                                                        {
                                                                                                GDate *gdate = gdaex_query_editor_get_gdate_from_sql (from_sql);
@@ -2815,8 +2836,10 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
                                                                                                                    COL_WHERE_CONDITION_NOT, (g_strcmp0 (not, "n") != 0),
                                                                                                                    COL_WHERE_CONDITION_TYPE, where_type,
                                                                                                                    COL_WHERE_CONDITION_TYPE_VISIBLE, gdaex_query_editor_get_where_type_str_from_type (where_type),
+                                                                                                                   COL_WHERE_CONDITION_FROM_VISIBLE, from_visible,
                                                                                                                    COL_WHERE_CONDITION_FROM, from,
                                                                                                                    COL_WHERE_CONDITION_FROM_SQL, from_sql,
+                                                                                                                   COL_WHERE_CONDITION_TO_VISIBLE, (where_type == GDAEX_QE_WHERE_TYPE_BETWEEN ? to_visible : ""),
                                                                                                                    COL_WHERE_CONDITION_TO, (where_type == GDAEX_QE_WHERE_TYPE_BETWEEN ? to : ""),
                                                                                                                    COL_WHERE_CONDITION_TO_SQL, (where_type == GDAEX_QE_WHERE_TYPE_BETWEEN ? to_sql : ""),
                                                                                                                    -1);
@@ -2826,6 +2849,8 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
                                                                                g_free (to);
                                                                                g_free (from_sql);
                                                                                g_free (to_sql);
+                                                                               g_free (from_visible);
+                                                                               g_free (to_visible);
                                                                                g_free (link);
                                                                                g_free (not);
                                                                                g_free (condition);
@@ -3642,9 +3667,13 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                                                guint link_type;
                                                guint where_type;
 
+                                               gchar *val1_visible;
+                                               gchar *val2_visible;
                                                gchar *val1_sql;
                                                gchar *val2_sql;
 
+                                               val1_visible = NULL;
+                                               val2_visible = NULL;
                                                val1_sql = NULL;
                                                val2_sql = NULL;
 
@@ -3695,6 +3724,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                                                                                    -1);
 
                                                                val1 = (gchar *)gdaex_query_editor_iwidget_get_value (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_from));
+                                                               val1_visible = (gchar *)gdaex_query_editor_iwidget_get_value_visible (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_from));
                                                                val1_sql = (gchar *)gdaex_query_editor_iwidget_get_value_sql (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_from));
                                                                if (val1 == NULL)
                                                                        {
@@ -3715,6 +3745,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                                                                        }
 
                                                                val2 = (gchar *)gdaex_query_editor_iwidget_get_value (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_to));
+                                                               val2_visible = (gchar *)gdaex_query_editor_iwidget_get_value_visible (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_to));
                                                                val2_sql = (gchar *)gdaex_query_editor_iwidget_get_value_sql (GDAEX_QUERY_EDITOR_IWIDGET (priv->txt_to));
                                                                if (val2 == NULL)
                                                                        {
@@ -3749,8 +3780,10 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                                                                    COL_WHERE_CONDITION_NOT, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->chk_not)),
                                                                    COL_WHERE_CONDITION_TYPE, where_type,
                                                                    COL_WHERE_CONDITION_TYPE_VISIBLE, gdaex_query_editor_get_where_type_str_from_type (where_type),
+                                                                   COL_WHERE_CONDITION_FROM_VISIBLE, val1_visible,
                                                                    COL_WHERE_CONDITION_FROM, val1,
                                                                    COL_WHERE_CONDITION_FROM_SQL, val1_sql,
+                                                                   COL_WHERE_CONDITION_TO_VISIBLE, val2_visible,
                                                                    COL_WHERE_CONDITION_TO, val2,
                                                                    COL_WHERE_CONDITION_TO_SQL, val2_sql,
                                                                    -1);

diff --git a/src/queryeditor_marshal.list b/src/queryeditor_marshal.list
index 05ce335dd205277e50bde115080377aab276a3e1..839622dd01822363b7072d0326f868f5fe6b35be 100644 (file)
--- a/src/queryeditor_marshal.list
+++ b/src/queryeditor_marshal.list
@@ -1 +1 @@
-VOID:OBJECT,STRING,STRING
+VOID:OBJECT,STRING,STRING,BOOLEAN

diff --git a/src/queryeditor_widget_interface.c b/src/queryeditor_widget_interface.c
index 4b0231c801e020c44b9cfa562680c326e8cc591f..9e1e552a579c4529b860841c01f2c2f76c063724 100644 (file)
--- a/src/queryeditor_widget_interface.c
+++ b/src/queryeditor_widget_interface.c
@@ -52,6 +52,27 @@ const gchar
        return ret;
 }
 
+const gchar
+*gdaex_query_editor_iwidget_get_value_visible (GdaExQueryEditorIWidget *iwidget)
+{
+       GdaExQueryEditorIWidgetIface *iface;
+
+       gchar *ret;
+
+       ret = NULL;
+
+       g_return_val_if_fail (GDAEX_QUERY_EDITOR_IS_IWIDGET (iwidget), ret);
+
+       iface = GDAEX_QUERY_EDITOR_IWIDGET_GET_IFACE (iwidget);
+
+       if (iface->get_value_visible)
+               {
+                       ret = (gchar *)(* iface->get_value_visible) (iwidget);
+               }
+
+       return ret;
+}
+
 const gchar
 *gdaex_query_editor_iwidget_get_value_sql (GdaExQueryEditorIWidget *iwidget)
 {

diff --git a/src/queryeditor_widget_interface.h b/src/queryeditor_widget_interface.h
index 5da0484c132e15483d73fc24db5e664400a8ce4e..9abef453d36717b995c5a2d8d1167337ec99a51c 100644 (file)
--- a/src/queryeditor_widget_interface.h
+++ b/src/queryeditor_widget_interface.h
@@ -41,6 +41,7 @@ struct _GdaExQueryEditorIWidgetIface
                GTypeInterface g_iface;
 
                const gchar *(*get_value) (GdaExQueryEditorIWidget *iwidget);
+               const gchar *(*get_value_visible) (GdaExQueryEditorIWidget *iwidget);
                const gchar *(*get_value_sql) (GdaExQueryEditorIWidget *iwidget);
                void (*set_value) (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
@@ -50,6 +51,7 @@ struct _GdaExQueryEditorIWidgetIface
 GType gdaex_query_editor_iwidget_get_type (void) G_GNUC_CONST;
 
 const gchar *gdaex_query_editor_iwidget_get_value (GdaExQueryEditorIWidget *iwidget);
+const gchar *gdaex_query_editor_iwidget_get_value_visible (GdaExQueryEditorIWidget *iwidget);
 const gchar *gdaex_query_editor_iwidget_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 void gdaex_query_editor_iwidget_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 

diff --git a/src/queryeditorentry.c b/src/queryeditorentry.c
index b290a3f0496390ea2c8f81a6e29018fae0dbdc32..3430c7a43ca78f4a72c4ba11222ddb6d7789a5a4 100644 (file)
--- a/src/queryeditorentry.c
+++ b/src/queryeditorentry.c
@@ -40,6 +40,7 @@ static void gdaex_query_editor_entry_get_property (GObject *object,
                                            GParamSpec *pspec);
 
 static const gchar *gdaex_query_editor_entry_get_value (GdaExQueryEditorIWidget *iwidget);
+static const gchar *gdaex_query_editor_entry_get_value_visible (GdaExQueryEditorIWidget *iwidget);
 static const gchar *gdaex_query_editor_entry_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 static void gdaex_query_editor_entry_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
@@ -76,6 +77,7 @@ static void
 gdaex_query_editor_entry_gdaex_query_editor_iwidget_interface_init (GdaExQueryEditorIWidgetIface *iface)
 {
        iface->get_value = gdaex_query_editor_entry_get_value;
+       iface->get_value_visible = gdaex_query_editor_entry_get_value_visible;
        iface->get_value_sql = gdaex_query_editor_entry_get_value_sql;
        iface->set_value = gdaex_query_editor_entry_set_value;
 }
@@ -127,6 +129,12 @@ static const gchar
        return gtk_entry_get_text (GTK_ENTRY (iwidget));
 }
 
+static const gchar
+*gdaex_query_editor_entry_get_value_visible (GdaExQueryEditorIWidget *iwidget)
+{
+       return gtk_entry_get_text (GTK_ENTRY (iwidget));
+}
+
 static const gchar
 *gdaex_query_editor_entry_get_value_sql (GdaExQueryEditorIWidget *iwidget)
 {

diff --git a/src/queryeditorentrydate.c b/src/queryeditorentrydate.c
index f1ec109fff8c5a89f13cdd2ce831b89b59114ec6..f62f9e4af3637157bf1fc1a4f383350a68a8108d 100644 (file)
--- a/src/queryeditorentrydate.c
+++ b/src/queryeditorentrydate.c
@@ -42,6 +42,7 @@ static void gdaex_query_editor_entry_date_get_property (GObject *object,
                                            GParamSpec *pspec);
 
 static const gchar *gdaex_query_editor_entry_date_get_value (GdaExQueryEditorIWidget *iwidget);
+static const gchar *gdaex_query_editor_entry_date_get_value_visible (GdaExQueryEditorIWidget *iwidget);
 static const gchar *gdaex_query_editor_entry_date_get_value_sql (GdaExQueryEditorIWidget *iwidget);
 static void gdaex_query_editor_entry_date_set_value (GdaExQueryEditorIWidget *iwidget, const gchar *value);
 
@@ -80,6 +81,7 @@ static void
 gdaex_query_editor_entry_date_gdaex_query_editor_iwidget_interface_init (GdaExQueryEditorIWidgetIface *iface)
 {
        iface->get_value = gdaex_query_editor_entry_date_get_value;
+       iface->get_value_visible = gdaex_query_editor_entry_date_get_value_visible;
        iface->get_value_sql = gdaex_query_editor_entry_date_get_value_sql;
        iface->set_value = gdaex_query_editor_entry_date_set_value;
 }
@@ -150,6 +152,12 @@ static const gchar
        return gtk_entry_get_text (GTK_ENTRY (iwidget));
 }
 
+static const gchar
+*gdaex_query_editor_entry_date_get_value_visible (GdaExQueryEditorIWidget *iwidget)
+{
+       return gtk_entry_get_text (GTK_ENTRY (iwidget));
+}
+
 static const gchar
 *gdaex_query_editor_entry_date_get_value_sql (GdaExQueryEditorIWidget *iwidget)
 {