changeset 24317:b948081819a6

Add an ellipsis to the "Add" and "Modify" buttons in the accounts, pounces, and saved statuses windows. Fixes #6662 committer: Richard Laager <rlaager@wiktel.com>
author Alex Willmer <alex@moreati.org.uk>
date Sat, 08 Nov 2008 19:26:28 +0000
parents adc1073040bf
children 73e827a93ae9 051c29d275de
files COPYRIGHT pidgin/gtkaccount.c pidgin/gtkpounce.c pidgin/gtksavedstatuses.c pidgin/pidginstock.c pidgin/pidginstock.h
diffstat 6 files changed, 10 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Sat Nov 08 04:29:32 2008 +0000
+++ b/COPYRIGHT	Sat Nov 08 19:26:28 2008 +0000
@@ -463,6 +463,7 @@
 Dan Willemsen
 Justin Williams (Jaywalker)
 Jason Willis
+Alex Willmer
 Matt Wilson
 Dan Winship
 Scott Wolchok
--- a/pidgin/gtkaccount.c	Sat Nov 08 04:29:32 2008 +0000
+++ b/pidgin/gtkaccount.c	Sat Nov 08 19:26:28 2008 +0000
@@ -2149,9 +2149,9 @@
 						 "<span size='larger' weight='bold'>Welcome to %s!</span>\n\n"
 
 						 "You have no IM accounts configured. To start connecting with %s "
-						 "press the <b>Add</b> button below and configure your first "
+						 "press the <b>Add...</b> button below and configure your first "
 						 "account. If you want %s to connect to multiple IM accounts, "
-						 "press <b>Add</b> again to configure them all.\n\n"
+						 "press <b>Add...</b> again to configure them all.\n\n"
 
 						 "You can come back to this window to add, edit, or remove "
 						 "accounts from <b>Accounts->Manage Accounts</b> in the Buddy "
@@ -2285,7 +2285,7 @@
 	gtk_widget_show(sw);
 
 	/* Add button */
-	pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD, G_CALLBACK(add_account_cb), dialog);
+	pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD, G_CALLBACK(add_account_cb), dialog);
 
 	/* Modify button */
 	button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_MODIFY, G_CALLBACK(modify_account_cb), dialog);
--- a/pidgin/gtkpounce.c	Sat Nov 08 04:29:32 2008 +0000
+++ b/pidgin/gtkpounce.c	Sat Nov 08 19:26:28 2008 +0000
@@ -1374,7 +1374,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), list, TRUE, TRUE, 0);
 
 	/* Add button */
-	button = pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD, G_CALLBACK(pounces_manager_add_cb), dialog);
+	button = pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD, G_CALLBACK(pounces_manager_add_cb), dialog);
 	gtk_widget_set_sensitive(button, (purple_accounts_get_all() != NULL));
 
 	purple_signal_connect(purple_connections_get_handle(), "signed-on",
--- a/pidgin/gtksavedstatuses.c	Sat Nov 08 04:29:32 2008 +0000
+++ b/pidgin/gtksavedstatuses.c	Sat Nov 08 19:26:28 2008 +0000
@@ -655,7 +655,7 @@
 					 G_CALLBACK(status_window_use_cb), dialog);
 
 	/* Add button */
-	pidgin_dialog_add_button(GTK_DIALOG(win), GTK_STOCK_ADD,
+	pidgin_dialog_add_button(GTK_DIALOG(win), PIDGIN_STOCK_ADD,
 			G_CALLBACK(status_window_add_cb), dialog);
 
 	/* Modify button */
--- a/pidgin/pidginstock.c	Sat Nov 08 04:29:32 2008 +0000
+++ b/pidgin/pidginstock.c	Sat Nov 08 19:26:28 2008 +0000
@@ -64,6 +64,7 @@
 	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
 	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
 	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
+	{ PIDGIN_STOCK_ADD,             NULL,	   GTK_STOCK_ADD			  },
 #if GTK_CHECK_VERSION(2,6,0)
 	{ PIDGIN_STOCK_PAUSE,           NULL,      GTK_STOCK_MEDIA_PAUSE      },
 #else
@@ -90,7 +91,8 @@
 	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("I_M"),         0, 0, NULL },
 	{ PIDGIN_STOCK_TOOLBAR_USER_INFO,   N_("_Get Info"),   0, 0, NULL },
 	{ PIDGIN_STOCK_INVITE,              N_("_Invite"),     0, 0, NULL },
-	{ PIDGIN_STOCK_MODIFY,              N_("_Modify"),     0, 0, NULL },
+	{ PIDGIN_STOCK_MODIFY,              N_("_Modify..."),  0, 0, NULL },
+	{ PIDGIN_STOCK_ADD,                 N_("_Add..."),     0, 0, NULL },
 	{ PIDGIN_STOCK_OPEN_MAIL,           N_("_Open Mail"),  0, 0, NULL },
 	{ PIDGIN_STOCK_PAUSE,               N_("_Pause"),      0, 0, NULL },
 	{ PIDGIN_STOCK_EDIT,                N_("_Edit"),       0, 0, NULL }
--- a/pidgin/pidginstock.h	Sat Nov 08 04:29:32 2008 +0000
+++ b/pidgin/pidginstock.h	Sat Nov 08 19:26:28 2008 +0000
@@ -49,6 +49,7 @@
 #define PIDGIN_STOCK_INFO            "pidgin-info"
 #define PIDGIN_STOCK_INVITE          "pidgin-invite"
 #define PIDGIN_STOCK_MODIFY          "pidgin-modify"
+#define PIDGIN_STOCK_ADD             "pidgin-add"
 #define PIDGIN_STOCK_OPEN_MAIL       "pidgin-stock-open-mail"
 #define PIDGIN_STOCK_PAUSE           "pidgin-pause"
 #define PIDGIN_STOCK_POUNCE          "pidgin-pounce"