Mercurial > pidgin
changeset 15454:3b45081f6183
Finish converting the statusbox. Note the connecting and animation icons are too large. I put out a request to Hylke.
line wrap: on
line diff
--- a/configure.ac Sun Jan 28 21:40:32 2007 +0000 +++ b/configure.ac Mon Jan 29 03:22:42 2007 +0000 @@ -1895,6 +1895,8 @@ m4macros/Makefile pidgin/Makefile pidgin/pixmaps/Makefile + pidgin/pixmaps/animations/Makefile + pidgin/pixmaps/animations/16/Makefile pidgin/pixmaps/buddy_icons/Makefile pidgin/pixmaps/buddy_icons/qq/Makefile pidgin/pixmaps/dialogs/Makefile
--- a/pidgin/gaimstock.c Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/gaimstock.c Mon Jan 29 03:22:42 2007 +0000 @@ -150,6 +150,7 @@ { PIDGIN_STOCK_STATUS_AWAY, "status", "away.png", TRUE, TRUE, TRUE, FALSE }, { PIDGIN_STOCK_STATUS_BUSY, "status", "busy.png", TRUE, TRUE, TRUE, FALSE }, { PIDGIN_STOCK_STATUS_CHAT, "status", "chat.png", TRUE, TRUE, TRUE, FALSE }, + { PIDGIN_STOCK_STATUS_INVISIBLE,"status", "invisible.png", TRUE, TRUE, TRUE, FALSE }, { PIDGIN_STOCK_STATUS_XA, "status", "extended-away.png", TRUE, TRUE, TRUE, FALSE }, { PIDGIN_STOCK_STATUS_LOGIN, "status", "log-in.png", TRUE, TRUE, TRUE, FALSE }, { PIDGIN_STOCK_STATUS_LOGOUT, "status", "log-out.png", TRUE, TRUE, TRUE, FALSE }, @@ -165,6 +166,15 @@ { PIDGIN_STOCK_DIALOG_MAIL, "dialogs", "mail.png", TRUE, FALSE, FALSE, TRUE }, { PIDGIN_STOCK_DIALOG_QUESTION, "dialogs", "question.png", TRUE, FALSE, FALSE, TRUE }, { PIDGIN_STOCK_DIALOG_WARNING, "dialogs", "warning.png", FALSE, FALSE, FALSE, TRUE }, + + { PIDGIN_STOCK_ANIMATION_CONNECT0, "animations", "connect0.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT1, "animations", "connect1.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT2, "animations", "connect2.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_CONNECT3, "animations", "connect3.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING0, "animations", "typing0.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING1, "animations", "typing1.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING2, "animations", "typing2.png",TRUE, FALSE, FALSE, FALSE }, + { PIDGIN_STOCK_ANIMATION_TYPING3, "animations", "typing3.png",TRUE, FALSE, FALSE, FALSE }, }; static gchar *
--- a/pidgin/gaimstock.h Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/gaimstock.h Mon Jan 29 03:22:42 2007 +0000 @@ -99,6 +99,7 @@ #define PIDGIN_STOCK_STATUS_AWAY "pidgin-status-away" #define PIDGIN_STOCK_STATUS_BUSY "pidgin-status-busy" #define PIDGIN_STOCK_STATUS_CHAT "pidgin-status-chat" +#define PIDGIN_STOCK_STATUS_INVISIBLE "pidgin-status-invisible" #define PIDGIN_STOCK_STATUS_XA "pidgin-status-xa" #define PIDGIN_STOCK_STATUS_LOGIN "pidgin-status-login" #define PIDGIN_STOCK_STATUS_LOGOUT "pidgin-status-logout" @@ -116,6 +117,16 @@ #define PIDGIN_STOCK_DIALOG_COOL "pidgin-dialog-cool" #define PIDGIN_STOCK_DIALOG_WARNING "pidgin-dialog-warning" +/* StatusBox Animations */ +#define PIDGIN_STOCK_ANIMATION_CONNECT0 "pidgin-anim-connect0" +#define PIDGIN_STOCK_ANIMATION_CONNECT1 "pidgin-anim-connect1" +#define PIDGIN_STOCK_ANIMATION_CONNECT2 "pidgin-anim-connect2" +#define PIDGIN_STOCK_ANIMATION_CONNECT3 "pidgin-anim-connect3" +#define PIDGIN_STOCK_ANIMATION_TYPING0 "pidgin-anim-typing0" +#define PIDGIN_STOCK_ANIMATION_TYPING1 "pidgin-anim-typing1" +#define PIDGIN_STOCK_ANIMATION_TYPING2 "pidgin-anim-typing2" +#define PIDGIN_STOCK_ANIMATION_TYPING3 "pidgin-anim-typing3" + /*@}*/ /**
--- a/pidgin/gtkstatusbox.c Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/gtkstatusbox.c Mon Jan 29 03:22:42 2007 +0000 @@ -1044,7 +1044,7 @@ icon_size, "PidginStatusBox"); pixbuf3 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_OFFLINE, icon_size, "PidginStatusBox"); - pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_INVISIBLE, + pixbuf4 = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_STATUS_INVISIBLE, icon_size, "PidginStatusBox"); gtk_gaim_status_box_add(GTK_GAIM_STATUS_BOX(status_box), GTK_GAIM_STATUS_BOX_TYPE_PRIMITIVE, pixbuf, _("Available"), NULL, GINT_TO_POINTER(GAIM_STATUS_AVAILABLE)); @@ -1161,14 +1161,14 @@ gdk_pixbuf_unref(status_box->connecting_pixbufs[3]); status_box->connecting_index = 0; - status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT0, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT1, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT2, - icon_size, "GtkGaimStatusBox"); - status_box->connecting_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT3, - icon_size, "GtkGaimStatusBox"); + status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT0, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT1, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT2, + icon_size, "PidginStatusBox"); + status_box->connecting_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_CONNECT3, + icon_size, "PidginStatusBox"); if (status_box->typing_pixbufs[0] != NULL) gdk_pixbuf_unref(status_box->typing_pixbufs[0]); @@ -1180,14 +1180,14 @@ gdk_pixbuf_unref(status_box->typing_pixbufs[3]); status_box->typing_index = 0; - status_box->typing_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING0, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING1, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING2, - icon_size, "GtkGaimStatusBox"); - status_box->typing_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_TYPING3, - icon_size, "GtkGaimStatusBox"); + status_box->typing_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING0, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[1] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING1, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[2] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING2, + icon_size, "PidginStatusBox"); + status_box->typing_pixbufs[3] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), PIDGIN_STOCK_ANIMATION_TYPING3, + icon_size, "PidginStatusBox"); } static void account_enabled_cb(GaimAccount *acct, GtkGaimStatusBox *status_box) {
--- a/pidgin/pixmaps/Makefile.am Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/pixmaps/Makefile.am Mon Jan 29 03:22:42 2007 +0000 @@ -1,4 +1,4 @@ -SUBDIRS = buddy_icons dialogs emblems emotes protocols status +SUBDIRS = animations buddy_icons dialogs emblems emotes protocols status EXTRA_DIST = \ about_menu.png \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/16/Makefile.am Mon Jan 29 03:22:42 2007 +0000 @@ -0,0 +1,11 @@ +EXTRA_DIST = connect0.png \ + connect1.png \ + connect2.png \ + connect3.png \ + typing0.png \ + typing1.png \ + typing2.png \ + typing3.png + +pidginanimpixdir = $(datadir)/pixmaps/pidgin/animations/16 +pidginanimpix_DATA = $(EXTRA_DIST)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/pidgin/pixmaps/animations/Makefile.am Mon Jan 29 03:22:42 2007 +0000 @@ -0,0 +1,1 @@ +SUBDIRS = 16
--- a/pidgin/pixmaps/status/16/Makefile.am Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/pixmaps/status/16/Makefile.am Mon Jan 29 03:22:42 2007 +0000 @@ -6,6 +6,7 @@ chat.png \ extended-away.png \ half-operator.png \ + invisible.png \ log-in.png \ log-out.png \ offline.png \
--- a/pidgin/pixmaps/status/22/Makefile.am Sun Jan 28 21:40:32 2007 +0000 +++ b/pidgin/pixmaps/status/22/Makefile.am Mon Jan 29 03:22:42 2007 +0000 @@ -5,6 +5,7 @@ busy.png \ chat.png \ extended-away.png \ + invisible.png \ log-in.png \ log-out.png \ offline.png \