pidgin.yaz: console/gntrequest.c comparison

comparison console/gntrequest.c @ 14059:2d1b41e3cf0d

[gaim-migrate @ 16674] Add a way to change some preferences (the preferences for the conversations do not do anything yet). I used the request-api for this, which I think is cool. But too many preferences will make the dialog long, which may not fit in the screen. It looks alright for now though. You can pop the dialog up with "/prefs" command in a converastion. And some other minor fixes. committer: Tailor Script <tailor@pidgin.im>

author	Sadrul Habib Chowdhury <imadil@gmail.com>
date	Wed, 09 Aug 2006 03:41:45 +0000
parents	9c4bec886220
children	fa8f65cd912c

comparison

equal deleted inserted replaced

-:32a71e64ceae
+:2d1b41e3cf0d
 				int id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)));
 				gaim_request_field_choice_set_value(field, id);
 			}
 			else if (type == GAIM_REQUEST_FIELD_LIST)
 			{
-				GntWidget *tree = field->ui_data;
 				GList *list = NULL;
 				if (gaim_request_field_list_get_multi_select(field))
 				{
 					const GList *iter;
+					GntWidget *tree = field->ui_data;
 					iter = gaim_request_field_list_get_items(field);
 					for (; iter; iter = iter->next)
 					{
 						const char *text = list->data;
 						gpointer key = gaim_request_field_list_get_data(field, text);
 							list = g_list_prepend(list, key);
 					}
 				}
 				else
 				{
-					gpointer data = gnt_tree_get_selection_data(GNT_TREE(tree));
+					GntWidget *combo = field->ui_data;
+					gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
 					list = g_list_append(list, data);
 				}
 				gaim_request_field_list_set_selected(field, list);
 				g_list_free(list);
 	{
 		GaimRequestFieldGroup *group = list->data;
 		GList *fields = gaim_request_field_group_get_fields(group);
 		GntWidget *hbox;
-		/* XXX: Do something with the title, perhaps add a bold label  */
+		gnt_box_add_widget(GNT_BOX(box),
+				gnt_label_new_with_format(gaim_request_field_group_get_title(group),
+					GNT_TEXT_FLAG_BOLD));
 		for (; fields ; fields = fields->next)
 		{
 			GaimRequestField *field = fields->data;
 			GaimRequestFieldType type = gaim_request_field_get_type(field);
 			hbox = gnt_hbox_new(FALSE);
 			gnt_box_set_pad(GNT_BOX(hbox), 0);
 			gnt_box_add_widget(GNT_BOX(box), hbox);
 			if (type != GAIM_REQUEST_FIELD_BOOLEAN)
-				gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(label));
+			{
+				GntWidget *l = gnt_label_new(label);
+				gnt_widget_set_size(l, 0, 1);
+				gnt_box_add_widget(GNT_BOX(hbox), l);
+			}
 			if (type == GAIM_REQUEST_FIELD_BOOLEAN)
 			{
 				GntWidget *check = gnt_check_box_new(label);
 				gnt_check_box_set_checked(GNT_CHECK_BOX(check),
 			}
 			else if (type == GAIM_REQUEST_FIELD_LIST)
 			{
 				const GList *list;
 				gboolean multi = gaim_request_field_list_get_multi_select(field);
-				GntWidget *tree = gnt_tree_new();
+				if (multi)
-				gnt_box_add_widget(GNT_BOX(hbox), tree);
-				field->ui_data = tree;
-				list = gaim_request_field_list_get_items(field);
-				for (; list; list = list->next)
 				{
-					const char *text = list->data;
+					GntWidget *tree = gnt_tree_new();
-					gpointer key = gaim_request_field_list_get_data(field, text);
+					gnt_box_add_widget(GNT_BOX(hbox), tree);
-					if (multi)
+					field->ui_data = tree;
+					list = gaim_request_field_list_get_items(field);
+					for (; list; list = list->next)
 					{
+						const char *text = list->data;
+						gpointer key = gaim_request_field_list_get_data(field, text);
 						gnt_tree_add_choice(GNT_TREE(tree), key,
 								gnt_tree_create_row(GNT_TREE(tree), text), NULL, NULL);
 						if (gaim_request_field_list_is_selected(field, text))
 							gnt_tree_set_choice(GNT_TREE(tree), key, TRUE);
 					}
-					else
+				}
+				else
+				{
+					GntWidget *combo = gnt_combo_box_new();
+					gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
+					gnt_box_add_widget(GNT_BOX(hbox), combo);
+					field->ui_data = combo;
+					list = gaim_request_field_list_get_items(field);
+					for (; list; list = list->next)
 					{
-						gnt_tree_add_row_after(GNT_TREE(tree), key,
+						const char *text = list->data;
-								gnt_tree_create_row(GNT_TREE(tree), text), NULL, NULL);
+						gpointer key = gaim_request_field_list_get_data(field, text);
+						gnt_combo_box_add_data(GNT_COMBO_BOX(combo), key, text);
 						if (gaim_request_field_list_is_selected(field, text))
-							gnt_tree_set_selected(GNT_TREE(tree), key);
+							gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), key);
 					}
 				}
 			}
 #if 0
 			else if (type == GAIM_REQUEST_FIELD_ACCOUNT)
 			{
 				gnt_box_add_widget(GNT_BOX(hbox),
 						gnt_label_new_with_format(_("Not implemented yet."),
 							GNT_TEXT_FLAG_BOLD));
 			}
-			if (fields->next)
-				gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());
 		}
+		if (list->next)
+			gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());
 	}
 	gnt_box_add_widget(GNT_BOX(window), box);
 	box = setup_button_box(userdata, request_fields_cb, fields,
 			ok, ok_cb, cancel, cancel_cb, NULL);
 	gnt_box_add_widget(GNT_BOX(window), box);
 	gnt_widget_show(window);
 	return window;
 }
 static GaimRequestUiOps uiops =

Mercurial > pidgin.yaz

comparison console/gntrequest.c @ 14059:2d1b41e3cf0d