Mercurial > pidgin.yaz

changeset 10134:0aca774bef87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11198] Patch 1051145, from Nathan Fredrickson, a rewrite of the smiley selection dialog: This patch replaces the smiely selection dialog with a smiley popup menu. The smileys are still arranged in a square grid. Screenshots here: http://worksintheory.org/files/gaim/smiley-menu/ One outstanding issue is with the yahoo smileys. Some of them are extra wide, and it seems that pixmap width affects menuitem height due to gtk's calculation of the "toggle size". The result is unecesseary vertical spacing. Not sure whether this is a gtk bug or not. Even with the extra vertical spacing, which only effects yahoo smiley's, I prefer this menu to the original dialog. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 23 Oct 2004 18:07:11 +0000
parents e144efd6a5be
children 3855d3467437
files ChangeLog src/ft.c src/gtkimhtmltoolbar.c src/gtkimhtmltoolbar.h
diffstat 4 files changed, 93 insertions(+), 141 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Oct 23 16:02:49 2004 +0000
+++ b/ChangeLog	Sat Oct 23 18:07:11 2004 +0000
@@ -9,6 +9,7 @@
 	* Autoreconnect plugin can hide the reconnect dialog (François Gagné)
 	* Screenname colors in chats now come from GNOME color palette
 	* Yahoo! has the following new "/" commands:  /join, /buzz
+	* Smiley selection dialog rewritten to look nicer (Nathan Fredrickson)
 
 	Bug fixes:
 	* People using input methods can now use Enter again.
--- a/src/ft.c	Sat Oct 23 16:02:49 2004 +0000
+++ b/src/ft.c	Sat Oct 23 18:07:11 2004 +0000
@@ -370,7 +370,7 @@
 		gaim_xfer_set_local_filename(xfer, filename);
 		gaim_xfer_set_filename(xfer, g_basename(filename));
 		gaim_xfer_set_size(xfer, st.st_size);
-		
+
 		msg = g_strdup_printf(_("Offering to send %s to %s"),
 							  filename, xfer->who);
 		gaim_xfer_conversation_write(xfer, msg, FALSE);
--- a/src/gtkimhtmltoolbar.c	Sat Oct 23 16:02:49 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Sat Oct 23 18:07:11 2004 +0000
@@ -38,9 +38,9 @@
 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar)
 {
 	GObject *object;
-	
+
 	g_return_if_fail(toolbar);
-	
+
 	/* block the format_function_toggle handler */
 	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
 	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
@@ -49,7 +49,7 @@
 	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 									  NULL, toolbar);
 	g_object_unref(object);
-	
+
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
@@ -57,9 +57,9 @@
 do_italic(GtkWidget *italic, GtkIMHtmlToolbar *toolbar)
 {
 	GObject *object;
-	
+
 	g_return_if_fail(toolbar);
-	
+
 	/* block the format_function_toggle handler */
 	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
 	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
@@ -68,7 +68,7 @@
 	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 									  NULL, toolbar);
 	g_object_unref(object);
-	
+
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
@@ -76,9 +76,9 @@
 do_underline(GtkWidget *underline, GtkIMHtmlToolbar *toolbar)
 {
 	GObject *object;
-	
+
 	g_return_if_fail(toolbar);
-	
+
 	/* block the format_function_toggle handler */
 	object = g_object_ref(G_OBJECT(GTK_IMHTML(toolbar->imhtml)));
 	g_signal_handlers_block_matched(object,	G_SIGNAL_MATCH_DATA, 0, 0, NULL,
@@ -87,7 +87,7 @@
 	g_signal_handlers_unblock_matched(object, G_SIGNAL_MATCH_DATA, 0, 0, NULL,
 									  NULL, toolbar);
 	g_object_unref(object);
-	
+
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
@@ -176,7 +176,7 @@
 		toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font"));
 
 		g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar);
-		
+
 		if(fontname) {
 			char fonttif[128];
 			g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname);
@@ -551,20 +551,22 @@
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
-
 static void
-close_smiley_dialog(GtkWidget *widget, GdkEvent *event,
-					GtkIMHtmlToolbar *toolbar)
+destroy_smiley_menu(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
 {
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE);
-
-	if (toolbar->smiley_dialog != NULL)
+	if (toolbar->smiley_menu != NULL)
 	{
-		gtk_widget_destroy(toolbar->smiley_dialog);
-		toolbar->smiley_dialog = NULL;
+		gtk_widget_destroy(toolbar->smiley_menu);
+		toolbar->smiley_menu = NULL;
 	}
 }
 
+static void
+deactivate_smiley_menu(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
+{
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE);
+	gtk_button_released(GTK_BUTTON(toolbar->smiley));
+}
 
 static void
 insert_smiley_text(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
@@ -579,32 +581,23 @@
 							 escaped_smiley);
 
 	g_free(escaped_smiley);
-	close_smiley_dialog(NULL, NULL, toolbar);
+	destroy_smiley_menu(NULL, toolbar);
 }
 
