# HG changeset patch # User Rob Flynn # Date 968347569 0 # Node ID 9e2dcad06d3cc34f5900bc4326ee832ebd4394a5 # Parent 050f244b682939c948d3f9cbc57605e0f1bcc527 [gaim-migrate @ 864] I am the original pimp. :-p This isn't finished yet I just wanted to get it commited. We will see some gaim hacking today :) committer: Tailor Script diff -r 050f244b6829 -r 9e2dcad06d3c pixmaps/Makefile.am --- a/pixmaps/Makefile.am Thu Sep 07 06:55:33 2000 +0000 +++ b/pixmaps/Makefile.am Thu Sep 07 17:26:09 2000 +0000 @@ -7,6 +7,7 @@ aol_icon.xpm \ away.xpm \ away_icon.xpm \ + bgcolor.xpm \ big.xpm \ bigsmile.xpm \ block.xpm \ @@ -32,6 +33,7 @@ embarrassed.xpm \ exit_small.xpm \ export_small.xpm \ + fgcolor.xpm \ fontface.xpm \ fontface2.xpm \ free_icon.xpm \ diff -r 050f244b6829 -r 9e2dcad06d3c pixmaps/bgcolor.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/bgcolor.xpm Thu Sep 07 17:26:09 2000 +0000 @@ -0,0 +1,22 @@ +/* XPM */ +static char *bgcolor_xpm[] = { +/* columns rows colors chars-per-pixel */ +"15 12 4 1", +" c None", +". c Magenta", +"X c Gray60", +"o c Blue", +/* pixels */ +"ooooooooooooooo", +"ooooooooooooooo", +"ooooooo ooooooo", +"oooooo oooooo", +"oooooo oooooo", +"ooooo o ooooo", +"ooooo ooooo", +"oooo ooo oooo", +"oooo ooo oooo", +"ooo o ooo", +"ooooooooooooooo", +"ooooooooooooooo", +}; diff -r 050f244b6829 -r 9e2dcad06d3c pixmaps/fgcolor.xpm --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pixmaps/fgcolor.xpm Thu Sep 07 17:26:09 2000 +0000 @@ -0,0 +1,23 @@ +/* XPM */ +static char *fgcolor_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 13 4 1", +" c Blue", +". c Magenta", +"X c Gray60", +"o c None", +/* pixels */ +"oooooooooooooooo", +"oooooooooooooooo", +"oooooooooooooooo", +"oooooooooooooooo", +"oooooooo ooooooo", +"ooooooo oooooo", +"ooooooo oooooo", +"oooooo o ooooo", +"oooooo ooooo", +"ooooo ooo oooo", +"ooooo ooo oooo", +"oooo o ooo", +"oooooooooooooooo", +}; diff -r 050f244b6829 -r 9e2dcad06d3c src/aim.c --- a/src/aim.c Thu Sep 07 06:55:33 2000 +0000 +++ b/src/aim.c Thu Sep 07 17:26:09 2000 +0000 @@ -596,6 +596,7 @@ show_login(); + new_conversation("Roo"); gtk_main(); #endif /* USE_APPLET */ diff -r 050f244b6829 -r 9e2dcad06d3c src/conversation.c --- a/src/conversation.c Thu Sep 07 06:55:33 2000 +0000 +++ b/src/conversation.c Thu Sep 07 17:26:09 2000 +0000 @@ -45,7 +45,6 @@ #include "pixmaps/speaker.xpm" #include "pixmaps/smile_icon.xpm" #include "pixmaps/wood.xpm" -#include "pixmaps/palette.xpm" #include "pixmaps/link.xpm" #include "pixmaps/strike.xpm" @@ -71,6 +70,8 @@ #include "pixmaps/tmp_send.xpm" #include "pixmaps/gnome_remove.xpm" #include "pixmaps/gnome_add.xpm" +#include "pixmaps/fgcolor.xpm" +#include "pixmaps/bgcolor.xpm" #include "pixmaps/cancel.xpm" #include "pixmaps/warn.xpm" #include "pixmaps/tb_search.xpm" @@ -703,7 +704,8 @@ quiet_set(c->italic, FALSE); quiet_set(c->underline, FALSE); quiet_set(c->font, FALSE); - quiet_set(c->palette, FALSE); + quiet_set(c->fgcolorbtn, FALSE); + quiet_set(c->bgcolorbtn, FALSE); quiet_set(c->link, FALSE); if ((general_options & OPT_GEN_BACK_ON_IM) && awaymessage != NULL) { @@ -1008,11 +1010,11 @@ quiet_set(c->italic, FALSE); if (invert_tags(entry, "", 0)) - quiet_set(c->palette, TRUE); + quiet_set(c->fgcolorbtn, TRUE); else if (count_tag(entry, "")) - quiet_set(c->palette, TRUE); + quiet_set(c->fgcolorbtn, TRUE); else - quiet_set(c->palette, FALSE); + quiet_set(c->fgcolorbtn, FALSE); if (invert_tags(entry, "", 0)) quiet_set(c->font, TRUE); @@ -1370,9 +1372,9 @@ GtkWidget *build_conv_toolbar(struct conversation *c) { - GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *palette_i, *link_i, *font_i, *smiley_i; - GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *palette_p, *link_p, *font_p, *smiley_p; - GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *palette, *link, *font, *smiley; + GdkPixmap *strike_i, *small_i, *normal_i, *big_i, *bold_i, *italic_i, *underline_i, *speaker_i, *wood_i, *fgcolor_i, *bgcolor_i, *link_i, *font_i, *smiley_i; + GtkWidget *strike_p, *small_p, *normal_p, *big_p, *bold_p, *italic_p, *underline_p, *speaker_p, *wood_p, *fgcolor_p, *bgcolor_p, *link_p, *font_p, *smiley_p; + GtkWidget *strike, *small, *normal, *big, *bold, *italic, *underline, *speaker, *wood, *fgcolorbtn, *bgcolorbtn, *link, *font, *smiley; GdkBitmap *mask; GtkWidget *toolbar; GtkWidget *win; @@ -1383,15 +1385,21 @@ entry = c->entry; link_i = gdk_pixmap_create_from_xpm_d(win->window, &mask, - &win->style->white, bold_xpm ); + &win->style->white, link_xpm ); link_p = gtk_pixmap_new(link_i, mask); gtk_widget_show(link_p); gdk_bitmap_unref(mask); - palette_i = gdk_pixmap_create_from_xpm_d (win->window, &mask, - &win->style->white, bold_xpm ); - palette_p = gtk_pixmap_new(palette_i, mask); - gtk_widget_show(palette_p); + fgcolor_i = gdk_pixmap_create_from_xpm_d (win->window, &mask, + &win->style->white, fgcolor_xpm ); + fgcolor_p = gtk_pixmap_new(fgcolor_i, mask); + gtk_widget_show(fgcolor_p); + gdk_bitmap_unref(mask); + + bgcolor_i = gdk_pixmap_create_from_xpm_d (win->window, &mask, + &win->style->white, bgcolor_xpm ); + bgcolor_p = gtk_pixmap_new(bgcolor_i, mask); + gtk_widget_show(bgcolor_p); gdk_bitmap_unref(mask); wood_i = gdk_pixmap_create_from_xpm_d ( win->window, &mask, @@ -1485,10 +1493,14 @@ GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Link"), _("Insert Link"), _("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c); - palette = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), + fgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Color"), _("Text Color"), - _("Color"), palette_p, GTK_SIGNAL_FUNC(toggle_color), c); + _("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c); + bgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), + GTK_TOOLBAR_CHILD_TOGGLEBUTTON, + NULL, _("Color"), _("Background Color"), + _("Color"), bgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c); wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, _("Logging"), _("Enable logging"), @@ -1522,7 +1534,8 @@ gtk_button_set_relief(GTK_BUTTON(underline), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(speaker), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(wood), GTK_RELIEF_NONE); - gtk_button_set_relief(GTK_BUTTON(palette), GTK_RELIEF_NONE); + gtk_button_set_relief(GTK_BUTTON(fgcolorbtn), GTK_RELIEF_NONE); + gtk_button_set_relief(GTK_BUTTON(bgcolorbtn), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(link), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(font), GTK_RELIEF_NONE); gtk_button_set_relief(GTK_BUTTON(small), GTK_RELIEF_NONE); @@ -1532,7 +1545,8 @@ gtk_widget_show(toolbar); gdk_pixmap_unref(link_i); - gdk_pixmap_unref(palette_i); + gdk_pixmap_unref(fgcolor_i); + gdk_pixmap_unref(bgcolor_i); gdk_pixmap_unref(wood_i); gdk_pixmap_unref(speaker_i); gdk_pixmap_unref(strike_i); @@ -1550,7 +1564,8 @@ c->italic = italic; c->underline = underline; c->log_button = wood; - c->palette = palette; + c->fgcolorbtn = fgcolorbtn; + c->bgcolorbtn = bgcolorbtn; c->link = link; c->wood = wood; c->font = font; diff -r 050f244b6829 -r 9e2dcad06d3c src/dialogs.c --- a/src/dialogs.c Thu Sep 07 06:55:33 2000 +0000 +++ b/src/dialogs.c Thu Sep 07 17:26:09 2000 +0000 @@ -286,7 +286,7 @@ if (GTK_IS_COLOR_SELECTION_DIALOG(w)) { set_state_lock(1); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->palette), FALSE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE); set_state_lock(0); c->color_dialog = NULL; } @@ -2319,10 +2319,10 @@ void cancel_color(GtkWidget *widget, struct conversation *c) { - if (c->palette && widget) + if (c->fgcolorbtn && widget) { set_state_lock(1); - gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->palette), FALSE); + gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(c->fgcolorbtn), FALSE); set_state_lock(0); } dialogwindows = g_list_remove(dialogwindows, c->color_dialog); diff -r 050f244b6829 -r 9e2dcad06d3c src/gaim.h --- a/src/gaim.h Thu Sep 07 06:55:33 2000 +0000 +++ b/src/gaim.h Thu Sep 07 17:26:09 2000 +0000 @@ -265,7 +265,8 @@ GtkWidget *italic; GtkWidget *bold; GtkWidget *underline; - GtkWidget *palette; + GtkWidget *fgcolorbtn; + GtkWidget *bgcolorbtn; GtkWidget *link; GtkWidget *wood; GtkWidget *log_button; @@ -406,7 +407,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 844 $" +#define REVISION "gaim:$Revision: 864 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc"