Menu
▾
▴
[Gaim-commits] CVS: gaim/src dialogs.c,1.373,1.374
|
From: Sean E. <sea...@us...> - 2002-12-03 02:47:06
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29847/src
Modified Files:
dialogs.c
Log Message:
the smiley selector dialog. That code looks really ugly right now. It should
improve when the smiley themes come.
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.373
retrieving revision 1.374
diff -u -d -r1.373 -r1.374
--- dialogs.c 28 Nov 2002 00:21:24 -0000 1.373
+++ dialogs.c 3 Dec 2002 02:47:02 -0000 1.374
@@ -62,23 +62,6 @@
#include "pixmaps/gnome_add.xpm"
#include "pixmaps/gnome_remove.xpm"
-#include "pixmaps/angel.xpm"
-#include "pixmaps/bigsmile.xpm"
-#include "pixmaps/burp.xpm"
-#include "pixmaps/crossedlips.xpm"
-#include "pixmaps/cry.xpm"
-#include "pixmaps/embarrassed.xpm"
-#include "pixmaps/kiss.xpm"
-#include "pixmaps/moneymouth.xpm"
-#include "pixmaps/sad.xpm"
-#include "pixmaps/scream.xpm"
-#include "pixmaps/smile.xpm"
-#include "pixmaps/smile8.xpm"
-#include "pixmaps/think.xpm"
-#include "pixmaps/tongue.xpm"
-#include "pixmaps/wink.xpm"
-#include "pixmaps/yell.xpm"
-
#include "pixmaps/protocols/oscar/aol_icon.xpm"
#include "pixmaps/protocols/oscar/free_icon.xpm"
#include "pixmaps/protocols/oscar/dt_icon.xpm"
@@ -3611,7 +3594,7 @@
close_smiley_dialog(NULL, c);
}
-static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win,
+static void toolbar_add_smiley_xpm(struct conversation *c, GtkWidget *bar, char **xpm, GtkWidget *win,
char *face)
{
GtkWidget *tpm;
@@ -3633,6 +3616,22 @@
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
}
+static void toolbar_add_smiley(struct conversation *c, GtkWidget *bar, char *filename, char *face)
+{
+ GtkWidget *tpm;
+ GtkImage *image;
+ GtkWidget *button;
+
+ image = gtk_image_new_from_file(filename);
+ button =
+ gtk_toolbar_append_item(GTK_TOOLBAR(bar), NULL, NULL, NULL,
+ image, GTK_SIGNAL_FUNC(set_smiley), (char *)face);
+ gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(insert_smiley_text), c);
+
+ /* these look really weird with borders */
+ gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+}
+
void show_smiley_dialog(struct conversation *c, GtkWidget *widget)
{
GtkWidget *dialog;
@@ -3662,37 +3661,70 @@
/* pack buttons */
if (c->gc->prpl->smiley_list == NULL) {
+ char *filename;
smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
- toolbar_add_smiley(c, smiley_box, angel_xpm, win, "O:-)");
- toolbar_add_smiley(c, smiley_box, bigsmile_xpm, win, ":-D");
- toolbar_add_smiley(c, smiley_box, burp_xpm, win, ":-!");
- toolbar_add_smiley(c, smiley_box, crossedlips_xpm, win, ":-X");
-
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "angel.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, "O:-)");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "bigsmile.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-D");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "burp.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-!");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "crossedlips.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-X");
+ g_free(filename);
+
smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
- toolbar_add_smiley(c, smiley_box, cry_xpm, win, ":'(");
- toolbar_add_smiley(c, smiley_box, embarrassed_xpm, win, ":-[");
- toolbar_add_smiley(c, smiley_box, kiss_xpm, win, ":-*");
- toolbar_add_smiley(c, smiley_box, moneymouth_xpm, win, ":-$");
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cry.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":'(");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "embarrassed.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-[");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "kiss.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-*");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "moneymouth.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-$");
+ g_free(filename);
smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
- toolbar_add_smiley(c, smiley_box, sad_xpm, win, ":-(");
- toolbar_add_smiley(c, smiley_box, scream_xpm, win, "=-O");
- toolbar_add_smiley(c, smiley_box, smile_xpm, win, ":-)");
- toolbar_add_smiley(c, smiley_box, smile8_xpm, win, "8-)");
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "sad.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-(");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "scream.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, "=-O");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "smile.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-)");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "cool.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, "8-)");
+ g_free(filename);
smiley_box = gtk_toolbar_new();
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
- toolbar_add_smiley(c, smiley_box, think_xpm, win, ":-/");
- toolbar_add_smiley(c, smiley_box, tongue_xpm, win, ":-P");
- toolbar_add_smiley(c, smiley_box, wink_xpm, win, ";-)");
- toolbar_add_smiley(c, smiley_box, yell_xpm, win, ">:o");
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "think.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-/");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "tongue.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ":-P");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "wink.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ";-)");
+ g_free(filename);
+ filename = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", "default", "yell.png", NULL);
+ toolbar_add_smiley(c, smiley_box, filename, ">:o");
+ g_free(filename);
} else {
smilies = c->gc->prpl->smiley_list();
@@ -3724,7 +3756,7 @@
gtk_box_pack_start(GTK_BOX(vbox), smiley_box, TRUE, TRUE, 0);
}
- toolbar_add_smiley(c, smiley_box, smile->xpm, win, smile->key);
+ toolbar_add_smiley_xpm(c, smiley_box, smile->xpm, win, smile->key);
smiley_count++;
}
|