X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fhomebank;a=blobdiff_plain;f=src%2Fui-archive.c;h=1c2d8cf82c4ba132cebea0373d44908b3c73813b;hp=ce0ff37f6db1c9645169a029c70c2a3d8f824c5e;hb=HEAD;hpb=a6c6b0df5492c2160ed97e3a376bdb2fe7c5ebc4

diff --git a/src/ui-archive.c b/src/ui-archive.c
index ce0ff37..1c2d8cf 100644
--- a/src/ui-archive.c
+++ b/src/ui-archive.c
@@ -346,7 +346,7 @@ gint type;
 	item->memo = g_strdup_printf(_("(template %d)"), g_list_length(GLOBALS->arc_list) + 1);
 	item->unit = 2;
 
-	type = hbtk_radio_get_active(GTK_CONTAINER(data->RA_type)) == 1 ? ARC_TYPE_TEMPLATE : ARC_TYPE_SCHEDULED;
+	type = hbtk_radio_button_get_active(GTK_CONTAINER(data->RA_type)) == 1 ? ARC_TYPE_TEMPLATE : ARC_TYPE_SCHEDULED;
 	if( type == ARC_TYPE_SCHEDULED )
 		item->flags |= OF_AUTO;
 
@@ -485,7 +485,7 @@ gchar *tagstr, *txt;
 
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->ST_amount), item->amount);
 		
-		hbtk_radio_set_active(GTK_CONTAINER(data->RA_status), item->status );
+		hbtk_radio_button_set_active(GTK_CONTAINER(data->RA_status), item->status );
 
 		
 		/*g_signal_handler_block(data->CM_valid, data->handler_id[HID_ARC_VALID]);
@@ -525,7 +525,7 @@ gchar *tagstr, *txt;
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(data->CM_limit), (item->flags & OF_LIMIT) ? 1 : 0);
 		DB( g_print("nb_limit = %d %g\n", item->limit, (gdouble)item->limit) );
 		gtk_spin_button_set_value(GTK_SPIN_BUTTON(data->NB_limit), (gdouble)item->limit);
-		hbtk_radio_set_active(GTK_CONTAINER(data->CY_weekend), item->weekend);
+		hbtk_radio_button_set_active(GTK_CONTAINER(data->CY_weekend), item->weekend);
 	}
 }
 
@@ -569,7 +569,7 @@ gint active;
 		item->kacc		= ui_acc_comboboxentry_get_key(GTK_COMBO_BOX(data->PO_acc));
 		item->kxferacc	= ui_acc_comboboxentry_get_key(GTK_COMBO_BOX(data->PO_accto));
 
-		item->status = hbtk_radio_get_active(GTK_CONTAINER(data->RA_status));
+		item->status = hbtk_radio_button_get_active(GTK_CONTAINER(data->RA_status));
 
 		/* tags */
 		txt = (gchar *)gtk_entry_get_text(GTK_ENTRY(data->ST_tags));
@@ -612,7 +612,7 @@ gint active;
 		gtk_spin_button_update(GTK_SPIN_BUTTON(data->NB_limit));
 		item->limit   = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(data->NB_limit));
 
-		item->weekend = hbtk_radio_get_active(GTK_CONTAINER(data->CY_weekend));
+		item->weekend = hbtk_radio_button_get_active(GTK_CONTAINER(data->CY_weekend));
 		
 		data->change++;
 	}
@@ -781,27 +781,6 @@ gboolean sensitive = TRUE;
 }
 
 
-//1336928 combobox tags
-static void ui_arc_manage_update_tags(GtkWidget *widget, gpointer user_data)
-{
-struct ui_arc_manage_data *data;
-gchar *newtag;
-	
-	DB( g_print("\n[ui_scheduled] update tags\n") );
-
-	data = g_object_get_data(G_OBJECT(gtk_widget_get_ancestor(widget, GTK_TYPE_WINDOW)), "inst_data");
-
-	newtag = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(data->CY_tags));
-	ui_gtk_entry_tag_name_append(GTK_ENTRY(data->ST_tags), newtag);
-	g_free(newtag);
-	
-	//revert back to ----
-	g_signal_handlers_block_by_func (G_OBJECT (data->CY_tags), G_CALLBACK (ui_arc_manage_update_tags), NULL);
-	hbtk_combo_box_set_active_id(GTK_COMBO_BOX_TEXT(data->CY_tags), 0);
-	g_signal_handlers_unblock_by_func (G_OBJECT (data->CY_tags), G_CALLBACK (ui_arc_manage_update_tags), NULL);
-}
-
-
 /*
 ** update the widgets status and contents from action/selection value
 */
@@ -941,7 +920,7 @@ gint type;
 
 	DB( g_print("\n[ui_scheduled] populate listview\n") );
 
-	type = hbtk_radio_get_active(GTK_CONTAINER(data->RA_type)) == 1 ? ARC_TYPE_TEMPLATE : ARC_TYPE_SCHEDULED;
+	type = hbtk_radio_button_get_active(GTK_CONTAINER(data->RA_type)) == 1 ? ARC_TYPE_TEMPLATE : ARC_TYPE_SCHEDULED;
 	ui_arc_listview_populate(data->LV_arc, type);
 	gtk_tree_view_expand_all (GTK_TREE_VIEW(data->LV_arc));
 }
