--- a/pidgin/gtksavedstatuses.c Thu Feb 18 21:38:43 2010 +0000
+++ b/pidgin/gtksavedstatuses.c Sun Feb 21 00:11:56 2010 +0000
@@ -85,17 +85,16 @@
};
/**
- * These are used in the GtkComboBox to select the specific
- * PurpleStatusType when setting a substatus for a particular saved
- * status.
+ * These are used in the GtkComboBox to select the specific PurpleStatusType
+ * when setting a (sub)status for a particular saved status.
*/
enum
{
- SUBSTATUS_COLUMN_ICON,
+ STATUS_COLUMN_ICON,
/** A hidden column containing the ID of this PurpleStatusType. */
- SUBSTATUS_COLUMN_STATUS_ID,
- SUBSTATUS_COLUMN_STATUS_NAME,
- SUBSTATUS_NUM_COLUMNS
+ STATUS_COLUMN_STATUS_ID,
+ STATUS_COLUMN_STATUS_NAME,
+ STATUS_NUM_COLUMNS
};
typedef struct
@@ -118,7 +117,7 @@
gchar *original_title;
GtkEntry *title;
- GtkOptionMenu *type;
+ GtkComboBox *type;
GtkIMHtml *message;
} StatusEditor;
@@ -742,7 +741,7 @@
return;
}
- type = gtk_option_menu_get_history(dialog->type) + (PURPLE_STATUS_UNSET + 1);
+ type = gtk_combo_box_get_active(dialog->type) + (PURPLE_STATUS_UNSET + 1);
message = gtk_imhtml_get_markup(dialog->message);
unformatted = purple_markup_strip_html(message);
@@ -837,35 +836,15 @@
}
static GtkWidget *
-create_stock_item(const gchar *str, const gchar *icon)
-{
- GtkWidget *menuitem = gtk_menu_item_new();
- GtkWidget *label = gtk_label_new_with_mnemonic(str);
- GtkWidget *hbox = gtk_hbox_new(FALSE, 4);
- GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
- GtkWidget *image = gtk_image_new_from_stock(icon, icon_size);;
-
- gtk_widget_show(label);
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-
- gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-
- return menuitem;
-}
-
-static GtkWidget *
create_status_type_menu(PurpleStatusPrimitive type)
{
int i;
GtkWidget *dropdown;
- GtkWidget *menu;
- GtkWidget *item;
+ GtkListStore *store;
+ GtkTreeIter iter;
+ GtkCellRenderer *renderer;
- dropdown = gtk_option_menu_new();
- menu = gtk_menu_new();
+ store = gtk_list_store_new(STATUS_NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
for (i = PURPLE_STATUS_UNSET + 1; i < PURPLE_STATUS_NUM_PRIMITIVES; i++)
{
@@ -883,14 +862,30 @@
*/
continue;
- item = create_stock_item(purple_primitive_get_name_from_type(i),
- get_stock_icon_from_primitive(i));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ gtk_list_store_append(store, &iter);
+ gtk_list_store_set(store, &iter,
+ STATUS_COLUMN_ICON, get_stock_icon_from_primitive(i),
+ STATUS_COLUMN_STATUS_ID, purple_primitive_get_id_from_type(i),
+ STATUS_COLUMN_STATUS_NAME, purple_primitive_get_name_from_type(i),
+ -1);
}
- gtk_menu_set_active(GTK_MENU(menu), type - (PURPLE_STATUS_UNSET + 1));
- gtk_option_menu_set_menu(GTK_OPTION_MENU(dropdown), menu);
- gtk_widget_show_all(menu);
+ dropdown = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
+
+ renderer = gtk_cell_renderer_pixbuf_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, FALSE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
+ "stock-id", STATUS_COLUMN_ICON,
+ NULL);
+
+ renderer = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(dropdown), renderer, TRUE);
+ gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(dropdown), renderer,
+ "text", STATUS_COLUMN_STATUS_NAME,
+ NULL);
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(dropdown),
+ type - (PURPLE_STATUS_UNSET + 1));
return dropdown;
}
@@ -1160,7 +1155,7 @@
dropdown = create_status_type_menu(purple_savedstatus_get_type(saved_status));
else
dropdown = create_status_type_menu(PURPLE_STATUS_AWAY);
- dialog->type = GTK_OPTION_MENU(dropdown);
+ dialog->type = GTK_COMBO_BOX(dropdown);
pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Status:"), sg, dropdown, TRUE, NULL);
/* Status message */
@@ -1275,7 +1270,7 @@
if (!gtk_combo_box_get_active_iter(box, &iter))
return;
gtk_tree_model_get(GTK_TREE_MODEL(select->model), &iter,
- SUBSTATUS_COLUMN_STATUS_ID, &id,
+ STATUS_COLUMN_STATUS_ID, &id,
-1);
type = purple_account_get_status_type(select->account, id);
g_free(id);
@@ -1366,7 +1361,7 @@
}
gtk_tree_model_get(GTK_TREE_MODEL(dialog->model), &iter,
- SUBSTATUS_COLUMN_STATUS_ID, &id,
+ STATUS_COLUMN_STATUS_ID, &id,
-1);
type = purple_account_get_status_type(dialog->account, id);
if (purple_status_type_get_attr(type, "message") != NULL)
@@ -1456,7 +1451,7 @@
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_size_group_add_widget(sg, label);
- dialog->model = gtk_list_store_new(SUBSTATUS_NUM_COLUMNS,
+ dialog->model = gtk_list_store_new(STATUS_NUM_COLUMNS,
G_TYPE_STRING,
G_TYPE_STRING,
G_TYPE_STRING);
@@ -1469,12 +1464,12 @@
NULL);
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, FALSE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
- "stock-id", SUBSTATUS_COLUMN_ICON, NULL);
+ "stock-id", STATUS_COLUMN_ICON, NULL);
rend = GTK_CELL_RENDERER(gtk_cell_renderer_text_new());
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), rend, TRUE);
gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), rend,
- "text", SUBSTATUS_COLUMN_STATUS_NAME, NULL);
+ "text", STATUS_COLUMN_STATUS_NAME, NULL);
g_signal_connect(G_OBJECT(combo), "changed",
G_CALLBACK(substatus_selection_changed_cb), dialog);
@@ -1550,9 +1545,9 @@
gtk_list_store_append(dialog->model, &iter);
gtk_list_store_set(dialog->model, &iter,
- SUBSTATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
- SUBSTATUS_COLUMN_STATUS_ID, id,
- SUBSTATUS_COLUMN_STATUS_NAME, name,
+ STATUS_COLUMN_ICON, pidgin_stock_id_from_status_primitive(prim),
+ STATUS_COLUMN_STATUS_ID, id,
+ STATUS_COLUMN_STATUS_NAME, name,
-1);
if ((status_id != NULL) && !strcmp(status_id, id))
{