changeset 5049:24d0da9c56f2

[gaim-migrate @ 5397] (18:16:24) xOr: LSchiere: makes them work like the bold etc buttons (18:16:39) xOr: LSchiere: click a font size button twice, and compare to bold committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sun, 06 Apr 2003 22:18:30 +0000
parents cb320b74a0dd
children dfec167391a5
files src/gtkconv.c src/gtkconv.h
diffstat 2 files changed, 22 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Sun Apr 06 18:49:04 2003 +0000
+++ b/src/gtkconv.c	Sun Apr 06 22:18:30 2003 +0000
@@ -357,7 +357,9 @@
 	set_toggle(gtkconv->toolbar.bold,        FALSE);
 	set_toggle(gtkconv->toolbar.italic,      FALSE);
 	set_toggle(gtkconv->toolbar.underline,   FALSE);
+	set_toggle(gtkconv->toolbar.larger_size, FALSE);
 	set_toggle(gtkconv->toolbar.normal_size, FALSE);
+	set_toggle(gtkconv->toolbar.smaller_size,FALSE);
 	set_toggle(gtkconv->toolbar.font,        FALSE);
 	set_toggle(gtkconv->toolbar.fgcolor,     FALSE);
 	set_toggle(gtkconv->toolbar.bgcolor,     FALSE);
@@ -1786,23 +1788,32 @@
 static void
 do_small(GtkWidget *small, struct gaim_gtk_conversation *gtkconv)
 {
-	gaim_gtk_surround(gtkconv, "<FONT SIZE=\"1\">", "</FONT>");
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(small)))
+		gaim_gtk_surround(gtkconv, "<FONT SIZE=\"1\">", "</FONT>");
+	else
+		gaim_gtk_advance_past(gtkconv, "<FONT SIZE=\"1\">", "</FONT>");
 
 	gtk_widget_grab_focus(gtkconv->entry);
 }
 
 static void
-do_normal(GtkWidget *small, struct gaim_gtk_conversation *gtkconv)
+do_normal(GtkWidget *normal, struct gaim_gtk_conversation *gtkconv)
 {
-	gaim_gtk_surround(gtkconv, "<FONT SIZE=\"3\">", "</FONT>");
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(normal)))
+		gaim_gtk_surround(gtkconv, "<FONT SIZE=\"3\">", "</FONT>");
+	else
+		gaim_gtk_advance_past(gtkconv, "<FONT SIZE=\"3\">", "</FONT>");
 
 	gtk_widget_grab_focus(gtkconv->entry);
 }
 
 static void
-do_big(GtkWidget *small, struct gaim_gtk_conversation *gtkconv)
+do_big(GtkWidget *large, struct gaim_gtk_conversation *gtkconv)
 {
-	gaim_gtk_surround(gtkconv, "<FONT SIZE=\"5\">", "</FONT>");
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(large)))
+		gaim_gtk_surround(gtkconv, "<FONT SIZE=\"5\">", "</FONT>");
+	else
+		gaim_gtk_advance_past(gtkconv, "<FONT SIZE=\"5\">", "</FONT>");
 
 	gtk_widget_grab_focus(gtkconv->entry);
 }
@@ -2770,6 +2781,8 @@
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(do_big), gtkconv);
 
+	gtkconv->toolbar.larger_size = button;
+
 	/* Normal font size */
 	button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_TEXT_NORMAL);
 	gtk_size_group_add_widget(sg, button);
@@ -2792,6 +2805,8 @@
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(do_small), gtkconv);
 
+	gtkconv->toolbar.smaller_size = button;
+
 	/* Sep */
 	sep = gtk_vseparator_new();
 	gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0);
--- a/src/gtkconv.h	Sun Apr 06 18:49:04 2003 +0000
+++ b/src/gtkconv.h	Sun Apr 06 22:18:30 2003 +0000
@@ -140,7 +140,9 @@
 		GtkWidget *italic;
 		GtkWidget *underline;
 
+		GtkWidget *larger_size;
 		GtkWidget *normal_size;
+		GtkWidget *smaller_size;
 
 		GtkWidget *font;
 		GtkWidget *fgcolor;