-
-static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *table, int row, int col, char *filename, char *face)
+static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *menu, int row, int col, char *filename, char *face)
 {
 	GtkWidget *image;
-	GtkWidget *button;
+	GtkWidget *menuitem;
 
 	image = gtk_image_new_from_file(filename);
-	button = gtk_button_new();
-	gtk_container_add(GTK_CONTAINER(button), image);
-	g_object_set_data(G_OBJECT(button), "smiley_text", face);
-	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(insert_smiley_text), toolbar);
-
-	gtk_tooltips_set_tip(toolbar->tooltips, button, face, NULL);
-
-	gtk_table_attach_defaults(GTK_TABLE(table), button, col, col+1, row, row+1);
-
-	/* these look really weird with borders */
-	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-
-	gtk_widget_show(button);
+	menuitem = gtk_image_menu_item_new_with_label("");
+	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), image);
+	g_object_set_data(G_OBJECT(menuitem), "smiley_text", face);
+	gtk_tooltips_set_tip(toolbar->tooltips, menuitem, face, NULL);
+	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(insert_smiley_text), toolbar);
+	gtk_menu_attach(GTK_MENU(menu), menuitem, col, col+1, row, row+1);
 }
 
-
 static gboolean smiley_is_unique(GSList *list, GtkIMHtmlSmiley *smiley) {
 	while(list) {
 		GtkIMHtmlSmiley *cur = list->data;
@@ -619,83 +612,65 @@
 static void
 insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
 {
-	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(smiley))) {
-
-		GtkWidget *dialog;
-		GtkWidget *smiley_table = NULL;
-		GSList *smileys, *unique_smileys = NULL;
-		int width;
-		int row = 0, col = 0;
+	GtkWidget *menu;
+	GSList *smileys, *unique_smileys = NULL;
+	int width;
+	int row = 0, col = 0;
 
-		if (toolbar->smiley_dialog) {
-			gtk_widget_grab_focus(toolbar->imhtml);
-			return;
-		}
+	destroy_smiley_menu(NULL, toolbar);
 
-		if (toolbar->sml)
-			smileys = get_proto_smileys(toolbar->sml);
-		else
-			smileys = get_proto_smileys(NULL);
+	if (toolbar->sml)
+		smileys = get_proto_smileys(toolbar->sml);
+	else
+		smileys = get_proto_smileys(NULL);
 
-		while(smileys) {
-			GtkIMHtmlSmiley *smiley = smileys->data;
-			if(!smiley->hidden) {
-				if(smiley_is_unique(unique_smileys, smiley))
-					unique_smileys = g_slist_append(unique_smileys, smiley);
-			}
-			smileys = smileys->next;
+	while(smileys) {
+		GtkIMHtmlSmiley *smiley = smileys->data;
+		if(!smiley->hidden) {
+			if(smiley_is_unique(unique_smileys, smiley))
+				unique_smileys = g_slist_append(unique_smileys, smiley);
 		}
+		smileys = smileys->next;
+	}
 
-		GAIM_DIALOG(dialog);
-
-		gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
-		gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
-		gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
+	menu = gtk_menu_new();
 
-		if(g_slist_length(unique_smileys)) {
+	if(g_slist_length(unique_smileys)) {
 
-			width = floor(sqrt(g_slist_length(unique_smileys)));
-
-			smiley_table = gtk_table_new(width, width, TRUE);
+		width = floor(sqrt(g_slist_length(unique_smileys)));
 
-			/* pack buttons */
-
-			while(unique_smileys) {
-				GtkIMHtmlSmiley *smiley = unique_smileys->data;
-				if(!smiley->hidden) {
-					add_smiley(toolbar, smiley_table, row, col, smiley->file, smiley->smile);
-					if(++col >= width) {
-						col = 0;
-						row++;
-					}
-				}
-				unique_smileys = unique_smileys->next;
-			}
-		}
-		else {
-			smiley_table = gtk_label_new(_("This theme has no available smileys."));
-		}
+		/* build menu */
+		while(unique_smileys) {
+			GtkIMHtmlSmiley *smiley = unique_smileys->data;
+			if(!smiley->hidden) {
+				add_smiley(toolbar, menu, row, col, smiley->file, smiley->smile);
 
-		gtk_container_add(GTK_CONTAINER(dialog), smiley_table);
-
-		gtk_widget_show(smiley_table);
-
-		gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
+				if(++col >= width) {
+					col = 0;
+					row++;
+				}
+			}
+			unique_smileys = unique_smileys->next;
+		}
+	}
+	else {
+		GtkWidget *menuitem;
+		menuitem = gtk_menu_item_new_with_label(_("This theme has no available smileys."));
+		gtk_widget_set_sensitive(menuitem, FALSE);
+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+	}
 
-		/* connect signals */
-		g_object_set_data(G_OBJECT(dialog), "dialog_type", "smiley dialog");
-		g_signal_connect(G_OBJECT(dialog), "delete_event",
-						 G_CALLBACK(close_smiley_dialog), toolbar);
+	/* connect signals */
+	g_signal_connect(G_OBJECT(menu), "deactivate",
+					 G_CALLBACK(deactivate_smiley_menu), toolbar);
+	g_signal_connect(G_OBJECT(menu), "selection-done",
+					 G_CALLBACK(destroy_smiley_menu), toolbar);
 
-		/* show everything */
-		gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!"));
-		gtk_widget_show_all(dialog);
+	/* show everything */
+	gtk_widget_show_all(menu);
+	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+	toolbar->smiley_menu = menu;
 
-		toolbar->smiley_dialog = dialog;
-
-	} else if (toolbar->smiley_dialog) {
-		close_smiley_dialog(smiley, NULL, toolbar);
-	}
 	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
@@ -760,11 +735,11 @@
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->bold)))
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), FALSE,
 									   toolbar);
