Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkconv.c,1.218,1.219 gtkconv.h,1.24,1.25 gtkprefs.c,1.89,1.90
|
From: Christian H. <ch...@us...> - 2003-10-25 00:09:45
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv2391/src
Modified Files:
gtkconv.c gtkconv.h gtkprefs.c
Log Message:
Added an option to remove the formatting toolbar, both globally and on a
per-window basis. Patch by Nathan Fredrickson.
Index: gtkconv.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -d -p -r1.218 -r1.219
--- gtkconv.c 24 Oct 2003 05:46:00 -0000 1.218
+++ gtkconv.c 25 Oct 2003 00:03:13 -0000 1.219
@@ -929,6 +929,29 @@ menu_logging_cb(gpointer data, guint act
}
static void
+menu_toolbar_cb(gpointer data, guint action, GtkWidget *widget)
+{
+ GaimConvWindow *win = (GaimConvWindow *)data;
+ GaimConversation *conv;
+ GaimGtkConversation *gtkconv;
+
+ conv = gaim_conv_window_get_active_conversation(win);
+
+ if (conv == NULL)
+ return;
+
+ gtkconv = GAIM_GTK_CONVERSATION(conv);
+
+ gtkconv->show_formatting_toolbar =
+ gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+
+ if (gtkconv->show_formatting_toolbar)
+ gtk_widget_show(gtkconv->toolbar.toolbar);
+ else
+ gtk_widget_hide(gtkconv->toolbar.toolbar);
+}
+
+static void
menu_sounds_cb(gpointer data, guint action, GtkWidget *widget)
{
GaimConvWindow *win = (GaimConvWindow *)data;
@@ -946,8 +969,6 @@ menu_sounds_cb(gpointer data, guint acti
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
}
-
-
void
im_cb(GtkWidget *widget, GaimConversation *conv)
{
@@ -2017,7 +2038,7 @@ switch_conv_cb(GtkNotebook *notebook, Gt
GaimGtkWindow *gtkwin;
GaimConnection *gc;
GdkPixbuf *window_icon = NULL;
-
+
win = (GaimConvWindow *)user_data;
conv = gaim_conv_window_get_conversation_at(win, page_num);
@@ -2074,7 +2095,7 @@ switch_conv_cb(GtkNotebook *notebook, Gt
if (gtkwin->menu.send_as != NULL)
g_timeout_add(0, (GSourceFunc)update_send_as_selection, win);
-
+
if (gtkconv->u.im->anim) {
window_icon = gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
g_object_ref(window_icon);
@@ -2109,20 +2130,24 @@ switch_conv_cb(GtkNotebook *notebook, Gt
gtk_widget_set_sensitive(gtkwin->menu.add, FALSE);
gtk_widget_set_sensitive(gtkwin->menu.remove, FALSE);
-
+
if (gtkwin->menu.send_as != NULL)
g_timeout_add(0, (GSourceFunc)update_send_as_selection, win);
window_icon = get_tab_icon(conv);
}
-
+
update_typing_icon(conv);
-
+
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.logging),
gaim_conversation_is_logging(conv));
-
+
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.sounds),
gtkconv->make_sound);
-
+
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(gtkwin->menu.show_formatting_toolbar),
+ gtkconv->show_formatting_toolbar);
+
gtk_widget_grab_focus(gtkconv->entry);
gtk_window_set_icon(GTK_WINDOW(gtkwin->window), window_icon);
@@ -2954,6 +2979,7 @@ static GtkItemFactoryEntry menu_items[]
{ N_("/_Options"), NULL, NULL, 0, "<Branch>" },
{ N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>" },
{ N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>" },
+ { N_("/Options/Show Formatting _Toolbar"), NULL, menu_toolbar_cb, 0, "<CheckItem>" },
};
static const int menu_item_count =
@@ -3048,6 +3074,9 @@ setup_menubar(GaimConvWindow *win)
gtkwin->menu.sounds =
gtk_item_factory_get_widget(gtkwin->menu.item_factory,
N_("/Options/Enable Sounds"));
+ gtkwin->menu.show_formatting_toolbar =
+ gtk_item_factory_get_widget(gtkwin->menu.item_factory,
+ N_("/Options/Show Formatting Toolbar"));
generate_send_as_items(win, NULL);
@@ -3378,6 +3407,9 @@ build_conv_toolbar(GaimConversation *con
gtk_widget_show_all(vbox);
+ if (!gaim_prefs_get_bool("/gaim/gtk/conversations/show_formatting_toolbar"))
+ gtk_widget_hide(vbox);
+
return vbox;
}
@@ -4058,6 +4090,9 @@ gaim_gtk_add_conversation(GaimConvWindow
gtkconv->make_sound = TRUE;
+ gtkconv->show_formatting_toolbar = gaim_prefs_get_bool(
+ "/gaim/gtk/conversations/show_formatting_toolbar");
+
g_signal_connect_swapped(G_OBJECT(pane), "focus",
G_CALLBACK(gtk_widget_grab_focus),
gtkconv->entry);
@@ -4116,7 +4151,7 @@ gaim_gtk_add_conversation(GaimConvWindow
if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
gaim_gtkconv_update_buddy_icon(conv);
-
+
/* Add this pane to the conversations notebook. */
gtk_notebook_append_page(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, tabby);
gtk_notebook_set_menu_label(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, menu_tabby);
@@ -5006,7 +5041,7 @@ gaim_gtkconv_set_title(GaimConversation
gtk_label_set_text(GTK_LABEL(gtkconv->tab_label), title);
gtk_label_set_text(GTK_LABEL(gtkconv->menu_label), title);
-
+
if(conv == gaim_conv_window_get_active_conversation(win))
gtk_window_set_title(GTK_WINDOW(gtkwin->window), title);
}
@@ -5029,7 +5064,7 @@ update_tab_icon(GaimConversation *conv)
gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->icon), status);
gtk_image_set_from_pixbuf(GTK_IMAGE(gtkconv->menu_icon), status);
- if (gaim_conv_window_get_active_conversation(win) == conv && gtkconv->u.im->anim == NULL)
+ if (gaim_conv_window_get_active_conversation(win) == conv && gtkconv->u.im->anim == NULL)
gtk_window_set_icon(GTK_WINDOW(GAIM_GTK_WINDOW(win)->window), status);
if(status)
@@ -5961,6 +5996,39 @@ tab_side_pref_cb(const char *name, GaimP
}
static void
+show_formatting_toolbar_pref_cb(const char *name, GaimPrefType type,
+ gpointer value, gpointer data)
+{
+ GList *l;
+ GaimConversation *conv;
+ GaimGtkConversation *gtkconv;
+ GaimConvWindow *win;
+ GaimGtkWindow *gtkwin;
+
+ for (l = gaim_get_conversations(); l != NULL; l = l->next)
+ {
+ conv = (GaimConversation *)l->data;
+
+ if (!GAIM_IS_GTK_CONVERSATION(conv))
+ continue;
+
+ gtkconv = GAIM_GTK_CONVERSATION(conv);
+ win = gaim_conversation_get_window(conv);
+ gtkwin = GAIM_GTK_WINDOW(win);
+
+ gtkconv->show_formatting_toolbar = (gboolean)value;
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(gtkwin->menu.show_formatting_toolbar),
+ gtkconv->show_formatting_toolbar);
+
+ if (gtkconv->show_formatting_toolbar)
+ gtk_widget_show(gtkconv->toolbar.toolbar);
+ else
+ gtk_widget_hide(gtkconv->toolbar.toolbar);
+ }
+}
+
+static void
im_button_type_pref_cb(const char *name, GaimPrefType type,
gpointer value, gpointer data)
{
@@ -6097,6 +6165,7 @@ gaim_gtk_conversations_init(void)
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_urls_as_links", TRUE);
+ gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
gaim_prefs_add_string("/gaim/gtk/conversations/bgcolor", "#FFFFFF");
gaim_prefs_add_string("/gaim/gtk/conversations/fgcolor", "#000000");
gaim_prefs_add_string("/gaim/gtk/conversations/font_face", "");
@@ -6139,6 +6208,8 @@ gaim_gtk_conversations_init(void)
show_smileys_pref_cb, NULL);
gaim_prefs_connect_callback("/gaim/gtk/conversations/show_timestamps",
show_timestamps_pref_cb, NULL);
+ gaim_prefs_connect_callback("/gaim/gtk/conversations/show_formatting_toolbar",
+ show_formatting_toolbar_pref_cb, NULL);
gaim_prefs_connect_callback("/gaim/gtk/conversations/spellcheck",
spellcheck_pref_cb, NULL);
gaim_prefs_connect_callback("/gaim/gtk/conversations/tab_side",
Index: gtkconv.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkconv.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -p -r1.24 -r1.25
--- gtkconv.h 18 Oct 2003 01:58:01 -0000 1.24
+++ gtkconv.h 25 Oct 2003 00:03:13 -0000 1.25
@@ -5,7 +5,7 @@
* gaim
*
* Copyright (C) 2002-2003 Christian Hammond <ch...@gn...>
- *
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -66,6 +66,7 @@ struct _GaimGtkWindow
GtkWidget *logging;
GtkWidget *sounds;
+ GtkWidget *show_formatting_toolbar;
GtkWidget *send_as;
@@ -126,6 +127,7 @@ struct _GaimGtkChatPane
struct _GaimGtkConversation
{
gboolean make_sound;
+ gboolean show_formatting_toolbar;
gboolean has_font;
char fontface[128];
GdkColor fg_color;
Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -p -r1.89 -r1.90
--- gtkprefs.c 20 Oct 2003 05:08:05 -0000 1.89
+++ gtkprefs.c 25 Oct 2003 00:03:13 -0000 1.90
@@ -891,6 +891,9 @@ GtkWidget *conv_page() {
prefs_checkbox(_("Send _URLs as Links"),
"/core/conversations/send_urls_as_links", vbox);
+ prefs_checkbox(_("Show Formatting Toolbar"),
+ "/gaim/gtk/conversations/show_formatting_toolbar", vbox);
+
vbox = gaim_gtk_make_frame (ret, _("Tab Options"));
label = prefs_dropdown(vbox, _("_Tab Placement:"), GAIM_PREF_INT,
|
