]> Dogcows Code - chaz/homebank/blobdiff - src/ui-widgets.c
import homebank-5.2.7
[chaz/homebank] / src / ui-widgets.c
index ff69f893c1c9bf89fdc3362111b5b1a121156f85..14248e3a10894cc08577ec806aba79aa95799c89 100644 (file)
@@ -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.
  *
@@ -41,15 +41,12 @@ extern struct HomeBank *GLOBALS;
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
 
 
-extern gchar *CYA_FLT_RANGE[];
-
-
+extern HbKvData CYA_FLT_RANGE[];
 
 
 /* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
 
-
-
+//TODO: only WEIGHT & SCALE are used for now
 void
 gimp_label_set_attributes (GtkLabel *label,
                            ...)
@@ -190,6 +187,30 @@ gchar buf[16];
 }
 
 
+void hbtk_entry_tag_name_append(GtkEntry *entry, gchar *tagname)
+{
+GtkEntryBuffer *buffer;
+const gchar *text;
+guint len;
+
+       text = gtk_entry_get_text(entry);
+       if( g_strstr_len(text, -1, tagname) == NULL )
+       {
+               DB( g_print(" gtkentry append tagname '%s'\n", tagname) );
+               buffer = gtk_entry_get_buffer(GTK_ENTRY(entry));
+               if(buffer)
+               {
+                       len = gtk_entry_buffer_get_length(buffer);
+                       DB( g_print("- add ' %s' %p %d\n", tagname, buffer, len) );
+                       if(len > 0)
+                               gtk_entry_buffer_insert_text(buffer, len, " ", 1);
+                       gtk_entry_buffer_insert_text(buffer, len+1, tagname, -1);
+               }
+       }
+
+}
+
+
 void ui_gtk_entry_set_text(GtkWidget *widget, gchar *text)
 {
        DB( g_print(" set text to '%s'\n", text) );
@@ -258,10 +279,12 @@ GtkWidget *make_label(char *str, gfloat xalign, gfloat yalign)
 {
 GtkWidget *label = gtk_label_new_with_mnemonic (str);
 
-       //todo: deprecated in 3.14
+       #if GTK_MINOR_VERSION >= 16
+       gtk_label_set_xalign(GTK_LABEL(label), xalign);
+       gtk_label_set_yalign(GTK_LABEL(label), yalign);
+       #else
        gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
-       //gtk_label_set_xalign(GTK_LABEL(label), xalign);
-       //gtk_label_set_yalign(GTK_LABEL(label), yalign);
+       #endif
        return label;
 }
 
@@ -280,16 +303,13 @@ GtkWidget *entry;
 }
 
 
-GtkWidget *make_search(GtkWidget *label)
+GtkWidget *make_search(void)
 {
 GtkWidget *search;
 
        search = gtk_search_entry_new();
        gtk_entry_set_placeholder_text(GTK_ENTRY(search), _("Search...") );
 
-       if(label)
-               gtk_label_set_mnemonic_widget (GTK_LABEL(label), search);
-
        return search;
 }
 
@@ -318,7 +338,7 @@ GtkWidget *button, *image;
        //todo 3.10 use gtk_button_new_from_icon_name 
 
        button = gtk_button_new();
-       image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+       image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
        g_object_set (button, "image", image, NULL);
        if(tooltip_text != NULL)
                gtk_widget_set_tooltip_text(button, tooltip_text);
@@ -390,56 +410,67 @@ GtkWidget *entry;
 }
 
 
-
 static void hb_amount_insert_text_handler (GtkEntry *entry, const gchar *text, gint length, gint *position, gpointer data)
 {
 GtkEditable *editable = GTK_EDITABLE(entry);
-int i, count=0, dcpos=-1;
-gchar *result = g_new0 (gchar, length+1);
-int digits = 2;
-const gchar *numtext;
-
-       //g_message("insert_text-handler: text:%s - pos:%d - length:%d", text, *position, length);
+gint i, digits, count=0, dcpos=-1;
+gchar *clntxt;
+       
+       DB( g_print("-----\ninsert_text-handler: instxt:%s pos:%d len:%d\n", text, *position, length) );
 
        digits = gtk_spin_button_get_digits(GTK_SPIN_BUTTON(entry));
-       numtext = gtk_entry_get_text(entry);
-       for (i=0 ; numtext[i]!='\0' ; i++)
-       {
-               if(numtext[i]==',' || numtext[i]=='.')
-                       dcpos = i;
-       }
 
-       //g_message("previous text='%s' dcpos:'%d'", numtext, dcpos);
-       for (i=0 ; i < length ; i++)
+       // most common : only 1 char to be inserted
+       if( length == 1 )
        {
-               if( isdigit(text[i]) && ( (*position <= dcpos + digits) || dcpos < 0) )
-                       goto inserttext;
+       const gchar *curtxt = gtk_entry_get_text(entry);
 
-               if( text[i]=='-' && *position==0 )      /* minus sign only at position 0 */
-                       goto inserttext;
+               for (i=0 ; curtxt[i]!='\0' ; i++)
+               {
+                       if(curtxt[i]==',' || curtxt[i]=='.')
+                               dcpos = i;
+               }
+               DB( g_print(" dcpos:'%d'\n", dcpos) );
+
+               clntxt = g_new0 (gchar, length+1);
+               for (i=0 ; i < length ; i++)
+               {
+                       if( g_ascii_isdigit(text[i]) && ( (*position <= dcpos + digits) || dcpos < 0) )
+                               goto doinsert;
 
-               if( dcpos < 0 && (text[i]=='.' || text[i]==',') )       /* decimal separator if not in previous string */
-                       result[count++] = '.';
+                       if( text[i]=='-' && *position==0 )      /* minus sign only at position 0 */
+                               goto doinsert;
 
-               continue;
+                       if( dcpos < 0 && (text[i]=='.' || text[i]==',') )       /* decimal separator if not in previous string */
+                               clntxt[count++] = '.';
 
-       inserttext:
-               result[count++] = text[i];
-       }
+                       continue;
 