-	
+
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->italic)))
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic),
 									   FALSE, toolbar);
-	
+
 	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->underline)))
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->underline),
 									   FALSE, toolbar);
@@ -772,7 +747,7 @@
 
 static void update_buttons(GtkIMHtmlToolbar *toolbar) {
 	gboolean bold, italic, underline;
-	
+
 	bold = italic = underline = FALSE;
 	gtk_imhtml_get_current_format(GTK_IMHTML(toolbar->imhtml),
 								  &bold, &italic, &underline);
@@ -819,35 +794,11 @@
 		toolbar->image_dialog = NULL;
 	}
 
-	if (toolbar->font_dialog != NULL)
-	{
-		gtk_widget_destroy(toolbar->font_dialog);
-		toolbar->font_dialog = NULL;
-	}
-
-	if (toolbar->smiley_dialog != NULL)
-	{
-		gtk_widget_destroy(toolbar->smiley_dialog);
-		toolbar->smiley_dialog = NULL;
-	}
-
-	if (toolbar->bgcolor_dialog != NULL)
-	{
-		gtk_widget_destroy(toolbar->bgcolor_dialog);
-		toolbar->bgcolor_dialog = NULL;
-	}
-
-	if (toolbar->fgcolor_dialog != NULL)
-	{
-		gtk_widget_destroy(toolbar->fgcolor_dialog);
-		toolbar->fgcolor_dialog = NULL;
-	}
-
-	if (toolbar->link_dialog != NULL)
-	{
-		gaim_request_close(GAIM_REQUEST_FIELDS, toolbar->link_dialog);
-		toolbar->link_dialog = NULL;
-	}
+	destroy_toolbar_font(NULL, NULL, toolbar);
+	destroy_smiley_menu(NULL, toolbar);
+	destroy_toolbar_bgcolor(NULL, NULL, toolbar);
+	destroy_toolbar_fgcolor(NULL, NULL, toolbar);
+	close_link_dialog(toolbar);
 
 	if (toolbar->sml)
 		free(toolbar->sml);
@@ -879,11 +830,11 @@
 	toolbar->fgcolor_dialog = NULL;
 	toolbar->bgcolor_dialog = NULL;
 	toolbar->link_dialog = NULL;
-	toolbar->smiley_dialog = NULL;
+	toolbar->smiley_menu = NULL;
 	toolbar->image_dialog = NULL;
 
 	toolbar->tooltips = gtk_tooltips_new();
-	
+
 	gtk_box_set_spacing(GTK_BOX(toolbar), 6);
 	sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 
@@ -1020,7 +971,7 @@
 	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert smiley"), NULL);
 
-	g_signal_connect(G_OBJECT(button), "clicked",
+	g_signal_connect(G_OBJECT(button), "pressed",
 			 G_CALLBACK(insert_smiley_cb), toolbar);
 
 	toolbar->smiley = button;
@@ -1082,11 +1033,11 @@
 	bold = italic = underline = FALSE;
 
 	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline);
-	
+
 	if(bold)
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->bold), bold,
 									   toolbar);
-	
+
 	if(italic)
 		toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->italic), italic,
 									   toolbar);
@@ -1100,6 +1051,6 @@
 {
 	if (toolbar->sml)
 		g_free(toolbar->sml);
-	
+
 	toolbar->sml = g_strdup(proto_id);
 }
--- a/src/gtkimhtmltoolbar.h	Sat Oct 23 16:02:49 2004 +0000
+++ b/src/gtkimhtmltoolbar.h	Sat Oct 23 18:07:11 2004 +0000
@@ -69,7 +69,7 @@
 	GtkWidget *fgcolor_dialog;
 	GtkWidget *bgcolor_dialog;
 	GtkWidget *link_dialog;
-	GtkWidget *smiley_dialog;
+	GtkWidget *smiley_menu;
 	GtkWidget *image_dialog;
 
 	char *sml;