Merge branch 'upstream'

[chaz/homebank] / src / ui-assist-start.c

diff --git a/src/ui-assist-start.c b/src/ui-assist-start.c
index 9fadc4ae3e78f2ded6dacb0fba3dbcee00b5c8e5..229039bd930895fbe8ff8e0efeb233340382346f 100644 (file)
--- a/src/ui-assist-start.c
+++ b/src/ui-assist-start.c
@@ -1,5 +1,5 @@
 /*     HomeBank -- Free, easy, personal accounting for everyone.
- *     Copyright (C) 1995-2018 Maxime DOYEN
+ *     Copyright (C) 1995-2019 Maxime DOYEN
  *
  *     This file is part of HomeBank.
  *
@@ -20,7 +20,7 @@
 #include "homebank.h"
 
 #include "ui-assist-start.h"
-#include "dsp_mainwindow.h"
+#include "dsp-mainwindow.h"
 #include "ui-currency.h"
 
 
@@ -35,7 +35,7 @@
 /* our global datas */
 extern struct HomeBank *GLOBALS;
 
-extern gchar *CYA_ACC_TYPE[];
+extern HbKvData CYA_ACC_TYPE[];
 
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
 
@@ -81,11 +81,12 @@ gdouble value;
        if (txt && *txt)
        {
                item->name = g_strdup(txt);
+               //#1837838 remove extra lead/tail space
+               g_strstrip(item->name);
        }
 
        item->kcur = GLOBALS->kcur;
-       
-       item->type = gtk_combo_box_get_active(GTK_COMBO_BOX(data->CY_type));
+       item->type = hbtk_combo_box_get_active_id(GTK_COMBO_BOX_TEXT(data->CY_type));
 
        item->number = g_strdup(gtk_entry_get_text(GTK_ENTRY(data->ST_number)));
 
@@ -183,22 +184,27 @@ struct assist_start_data *data = user_data;
 
 }
 
+
 static void
 on_entry_changed (GtkWidget *widget, gpointer data)
 {
-  GtkAssistant *assistant = GTK_ASSISTANT (data);
-  GtkWidget *current_page;
-  gint page_number;
-  const gchar *text;
-
-  page_number = gtk_assistant_get_current_page (assistant);
-  current_page = gtk_assistant_get_nth_page (assistant, page_number);
-  text = gtk_entry_get_text (GTK_ENTRY (widget));
-
-  if (text && *text)
-    gtk_assistant_set_page_complete (assistant, current_page, TRUE);
-  else
-    gtk_assistant_set_page_complete (assistant, current_page, FALSE);
+GtkAssistant *assistant = GTK_ASSISTANT (data);
+GtkWidget *current_page;
+gint page_number;
+gchar *text;
+
+       page_number = gtk_assistant_get_current_page (assistant);
+       current_page = gtk_assistant_get_nth_page (assistant, page_number);
+       //#1837838: complete space or leadin/trialin space is possible
+       text = g_strdup(gtk_entry_get_text (GTK_ENTRY (widget)));
+       g_strstrip(text);
+       
+       if (strlen(text) > 0)
+               gtk_assistant_set_page_complete (assistant, current_page, TRUE);
+       else
+               gtk_assistant_set_page_complete (assistant, current_page, FALSE);
+
+       g_free(text);
 }
 
 
@@ -373,7 +379,7 @@ gint row;
        gtk_box_pack_start (GTK_BOX (box), table, TRUE, TRUE, 0);
 
        row = 0;
-       label = make_label_group(_("Informations"));
+       label = make_label_group(_("Information"));
        gtk_grid_attach (GTK_GRID (table), label, 0, row, 3, 1);
 
        row++;
@@ -391,7 +397,8 @@ gint row;
        row++;
        label = make_label_widget(_("_Type:"));
        gtk_grid_attach (GTK_GRID (table), label, 1, row, 1, 1);
-       widget = make_cycle(label, CYA_ACC_TYPE);
+       //widget = make_cycle(label, CYA_ACC_TYPE);
+       widget = hbtk_combo_box_new_with_data(label, CYA_ACC_TYPE);
        data->CY_type = widget;
        gtk_widget_set_hexpand(widget, TRUE);
        gtk_grid_attach (GTK_GRID (table), widget, 2, row, 1, 1);