-       if (count > 0) {
+               doinsert:
+                       clntxt[count++] = text[i];
+               }
+       }
+       // less common: paste a full text
+       else
+       {
+               clntxt = hb_string_dup_raw_amount_clean(text, digits);
+               count = strlen(clntxt);
+       }
+               
+       if (count > 0)
+       {
+               DB( g_print(" insert %d char '%s' at %d\n", count, clntxt, *position) );
                g_signal_handlers_block_by_func (G_OBJECT (editable), G_CALLBACK (hb_amount_insert_text_handler), data);
-               gtk_editable_insert_text (editable, result, count, position);
+               gtk_editable_insert_text (editable, clntxt, count, position);
                g_signal_handlers_unblock_by_func (G_OBJECT (editable), G_CALLBACK (hb_amount_insert_text_handler), data);
        }
-       g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text");
 
-       g_free (result);
+       g_free (clntxt);
+
+       g_signal_stop_emission_by_name (G_OBJECT (editable), "insert-text");
 }
 
-/*
-**
-*/
+
 GtkWidget *make_amount(GtkWidget *label)
 {
 GtkWidget *spinner;
@@ -467,7 +498,7 @@ GtkWidget *spinner;
 GtkAdjustment *adj;
 
        adj = (GtkAdjustment *) gtk_adjustment_new (0.0, 0.0, 99999, 0.01, 1.0, 0.0);
-       spinner = gtk_spin_button_new (adj, 1.0, 6);
+       spinner = gtk_spin_button_new (adj, 1.0, 8);
        //gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinner), TRUE);
        g_object_set(spinner, "xalign", 1.0, NULL);
@@ -545,6 +576,192 @@ GtkAdjustment *adj;
 }
 
 
