QueryEditor: order doesn't work after translation was added.

diff --git a/data/libgdaex/gui/libgdaex.ui b/data/libgdaex/gui/libgdaex.ui
index e2fbb4a543e4b900e8bbe3fc3cd62fa37cfd91c5..0e7fe4f14b3bab6c4bd637020deeb53b98ede1e9 100644 (file)
--- a/data/libgdaex/gui/libgdaex.ui
+++ b/data/libgdaex/gui/libgdaex.ui
@@ -12,6 +12,8 @@
       <column type="gchararray"/>
       <!-- column-name order -->
       <column type="gchararray"/>
+      <!-- column-name order_visible -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkListStore" id="lstore_show">
@@ -185,6 +187,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
+                        <property name="homogeneous">True</property>
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="button3">
@@ -385,6 +388,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
+                        <property name="homogeneous">True</property>
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="button7">
@@ -540,7 +544,7 @@
                                 <child>
                                   <object class="GtkCellRendererText" id="cellrenderertext4"/>
                                   <attributes>
-                                    <attribute name="text">3</attribute>
+                                    <attribute name="text">4</attribute>
                                   </attributes>
                                 </child>
                               </object>
@@ -560,6 +564,7 @@
                         <property name="can_focus">False</property>
                         <property name="orientation">vertical</property>
                         <property name="spacing">5</property>
+                        <property name="homogeneous">True</property>
                         <property name="layout_style">start</property>
                         <child>
                           <object class="GtkButton" id="button11">

diff --git a/src/queryeditor.c b/src/queryeditor.c
index c6d5d6c3593bc42da7ab70cf81177662db3ccac6..27a3b58e4b305532c82ef1e5045e6b3ca25793b4 100644 (file)
--- a/src/queryeditor.c
+++ b/src/queryeditor.c
@@ -294,7 +294,8 @@ enum
                COL_ORDER_TABLE_NAME,
                COL_ORDER_NAME,
                COL_ORDER_VISIBLE_NAME,
-               COL_ORDER_ORDER
+               COL_ORDER_ORDER,
+               COL_ORDER_ORDER_VISIBLE
        };
 
 static void
@@ -2874,8 +2875,8 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
                                                                                                gchar *asc_desc;
                                                                                                asc_desc = xmlGetProp (node_field, "asc_desc");
 
-                                                                                               if (g_strcmp0 (asc_desc, _("ASC")) == 0
-                                                                                                   || g_strcmp0 (asc_desc, _("DESC")) == 0)
+                                                                                               if (g_strcmp0 (asc_desc, "ASC") == 0
+                                                                                                   || g_strcmp0 (asc_desc, "DESC") == 0)
                                                                                                        {
                                                                                                                gtk_list_store_append (priv->lstore_order, &iter);
                                                                                                                gtk_list_store_set (priv->lstore_order, &iter,
@@ -2883,6 +2884,7 @@ gdaex_query_editor_load_choices_from_xml (GdaExQueryEditor *qe, xmlNode *root,
                                                                                                                                    COL_ORDER_NAME, field_name,
                                                                                                                                    COL_ORDER_VISIBLE_NAME, name_visible,
                                                                                                                                    COL_ORDER_ORDER, asc_desc,
+                                                                                                                                   COL_ORDER_ORDER_VISIBLE, g_strcmp0 (asc_desc, "ASC") == 0 ? _("Ascending") : _("Descending"),
                                                                                                                                    -1);
                                                                                                        }
                                                                                        }
@@ -3642,6 +3644,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
        gchar *val1;
        gchar *val2;
        gchar *asc_desc;
+       gchar *asc_desc_visible;
 
        qe = (GdaExQueryEditor *)user_data;
        priv = GDAEX_QUERY_EDITOR_GET_PRIVATE (qe);
@@ -3839,15 +3842,18 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                                        {
                                                if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->opt_asc)))
                                                        {
-                                                               asc_desc = g_strdup (_("ASC"));
+                                                               asc_desc = g_strdup ("ASC");
+                                                               asc_desc_visible = g_strdup (_("Ascending"));
                                                        }
                                                else
                                                        {
-                                                               asc_desc = g_strdup (_("DESC"));
+                                                               asc_desc = g_strdup ("DESC");
+                                                               asc_desc_visible = g_strdup (_("Descending"));
                                                        }
 
                                                gtk_list_store_set (priv->lstore_order, &iter,
                                                                    COL_ORDER_ORDER, asc_desc,
+                                                                   COL_ORDER_ORDER_VISIBLE, asc_desc_visible,
                                                                    -1);
 
                                                gtk_tree_selection_unselect_all (priv->sel_order);
@@ -3856,6 +3862,7 @@ gdaex_query_editor_on_btn_save_clicked (GtkButton *button,
                }
 
        g_free (asc_desc);
+       g_free (asc_desc_visible);
        g_free (val1);
        g_free (val2);
 
@@ -4736,6 +4743,7 @@ gdaex_query_editor_on_btn_order_add_clicked (GtkButton *button,
                                            COL_ORDER_NAME, field_name,
                                            COL_ORDER_VISIBLE_NAME, g_strconcat (table->name_visible, " - ", field->name_visible, NULL),
                                            COL_ORDER_ORDER, "ASC",
+                                           COL_ORDER_ORDER_VISIBLE, _("Ascending"),
                                            -1);
 
                        wpage = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), GDAEX_QE_PAGE_ORDER);