pidgin: src/gtkconv.c comparison

comparison src/gtkconv.c @ 9025:b24967757d46

[gaim-migrate @ 9801] " - Fixed text-decoration: underline; parsing from being dependent on font-size specified - IM HTML Toolbar dialogs now automatically fill with the color/font for the current text - Made most of the IMHTML formatting buttons fire signals where appropriate - Implemented a global on or off "Send default formatting with outgoing messages" option - If user previously sent a font name, we assume they want formatting on, otherwise it defaults to off. - Removed font and color from the GaimGtkConversation struct, because this wasn't being used anywhere, by anything and just resulted in more confusing code. - Removed three functions related to the struct, including one that was declared, but never actually written. - Added get_current_fontface, get_current_fontsize, get_current_forecolor, get_current_backcolor to gtk_imhtml_* to get the formatting at the cursor (or whole buffer when wbfo is on) - Removed all dialogs used only by the old default formatting preferences from dialogs.c - When font background, color, or face are "disabled" they are stored as an empty string in their prefs. - Fixed a bug where NULL for background, color, or face did not remove the tags in wbfo " all that, quoth SimGuy committer: Tailor Script <tailor@pidgin.im>

author	Luke Schierer <lschiere@pidgin.im>
date	Sun, 23 May 2004 03:54:20 +0000
parents	230cf4032e3d
children	812e7aa7eafa

comparison

equal deleted inserted replaced