+GtkWidget *
+create_popover (GtkWidget       *parent,
+                GtkWidget       *child,
+                GtkPositionType  pos)
+{
+GtkWidget *popover;
+
+       popover = gtk_popover_new (parent);
+       gtk_popover_set_position (GTK_POPOVER (popover), pos);
+       gtk_container_add (GTK_CONTAINER (popover), child);
+       gtk_widget_show (child);
+
+       gtk_widget_set_margin_start (child, SPACING_POPOVER);
+       gtk_widget_set_margin_end (child, SPACING_POPOVER);
+       gtk_widget_set_margin_top (child, SPACING_POPOVER);
+       gtk_widget_set_margin_bottom (child, SPACING_POPOVER);
+
+       return popover;
+}
+
+
+/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
+
+
+gint hbtk_radio_button_get_active (GtkContainer *container)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+gint i, retval = 0;
+
+       if(!GTK_IS_CONTAINER(container))
+               return -1;
+
+       lchild = list = gtk_container_get_children (container);
+       for(i=0;list != NULL;i++)
+       {
+               radio = list->data;
+               if(GTK_IS_TOGGLE_BUTTON(radio))
+               {
+                       if( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio)) == TRUE )
+                       {
+                               retval = i;
+                               break;
+                       }
+               }
+               list = g_list_next(list);
+       }
+       g_list_free(lchild);
+       
+       return retval;
+}
+
+
+void hbtk_radio_button_set_active (GtkContainer *container, gint active)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+
+       if(!GTK_IS_CONTAINER(container))
+               return;
+
+       lchild = list = gtk_container_get_children (container);
+       radio = g_list_nth_data (list, active);
+       if(radio != NULL && GTK_IS_TOGGLE_BUTTON(radio))
+       {
+               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio), TRUE);
+       }
+       g_list_free(lchild);
+}
+
+
+GtkWidget *hbtk_radio_button_get_nth (GtkContainer *container, gint nth)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+
+       if(!GTK_IS_CONTAINER(container))
+               return NULL;
+
+       lchild = list = gtk_container_get_children (container);
+       radio = g_list_nth_data (list, nth);
+       g_list_free(lchild);
+       return radio;   //may return NULL
+}
+
+
+void hbtk_radio_button_unblock_by_func(GtkContainer *container, GCallback c_handler, gpointer data)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+gint i;
+
+       if(!GTK_IS_CONTAINER(container))
+               return;
+
+       lchild = list = gtk_container_get_children (container);
+       for(i=0;list != NULL;i++)
+       {
+               radio = list->data;
+               if(GTK_IS_TOGGLE_BUTTON(radio))
+               {
+                       g_signal_handlers_unblock_by_func (radio, c_handler, data);
+               }
+               list = g_list_next(list);
+       }
+       g_list_free(lchild);
+}
+
+
+void hbtk_radio_button_block_by_func(GtkContainer *container, GCallback c_handler, gpointer data)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+gint i;
+
+       if(!GTK_IS_CONTAINER(container))
+               return;
+
+       lchild = list = gtk_container_get_children (container);
+       for(i=0;list != NULL;i++)
+       {
+               radio = list->data;
+               if(GTK_IS_TOGGLE_BUTTON(radio))
+               {
+                       g_signal_handlers_block_by_func (radio, c_handler, data);
+               }
+               list = g_list_next(list);
+       }
+       g_list_free(lchild);
+}
+
+
+void hbtk_radio_button_connect(GtkContainer *container, const gchar *detailed_signal, GCallback c_handler, gpointer data)
+{
+GList *lchild, *list;
+GtkWidget *radio;
+gint i;
+
+       if(!GTK_IS_CONTAINER(container))
+               return;
+
+       lchild = list = gtk_container_get_children (container);
+       for(i=0;list != NULL;i++)
+       {
+               radio = list->data;
+               if(GTK_IS_TOGGLE_BUTTON(radio))
+               {
+                       g_signal_connect (radio, "toggled", c_handler, data);
+               }
+               list = g_list_next(list);
+       }
+       g_list_free(lchild);
+
+}
+
+
+GtkWidget *hbtk_radio_button_new (gchar **items, gboolean buttonstyle)
+{
+GtkWidget *box, *button, *newbutton;
+guint i;
+
+       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+    button = gtk_radio_button_new_with_label (NULL, _(items[0]));
+       gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), !buttonstyle);
+    gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+       for (i = 1; items[i] != NULL; i++)
+       {
+               newbutton = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (button), _(items[i]));
+               gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (newbutton), !buttonstyle);
+           gtk_box_pack_start (GTK_BOX (box), newbutton, FALSE, FALSE, 0);
+       }
+
+       if(buttonstyle)
+       {
+               gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
+               gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
+       }
+       
+       return box;
+}
+
+
+/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
+
+
 static gboolean
 is_separator (GtkTreeModel *model,
              GtkTreeIter  *iter,
@@ -568,25 +785,6 @@ is_separator (GtkTreeModel *model,
   return retval;
 }
 
-static void
-set_sensitive (GtkCellLayout   *cell_layout,
-              GtkCellRenderer *cell,
-              GtkTreeModel    *tree_model,
-              GtkTreeIter     *iter,
-              gpointer         data)
-{
-  GtkTreePath *path;
-  gint *indices;
-  gboolean sensitive;
-
-  path = gtk_tree_model_get_path (tree_model, iter);
-  indices = gtk_tree_path_get_indices (path);
-  sensitive = indices[0] != FLT_RANGE_OTHER;  
-  gtk_tree_path_free (path);
-
-  g_object_set (cell, "sensitive", sensitive, NULL);
-}
-
 
 GtkWidget *make_cycle(GtkWidget *label, gchar **items)
 {
@@ -612,139 +810,190 @@ guint i;
 }
 
 
-GtkWidget *make_daterange(GtkWidget *label, gboolean custom)
-{
-GtkWidget *combobox;
-GList *renderers, *list;
-GtkCellRenderer *renderer;
-gchar **items = CYA_FLT_RANGE;
-guint i;
+/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
 
-       combobox = gtk_combo_box_text_new ();
 
-       for (i = 0; items[i] != NULL; i++)
+#define HB_KV_BUFFER_MAX_LEN   8
+#define HB_KV_ITEMS_MAX_LEN            32
+
+gchar *hbtk_get_label(HbKvData *kvdata, guint32 key)
+{
+gchar *retval = NULL;
+guint32 i;
+
+       for(i=0;i<HB_KV_ITEMS_MAX_LEN;i++)
        {
-               if(*items[i] != 0)
-                       gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), _(items[i]));
-               else
-                       gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(combobox), "");
+       HbKvData *tmp = &kvdata[i];
+               if( tmp->name == NULL )
+                       break;
+               if( tmp->key == key )
+               {
+                       //#1820372
+                       retval = (gchar *)_(tmp->name);
+                       break;
+               }
        }
