Mercurial > pidgin.yaz

changeset 12163:f6f08fd1841a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 14464] I think GTK's 16x16 disconnect icon looks nice for a plugin menu item. As long as I was importing that as a plugins icon, I imported it as a DISCONNECT icon like it's meant to be. I then imported the connect icon as well. They might have some use to plugins. I don't want a plugin to use the GAIM_STOCK_PLUGIN icon when they really want DISCONNECT, in case we want to change the plugin icon later. I don't know how we'd apply the versioning API to these, but this allows us more flexibility in some cases. committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 Nov 2005 15:27:44 +0000
parents 5e24b8e49522
children 281ab2ecc08c
files pixmaps/Makefile.am pixmaps/stock_connect_16.png pixmaps/stock_disconnect_16.png plugins/ChangeLog.API plugins/docklet/docklet.c src/gtkblist.c src/gtkstock.c src/gtkstock.h
diffstat 8 files changed, 25 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pixmaps/Makefile.am	Sat Nov 19 15:19:35 2005 +0000
+++ b/pixmaps/Makefile.am	Sat Nov 19 15:27:44 2005 +0000
@@ -40,6 +40,8 @@
 		status-connect1.png		\
 		status-connect2.png		\
 		status-connect3.png		\
+		stock_connect_16.png		\
+		stock_disconnect_16.png		\
 		tb_drag_arrow_down.xpm		\
 		tb_drag_arrow_left.xpm		\
 		tb_drag_arrow_right.xpm		\
@@ -76,7 +78,7 @@
 gaimdialogpix_DATA = gaim_error.png gaim_info.png gaim_question.png gaim_warning.png gaim_cool.png gaim_auth.png
 
 gaimiconpixdir = $(datadir)/pixmaps/gaim/icons
-gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png info.png
+gaimiconpix_DATA = away.png connect.png msgpend.png offline.png online.png msgunread.png info.png stock_connect_16.png stock_disconnect_16.png
 
 gaimdistpixdir = $(datadir)/pixmaps/gaim
 gaimdistpix_DATA = envelope.png logo.png tb_drag_arrow_down.xpm tb_drag_arrow_left.xpm tb_drag_arrow_right.xpm tb_drag_arrow_up.xpm typed.png typing.png status-online.png status-offline.png status-away.png status-invisible.png status-typing0.png status-typing1.png status-typing2.png status-typing3.png status-connect0.png status-connect1.png status-connect2.png status-connect3.png phone.png
Binary file pixmaps/stock_connect_16.png has changed
Binary file pixmaps/stock_disconnect_16.png has changed
--- a/plugins/ChangeLog.API	Sat Nov 19 15:19:35 2005 +0000
+++ b/plugins/ChangeLog.API	Sat Nov 19 15:27:44 2005 +0000
@@ -155,6 +155,8 @@
 	* gaim_gtk_pounces_manager_show()
 	* gaim_gtk_pounces_manager_hide()
 	* gaim_gtk_pounce_editor_show()
+	* GAIM_STOCK_CONNECT, GAIM_STOCK_DISCONNECT
+	* GAIM_STOCK_PLUGIN
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.
--- a/plugins/docklet/docklet.c	Sat Nov 19 15:19:35 2005 +0000
+++ b/plugins/docklet/docklet.c	Sat Nov 19 15:27:44 2005 +0000
@@ -307,7 +307,7 @@
 	gaim_separator(menu);
 
 	gaim_new_item_from_stock(menu, _("Accounts"), GAIM_STOCK_ACCOUNTS, G_CALLBACK(gaim_gtk_accounts_window_show), NULL, 0, 0, NULL);
-	gaim_new_item_from_stock(menu, _("Plugins"), GTK_STOCK_PREFERENCES, G_CALLBACK(gaim_gtk_plugin_dialog_show), NULL, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("Plugins"), GAIM_STOCK_PLUGIN, G_CALLBACK(gaim_gtk_plugin_dialog_show), NULL, 0, 0, NULL);
 	gaim_new_item_from_stock(menu, _("Preferences"), GTK_STOCK_PREFERENCES, G_CALLBACK(gaim_gtk_prefs_show), NULL, 0, 0, NULL);
 
 	gaim_separator(menu);