-:85caba2f820a
+:b24967757d46
 	GaimGtkConversation *c = GAIM_GTK_CONVERSATION(conv);
 	GaimConnection *gc = gaim_conversation_get_gc(conv);
 	if (gc && gc->flags & GAIM_CONNECTION_HTML)
 	{
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold"))
+		if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_formatting"))
-			gtk_imhtml_toggle_bold(GTK_IMHTML(c->entry));
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic"))
-			gtk_imhtml_toggle_italic(GTK_IMHTML(c->entry));
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline"))
-			gtk_imhtml_toggle_underline(GTK_IMHTML(c->entry));
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_font") ||
-			c->has_font)
 		{
-			gtk_imhtml_toggle_fontface(GTK_IMHTML(c->entry), c->fontface);
+			char *color;
-		}
+			GdkColor fg_color, bg_color;
-		if (!(gc->flags & GAIM_CONNECTION_NO_FONTSIZE) &&
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold"))
-			gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_size"))
+				gtk_imhtml_toggle_bold(GTK_IMHTML(c->entry));
-		{
-		        gtk_imhtml_font_set_size(GTK_IMHTML(c->entry),
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic"))
+				gtk_imhtml_toggle_italic(GTK_IMHTML(c->entry));
+			if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline"))
+				gtk_imhtml_toggle_underline(GTK_IMHTML(c->entry));
+			gtk_imhtml_toggle_fontface(GTK_IMHTML(c->entry),
+				gaim_prefs_get_string("/gaim/gtk/conversations/font_face"));
+			if (!(gc->flags & GAIM_CONNECTION_NO_FONTSIZE))
+				gtk_imhtml_font_set_size(GTK_IMHTML(c->entry),
 					gaim_prefs_get_int("/gaim/gtk/conversations/font_size"));
-		}
+			if(strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), "") != 0)
-		if (gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_fgcolor"))
+			{
-		{
+				gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"),
-			char *color = g_strdup_printf("#%02x%02x%02x",
+								&fg_color);
-										  c->fg_color.red   / 256,
+				color = g_strdup_printf("#%02x%02x%02x",
-										  c->fg_color.green / 256,
+										fg_color.red   / 256,
-										  c->fg_color.blue  / 256);
+										fg_color.green / 256,
+										fg_color.blue  / 256);
+			}
+			else
+				color = g_strdup("");
 			gtk_imhtml_toggle_forecolor(GTK_IMHTML(c->entry), color);
 			g_free(color);
-		}
+			if(!(gc->flags & GAIM_CONNECTION_NO_BGCOLOR) &&
-		if (!(gc->flags & GAIM_CONNECTION_NO_BGCOLOR) &&
+			   strcmp(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), "") != 0)
-			gaim_prefs_get_bool("/gaim/gtk/conversations/use_custom_bgcolor"))
+			{
-		{
+				gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"),
-			char *color = g_strdup_printf("#%02x%02x%02x",
+								&bg_color);
-										  c->bg_color.red   / 256,
+				color = g_strdup_printf("#%02x%02x%02x",
-										  c->bg_color.green / 256,
+										bg_color.red   / 256,
-										  c->bg_color.blue  / 256);
+										bg_color.green / 256,
+										bg_color.blue  / 256);
+			}
+			else
+				color = g_strdup("");
 			gtk_imhtml_toggle_backcolor(GTK_IMHTML(c->entry), color);
 			g_free(color);
 		}
 		if (gc->flags & GAIM_CONNECTION_FORMATTING_WBFO)
 			gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(c->entry), TRUE);
 		else
 			gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(c->entry), FALSE);
 	}
 }
 static void
 send_cb(GtkWidget *widget, GaimConversation *conv)
 {
 	GaimGtkConversation *gtkconv;
 	GaimAccount *account;
 		conv->ui_data = gtkconv;
 		/* Setup some initial variables. */
 		gtkconv->sg       = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
 		gtkconv->tooltips = gtk_tooltips_new();
-		/* Setup the foreground and background colors */
-		gaim_gtkconv_update_font_colors(conv);
-		/* Setup the font face */
-		gaim_gtkconv_update_font_face(conv);
 		if (conv_type == GAIM_CONV_IM) {
 			gtkconv->u.im = g_malloc0(sizeof(GaimGtkImPane));
 			gtkconv->u.im->a_virgin = TRUE;
 	if(conv == gaim_conv_window_get_active_conversation(gaim_conversation_get_window(conv)))
 		gtk_window_set_icon(GTK_WINDOW(gtkwin->window), buf);
 }
 void
-gaim_gtkconv_update_font_colors(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv;
-	if (!GAIM_IS_GTK_CONVERSATION(conv))
-		return;
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
-	gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"),
-					&gtkconv->fg_color);
-	gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"),
-					&gtkconv->bg_color);
-}
-void
-gaim_gtkconv_update_font_face(GaimConversation *conv)
-{
-	GaimGtkConversation *gtkconv;
-	if (!GAIM_IS_GTK_CONVERSATION(conv))
-		return;
-	gtkconv = GAIM_GTK_CONVERSATION(conv);
-	strncpy(gtkconv->fontface,
-			gaim_prefs_get_string("/gaim/gtk/conversations/font_face"),
-			sizeof(gtkconv->fontface));
-}
-void
 gaim_gtkconv_update_buttons_by_protocol(GaimConversation *conv)
 {
 	GaimConvWindow *win;
 	if (!GAIM_IS_GTK_CONVERSATION(conv))
 	gaim_prefs_add_none("/gaim/gtk/conversations");
 	gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_underline", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/spellcheck", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/ignore_formatting", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_bgcolor", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_fgcolor", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_font", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/use_custom_size", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/html_shortcuts", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/smiley_shortcuts", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
 	gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
 	gaim_prefs_add_int("/gaim/gtk/conversations/placement_number", 1);
-	gaim_prefs_add_string("/gaim/gtk/conversations/bgcolor", "#FFFFFF");
+	gaim_prefs_add_string("/gaim/gtk/conversations/bgcolor", "");
-	gaim_prefs_add_string("/gaim/gtk/conversations/fgcolor", "#000000");
+	gaim_prefs_add_string("/gaim/gtk/conversations/fgcolor", "");
 	gaim_prefs_add_string("/gaim/gtk/conversations/font_face", "");
 	gaim_prefs_add_int("/gaim/gtk/conversations/font_size", 3);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/tabs", TRUE);
 	gaim_prefs_add_int("/gaim/gtk/conversations/tab_side", GTK_POS_TOP);

Mercurial > pidgin

comparison src/gtkconv.c @ 9025:b24967757d46