-       gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
+       return retval;
+}
 
-       if(label)
-               gtk_label_set_mnemonic_widget (GTK_LABEL(label), combobox);
 
-       // special stuffs
-       renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(combobox));
-       if(g_list_length(renderers) == 1 && custom == FALSE)
-       {
-               list = g_list_first(renderers);
-               renderer = list->data;
-       
+static gboolean hbtk_combo_box_is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+{
+//GtkTreePath *path;
+gboolean retval;
+gchar *txt;
+
+       gtk_tree_model_get (model, iter, 0, &txt, -1);
+       retval = *txt == 0 ? TRUE : FALSE;
+       //leak
+       g_free(txt);
+
+       return retval;
+}
+
+
+guint32 hbtk_combo_box_get_active_id (GtkComboBoxText *combobox)
+{
+const gchar* buf;
+guint32 retval;
        
-               gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combobox),
-                                               renderer,
-                                               set_sensitive,
-                                               NULL, NULL);
-       }       
-       g_list_free(renderers);
+       buf = gtk_combo_box_get_active_id(GTK_COMBO_BOX(combobox));
+       retval = buf != NULL ? atoi(buf) : 0;
 
-       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), is_separator, NULL, NULL);
+       return retval;
+}
 
-       return combobox;
+
+void hbtk_combo_box_set_active_id (GtkComboBoxText *combobox, guint32 key)
+{
+gchar buf[HB_KV_BUFFER_MAX_LEN];
+
+       g_snprintf(buf, HB_KV_BUFFER_MAX_LEN-1, "%d", key);
+       gtk_combo_box_set_active_id(GTK_COMBO_BOX(combobox), buf);
 }
 
-/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
 
-/*
-**
-*/
-GtkWidget *make_radio(gchar **items, gboolean buttonstyle, GtkOrientation orientation)
+void hbtk_combo_box_text_append (GtkComboBoxText *combobox, guint32 key, gchar *text)
 {
-GtkWidget *box, *button;
-guint i;
+gchar buf[HB_KV_BUFFER_MAX_LEN];
 
-       box = gtk_box_new (orientation, 0);
+       g_snprintf(buf, HB_KV_BUFFER_MAX_LEN-1, "%d", key);
+       gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combobox), buf, text);
+}
 
-    button = gtk_radio_button_new_with_label (NULL, _(items[0]));
-       gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), !buttonstyle);
-    gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-       for (i = 1; items[i] != NULL; i++)
-       {
-               button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (button), _(items[i]));
-               gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), !buttonstyle);
-           gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
-       }
 
-       if(buttonstyle)
-       {
-               gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_LINKED);
-               gtk_style_context_add_class (gtk_widget_get_style_context (box), GTK_STYLE_CLASS_RAISED);
-       }
+GtkWidget *hbtk_combo_box_new (GtkWidget *label)
+{
+GtkWidget *combobox;
+
+       combobox = gtk_combo_box_text_new();
        
-       return box;
+       if(label)
+               gtk_label_set_mnemonic_widget (GTK_LABEL(label), combobox);
+
+       return combobox;
 }
 
 
-gint radio_get_active (GtkContainer *container)
+GtkWidget *hbtk_combo_box_new_with_data (GtkWidget *label, HbKvData *kvdata)
 {
-GList *lchild, *list;
-GtkWidget *radio;
-gint i, retval = 0;
-
-       if(!GTK_IS_CONTAINER(container))
-               return -1;
+GtkWidget *combobox = hbtk_combo_box_new(label);
+HbKvData *tmp;
+gboolean hassep;
+guint32 i;
 
-       lchild = list = gtk_container_get_children (container);
-       for(i=0;list != NULL;i++)
+       hassep = FALSE;
+       for(i=0;i<HB_KV_ITEMS_MAX_LEN;i++)
        {
-               radio = list->data;
-               if(GTK_IS_TOGGLE_BUTTON(radio))
+               tmp = &kvdata[i];
+               if( tmp->name == NULL )
+                       break;
+               if( *tmp->name != 0 )
                {
-                       if( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio)) == TRUE )
-                       {
-                               retval = i;
-                               break;
-                       }
+                       hbtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combobox), tmp->key, (gchar *)_(tmp->name));
+               }
+               else
+               {
+                       hbtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combobox), tmp->key, (gchar *)"");
+                       hassep = TRUE;
                }