--- a/src/gtkblist.c	Sat Nov 19 15:19:35 2005 +0000
+++ b/src/gtkblist.c	Sat Nov 19 15:27:44 2005 +0000
@@ -2442,7 +2442,7 @@
 	{ "/Tools/sep1", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Tools/A_ccounts"), "<CTL>A", gaim_gtk_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
 	{ N_("/Tools/Buddy _Pounces"), NULL, gaim_gtk_pounces_manager_show, 0, NULL },
-	{ N_("/Tools/Plu_gins"), "<CTL>U", gaim_gtk_plugin_dialog_show, 0, NULL },
+	{ N_("/Tools/Plu_gins"), "<CTL>U", gaim_gtk_plugin_dialog_show, 0, "<StockItem>", GAIM_STOCK_PLUGIN },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", gaim_gtk_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, gaim_gtk_privacy_dialog_show, 0, "<StockItem>", GTK_STOCK_DIALOG_ERROR },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>" },
--- a/src/gtkstock.c	Sat Nov 19 15:19:35 2005 +0000
+++ b/src/gtkstock.c	Sat Nov 19 15:27:44 2005 +0000
@@ -47,6 +47,11 @@
 	{ GAIM_STOCK_BLOCK,           NULL,      GTK_STOCK_STOP             },
 	{ GAIM_STOCK_CHAT,            NULL,      GTK_STOCK_JUMP_TO          },
 	{ GAIM_STOCK_CLEAR,           NULL,      GTK_STOCK_CLEAR            },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ GAIM_STOCK_CONNECT,         NULL,      GTK_STOCK_CONNECT          },
+#else
+	{ GAIM_STOCK_CONNECT,         "icons",   "stock_connect_16.png"     },
+#endif
 	{ GAIM_STOCK_DOWNLOAD,        NULL,      GTK_STOCK_GO_DOWN          },
 	{ GAIM_STOCK_DIALOG_AUTH,     "dialogs", "gaim_auth.png"            },
 	{ GAIM_STOCK_DIALOG_COOL,     "dialogs", "gaim_cool.png"            },
@@ -54,6 +59,11 @@
 	{ GAIM_STOCK_DIALOG_INFO,     "dialogs", "gaim_info.png"            },
 	{ GAIM_STOCK_DIALOG_QUESTION, "dialogs", "gaim_question.png"        },
 	{ GAIM_STOCK_DIALOG_WARNING,  "dialogs", "gaim_warning.png"         },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ GAIM_STOCK_DISCONNECT,      NULL,      GTK_STOCK_DISCONNECT       },
+#else
+	{ GAIM_STOCK_DISCONNECT,      "icons",   "stock_disconnect_16.png"  },
+#endif
 	{ GAIM_STOCK_FGCOLOR,         "buttons", "change-fgcolor-small.png" },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ GAIM_STOCK_EDIT,            NULL,      GTK_STOCK_EDIT             },
@@ -87,6 +97,11 @@
 	{ GAIM_STOCK_PAUSE,           "buttons", "pause.png"                },
 #endif
 	{ GAIM_STOCK_PENDING,         "gaim",    "envelope.png"             },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ GAIM_STOCK_PLUGIN,          NULL,      GTK_STOCK_DISCONNECT       },
+#else
+	{ GAIM_STOCK_PLUGIN,          "icons",   "stock_disconnect_16.png"  },
+#endif
 	{ GAIM_STOCK_OPEN_MAIL,       NULL,      GTK_STOCK_JUMP_TO          },
 	{ GAIM_STOCK_SEND,            "buttons", "send-im.png"              },
 	{ GAIM_STOCK_SIGN_ON,         NULL,      GTK_STOCK_EXECUTE          },
--- a/src/gtkstock.h	Sat Nov 19 15:19:35 2005 +0000
+++ b/src/gtkstock.h	Sat Nov 19 15:27:44 2005 +0000
@@ -37,12 +37,14 @@
 #define GAIM_STOCK_BLOCK           "gaim-block"
 #define GAIM_STOCK_CHAT            "gaim-chat"
 #define GAIM_STOCK_CLEAR           "gaim-clear"
+#define GAIM_STOCK_CONNECT         "gaim-connect"
 #define GAIM_STOCK_DIALOG_AUTH     "gaim-dialog-auth"
 #define GAIM_STOCK_DIALOG_COOL     "gaim-dialog-cool"
 #define GAIM_STOCK_DIALOG_ERROR    "gaim-dialog-error"
 #define GAIM_STOCK_DIALOG_INFO     "gaim-dialog-info"
 #define GAIM_STOCK_DIALOG_QUESTION "gaim-dialog-question"
 #define GAIM_STOCK_DIALOG_WARNING  "gaim-dialog-warning"
+#define GAIM_STOCK_DISCONNECT      "gaim-disconnect"
 #define GAIM_STOCK_DOWNLOAD        "gaim-download"
 #define GAIM_STOCK_EDIT            "gaim-edit"
 #define GAIM_STOCK_FGCOLOR         "gaim-fgcolor"
@@ -66,6 +68,7 @@
 #define GAIM_STOCK_OPEN_MAIL       "gaim-stock-open-mail"
 #define GAIM_STOCK_PAUSE           "gaim-pause"
 #define GAIM_STOCK_PENDING         "gaim-pending"
+#define GAIM_STOCK_PLUGIN          "gaim-plugin"
 #define GAIM_STOCK_SEND            "gaim-send"
 #define GAIM_STOCK_SIGN_OFF        "gaim-sign-off"
 #define GAIM_STOCK_SIGN_ON         "gaim-sign-on"