@@ -994,7 +973,8 @@ static void ui_arc_manage_setup(struct ui_arc_manage_data *data)
 	ui_acc_comboboxentry_populate(GTK_COMBO_BOX(data->PO_acc)  , GLOBALS->h_acc, ACC_LST_INSERT_NORMAL);
 	ui_acc_comboboxentry_populate(GTK_COMBO_BOX(data->PO_accto), GLOBALS->h_acc, ACC_LST_INSERT_NORMAL);
 
-	ui_tag_combobox_populate(GTK_COMBO_BOX_TEXT(data->CY_tags));
+	////5.2.7 done in popover
+	//ui_tag_combobox_populate(GTK_COMBO_BOX_TEXT(data->CY_tags));
 }
 
 
@@ -1088,7 +1068,7 @@ gint row;
 	row++;
 	label = make_label_widget(_("_Status:"));
 	gtk_grid_attach (GTK_GRID (group_grid), label, 0, row, 1, 1);
-	widget = hbtk_radio_new(CYA_TXN_STATUS, TRUE);
+	widget = hbtk_radio_button_new(CYA_TXN_STATUS, TRUE);
 	data->RA_status = widget;
 	gtk_widget_set_halign (widget, GTK_ALIGN_START);
 	gtk_grid_attach (GTK_GRID (group_grid), widget, 1, row, 1, 1);
@@ -1105,6 +1085,7 @@ gint row;
 	label = make_label_widget(_("Ta_gs:"));
 	gtk_grid_attach (GTK_GRID (group_grid), label, 0, row, 1, 1);
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET(hbox)), GTK_STYLE_CLASS_LINKED);
 	gtk_grid_attach (GTK_GRID (group_grid), hbox, 1, row, 1, 1);
 
 		widget = make_string(label);
@@ -1112,7 +1093,7 @@ gint row;
 		//gtk_widget_set_hexpand (widget, TRUE);
 		gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
 	
-		widget = ui_tag_combobox_new(NULL);
+		widget = ui_tag_popover_list(data->ST_tags);
 		data->CY_tags = widget;
 		gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
 	
@@ -1168,7 +1149,7 @@ gint row;
 	data->LB_weekend = label;
 	gtk_grid_attach (GTK_GRID (group_grid), label, 1, row, 1, 1);
 
-	widget = hbtk_radio_new(RA_ARC_WEEKEND, FALSE);
+	widget = hbtk_radio_button_new(RA_ARC_WEEKEND, FALSE);
 	data->CY_weekend = widget;
 	gtk_grid_attach (GTK_GRID (group_grid), widget, 2, row, 1, 1);
 
@@ -1237,12 +1218,12 @@ gint w, h, row;
 	gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
 	
 	row = 0;
-	bbox = hbtk_radio_new(RA_ARC_TYPE, TRUE);
+	bbox = hbtk_radio_button_new(RA_ARC_TYPE, TRUE);
 	data.RA_type = bbox;
 	gtk_widget_set_halign (bbox, GTK_ALIGN_CENTER);
 	gtk_grid_attach (GTK_GRID (table), bbox, 0, row, 2, 1);
 
-	hbtk_radio_connect (GTK_CONTAINER(bbox), "toggled", G_CALLBACK (ui_arc_manage_type_changed_cb), &data);
+	hbtk_radio_button_connect (GTK_CONTAINER(bbox), "toggled", G_CALLBACK (ui_arc_manage_type_changed_cb), &data);
 
 	
 	row++;
@@ -1254,7 +1235,7 @@ gint w, h, row;
 	/* left area */
 	hgrid = gtk_grid_new ();
 	gtk_grid_set_row_spacing (GTK_GRID (hgrid), SPACING_SMALL);
-	gtk_grid_set_column_spacing (GTK_GRID (hgrid), SPACING_MEDIUM);
+	gtk_grid_set_column_spacing (GTK_GRID (hgrid), SPACING_SMALL);
 	gtk_widget_set_margin_right(hgrid, SPACING_SMALL);
 	gtk_paned_pack1 (GTK_PANED(hpaned), hgrid, FALSE, FALSE);
 
@@ -1319,8 +1300,6 @@ gint w, h, row;
 	//data.handler_id[HID_ARC_VALID]  = g_signal_connect (data.CM_valid , "toggled", G_CALLBACK (ui_arc_manage_togglestatus), GINT_TO_POINTER(HID_ARC_VALID));
 	//data.handler_id[HID_ARC_REMIND] = g_signal_connect (data.CM_remind, "toggled", G_CALLBACK (ui_arc_manage_togglestatus), GINT_TO_POINTER(HID_ARC_REMIND));
 
-	g_signal_connect (data.CY_tags , "changed", G_CALLBACK (ui_arc_manage_update_tags), NULL);
-	
 	g_signal_connect (data.CM_auto, "toggled", G_CALLBACK (ui_arc_manage_scheduled), NULL);
 	g_signal_connect (data.CM_limit, "toggled", G_CALLBACK (ui_arc_manage_scheduled), NULL);