-               list = g_list_next(list);
        }
-       g_list_free(lchild);
-       
-       return retval;
+       gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
+
+       if(hassep)
+               gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), hbtk_combo_box_is_separator, NULL, NULL);
+
+       return combobox;
 }
 
-GtkWidget *radio_get_nth_widget (GtkContainer *container, gint nth)
+
+/* = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = = */
+
+static void
+set_sensitive (GtkCellLayout   *cell_layout,
+              GtkCellRenderer *cell,
+              GtkTreeModel    *tree_model,
+              GtkTreeIter     *iter,
+              gpointer         data)
 {
-GList *lchild, *list;
-GtkWidget *radio;
+GtkTreePath *path;
+gint *indices;
+gboolean sensitive;
 
-       if(!GTK_IS_CONTAINER(container))
-               return NULL;
+       path = gtk_tree_model_get_path (tree_model, iter);
+       indices = gtk_tree_path_get_indices (path);
+       sensitive = indices[0] != FLT_RANGE_OTHER;  
+       gtk_tree_path_free (path);
 
-       lchild = list = gtk_container_get_children (container);
-       radio = g_list_nth_data (list, nth);
-       g_list_free(lchild);
-       return radio;   //may return NULL
+       g_object_set (cell, "sensitive", sensitive, NULL);
 }
 
 
 
-void radio_set_active (GtkContainer *container, gint active)
+GtkWidget *make_daterange(GtkWidget *label, guint dspmode)
 {
-GList *lchild, *list;
-GtkWidget *radio;
-
-       if(!GTK_IS_CONTAINER(container))
-               return;
+GtkWidget *combobox = hbtk_combo_box_new(label);
+GList *renderers, *list;
+HbKvData *tmp, *kvdata = CYA_FLT_RANGE;
+guint32 i;
 
-       lchild = list = gtk_container_get_children (container);
-       radio = g_list_nth_data (list, active);
-       if(radio != NULL && GTK_IS_TOGGLE_BUTTON(radio))
+       for(i=0;i<HB_KV_ITEMS_MAX_LEN;i++)
        {
-               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radio), TRUE);
+               tmp = &kvdata[i];
+               if( tmp->name == NULL )
+                       break;
+
+               if( (tmp->key == FLT_RANGE_OTHER) )
+               {
+                       if( dspmode == DATE_RANGE_CUSTOM_DISABLE )
+                       {
+                               renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT(combobox));
+                               if(g_list_length(renderers) == 1)
+                               {
+                                       list = g_list_first(renderers);
+                                       gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combobox),
+                                                                       list->data,
+                                                                       set_sensitive,
+                                                                       NULL, NULL);
+                               }       
+                               g_list_free(renderers);
+                       }
+                       else
+                       if( dspmode == DATE_RANGE_CUSTOM_HIDE )
+                       {
+                               //if hide, we do not show it
+                               i++;
+                               continue;
+                       }
+               }
+
+               hbtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(combobox), tmp->key, (*tmp->name != 0) ? (gchar *)_(tmp->name) : (gchar *)"");
        }
-       g_list_free(lchild);
+
+       gtk_combo_box_set_active(GTK_COMBO_BOX(combobox), 0);
+       gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox), hbtk_combo_box_is_separator, NULL, NULL);
+
+       return combobox;
 }
 
 
@@ -881,6 +1130,7 @@ guint i;
                );
 
        combobox = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
+       g_object_unref(store);
 
        renderer = r1 = gtk_cell_renderer_pixbuf_new();
        gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combobox), renderer, FALSE);
@@ -952,13 +1202,7 @@ char *nainex_iconnames[NUM_NAINEX_MAX] =
        "flt-exclude",
 };
 
-char *nainex_label_names[NUM_NAINEX_MAX] =
-{
-       N_("Inactive"),
-       N_("Include"),
-       N_("Exclude"),
-};
-
+extern gchar *nainex_label_names[];
 
 /*
 ** Make a nainex combobox widget
This page took 0.032088 seconds and 4 git commands to generate.