gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2006-01-14 [colin] 1.9.100cvs149

Browse source 
* src/account.c
	* src/addressbook.c
	* src/compose.c
	* src/folderview.c
	* src/imap_gtk.c
	* src/mainwindow.c
	* src/mh_gtk.c
	* src/news_gtk.c
	* src/prefs_actions.c
	* src/prefs_customheader.c
	* src/prefs_filtering.c
	* src/prefs_matcher.c
	* src/prefs_template.c
	* src/ssl_manager.c
	* src/summaryview.c
	* src/textview.c
	* src/toolbar.c
		All deletion confirmations are now "Cancel, Delete"
		instead of "No, Yes"
		Clarified most of the other "No, Yes" to
		"Cancel, Descriptive_action"
		Rechanged the "Entry not saved" alerts to have
		"Close, Continue editing"
This commit is contained in:
Colin Leroy 2006-01-14 11:04:52 +00:00
parent 758544f54a
commit 9179801a1d
20 changed files with 68 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ChangeLog
View file

@ -1,3 +1,30 @@
2006-01-14 [colin] 1.9.100cvs149
* src/account.c
* src/addressbook.c
* src/compose.c
* src/folderview.c
* src/imap_gtk.c
* src/mainwindow.c
* src/mh_gtk.c
* src/news_gtk.c
* src/prefs_actions.c
* src/prefs_customheader.c
* src/prefs_filtering.c
* src/prefs_matcher.c
* src/prefs_template.c
* src/ssl_manager.c
* src/summaryview.c
* src/textview.c
* src/toolbar.c
All deletion confirmations are now "Cancel, Delete"
instead of "No, Yes"
Clarified most of the other "No, Yes" to
"Cancel, Descriptive_action"
Rechanged the "Entry not saved" alerts to have
"Close, Continue editing"
2006-01-14 [paul]
* 2.0.0-rc4 released

1
PATCHSETS
View file

@ -1132,3 +1132,4 @@
( cvs diff -u -r 1.100.2.32 -r 1.100.2.33 AUTHORS; cvs diff -u -r 1.396.2.193 -r 1.396.2.194 ChangeLog; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/gtk/authors.h; ) > 1.9.100cvs146.patchset
( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 po/es.po; ) > 1.9.100cvs147.patchset
( cvs diff -u -r 1.61.2.42 -r 1.61.2.43 src/account.c; cvs diff -u -r 1.9.2.7 -r 1.9.2.8 src/addressadd.c; cvs diff -u -r 1.60.2.42 -r 1.60.2.43 src/addressbook.c; cvs diff -u -r 1.382.2.220 -r 1.382.2.221 src/compose.c; cvs diff -u -r 1.14.2.13 -r 1.14.2.14 src/editaddress.c; cvs diff -u -r 1.5.12.5 -r 1.5.12.6 src/editbook.c; cvs diff -u -r 1.11.2.9 -r 1.11.2.10 src/editgroup.c; cvs diff -u -r 1.5.12.8 -r 1.5.12.9 src/editjpilot.c; cvs diff -u -r 1.8.2.10 -r 1.8.2.11 src/editldap.c; cvs diff -u -r 1.5.12.7 -r 1.5.12.8 src/editvcard.c; cvs diff -u -r 1.3.2.14 -r 1.3.2.15 src/exphtmldlg.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/expldifdlg.c; cvs diff -u -r 1.207.2.82 -r 1.207.2.83 src/folderview.c; cvs diff -u -r 1.14.2.14 -r 1.14.2.15 src/grouplistdialog.c; cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/imap_gtk.c; cvs diff -u -r 1.4.12.10 -r 1.4.12.11 src/importmutt.c; cvs diff -u -r 1.1.14.10 -r 1.1.14.11 src/importpine.c; cvs diff -u -r 1.149.2.40 -r 1.149.2.41 src/inc.c; cvs diff -u -r 1.115.2.72 -r 1.115.2.73 src/main.c; cvs diff -u -r 1.274.2.88 -r 1.274.2.89 src/mainwindow.c; cvs diff -u -r 1.3.12.12 -r 1.3.12.13 src/message_search.c; cvs diff -u -r 1.94.2.74 -r 1.94.2.75 src/messageview.c; cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/mh_gtk.c; cvs diff -u -r 1.83.2.57 -r 1.83.2.58 src/mimeview.c; cvs diff -u -r 1.2.2.13 -r 1.2.2.14 src/news_gtk.c; cvs diff -u -r 1.60.2.29 -r 1.60.2.30 src/prefs_actions.c; cvs diff -u -r 1.16.2.16 -r 1.16.2.17 src/prefs_customheader.c; cvs diff -u -r 1.59.2.29 -r 1.59.2.30 src/prefs_filtering.c; cvs diff -u -r 1.43.2.31 -r 1.43.2.32 src/prefs_matcher.c; cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/prefs_template.c; cvs diff -u -r 1.3.2.36 -r 1.3.2.37 src/prefs_themes.c; cvs diff -u -r 1.3.2.17 -r 1.3.2.18 src/ssl_manager.c; cvs diff -u -r 1.15.2.19 -r 1.15.2.20 src/summary_search.c; cvs diff -u -r 1.395.2.155 -r 1.395.2.156 src/summaryview.c; cvs diff -u -r 1.96.2.89 -r 1.96.2.90 src/textview.c; cvs diff -u -r 1.43.2.36 -r 1.43.2.37 src/toolbar.c; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/foldersort.c; cvs diff -u -r 1.9.2.34 -r 1.9.2.35 src/gtk/gtkaspell.c; cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/gtk/inputdialog.c; cvs diff -u -r 1.12.2.24 -r 1.12.2.25 src/gtk/prefswindow.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/select-keys.c; cvs diff -u -r 1.14.2.31 -r 1.14.2.32 src/plugins/trayicon/trayicon.c; ) > 1.9.100cvs148.patchset
( cvs diff -u -r 1.61.2.43 -r 1.61.2.44 src/account.c; cvs diff -u -r 1.60.2.43 -r 1.60.2.44 src/addressbook.c; cvs diff -u -r 1.382.2.221 -r 1.382.2.222 src/compose.c; cvs diff -u -r 1.207.2.83 -r 1.207.2.84 src/folderview.c; cvs diff -u -r 1.1.2.27 -r 1.1.2.28 src/imap_gtk.c; cvs diff -u -r 1.274.2.89 -r 1.274.2.90 src/mainwindow.c; cvs diff -u -r 1.2.2.17 -r 1.2.2.18 src/mh_gtk.c; cvs diff -u -r 1.2.2.14 -r 1.2.2.15 src/news_gtk.c; cvs diff -u -r 1.60.2.30 -r 1.60.2.31 src/prefs_actions.c; cvs diff -u -r 1.16.2.17 -r 1.16.2.18 src/prefs_customheader.c; cvs diff -u -r 1.59.2.30 -r 1.59.2.31 src/prefs_filtering.c; cvs diff -u -r 1.43.2.32 -r 1.43.2.33 src/prefs_matcher.c; cvs diff -u -r 1.12.2.21 -r 1.12.2.22 src/prefs_template.c; cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/ssl_manager.c; cvs diff -u -r 1.395.2.156 -r 1.395.2.157 src/summaryview.c; cvs diff -u -r 1.96.2.90 -r 1.96.2.91 src/textview.c; cvs diff -u -r 1.43.2.37 -r 1.43.2.38 src/toolbar.c; ) > 1.9.100cvs149.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=100
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=148
EXTRA_VERSION=149
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

2
src/account.c
View file

@ -977,7 +977,7 @@ static void account_delete(GtkWidget *widget, gpointer data)
ac_prefs->account_name ? ac_prefs->account_name :
_("(Untitled)"));
if (alertpanel_full(_("Delete account"), buf,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT) != G_ALERTALTERNATE)
return;

7
src/addressbook.c
View file

@ -1197,7 +1197,7 @@ static void addressbook_del_clicked(GtkButton *button, gpointer data)
/* Confirm deletion */
aval = alertpanel( _("Delete address(es)"),
_("Really delete the address(es)?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL );
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL );
if( aval != G_ALERTALTERNATE ) return;
/* Process deletions */
@ -2530,7 +2530,7 @@ static void addressbook_treenode_delete_cb(
"results and addresses in '%s' ?" ),
obj->name );
aval = alertpanel( _("Delete"), message,
GTK_STOCK_NO, GTK_STOCK_YES, NULL );
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL );
g_free(message);
if( aval == G_ALERTALTERNATE ) {
delType = ADDRTREE_DEL_FOLDER_ADDR;
@ -2555,7 +2555,8 @@ static void addressbook_treenode_delete_cb(
}
else {
message = g_strdup_printf(_("Really delete '%s' ?"), obj->name);
aval = alertpanel(_("Delete"), message, GTK_STOCK_NO, GTK_STOCK_YES, NULL);
aval = alertpanel(_("Delete"), message, GTK_STOCK_CANCEL,
GTK_STOCK_DELETE, NULL);
g_free(message);
if( aval == G_ALERTALTERNATE ) delType = ADDRTREE_DEL_DATA;
}

8
src/compose.c
View file

@ -3674,7 +3674,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default CC address. Send anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
GTK_STOCK_CANCEL, _("_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -3702,7 +3702,7 @@ static gboolean compose_check_for_set_recipients(Compose *compose)
AlertValue aval;
aval = alertpanel(_("Send"),
_("The only recipient is the default BCC address. Send anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
GTK_STOCK_CANCEL, _("_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -3729,7 +3729,7 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
aval = alertpanel(_("Send"),
_("Subject is empty. Send it anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
GTK_STOCK_CANCEL, _("_Send"), NULL);
if (aval != G_ALERTALTERNATE)
return FALSE;
}
@ -4124,7 +4124,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
msg = g_strdup_printf(_("Can't convert the character encoding of the message \n"
"to the specified %s charset.\n"
"Send it as %s?"), out_codeset, src_codeset);
aval = alertpanel_full(_("Error"), msg, GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
aval = alertpanel_full(_("Error"), msg, GTK_STOCK_CANCEL, _("_Send"), NULL, FALSE,
NULL, ALERT_ERROR, G_ALERTDEFAULT);
g_free(msg);

2
src/folderview.c
View file

@ -2053,7 +2053,7 @@ static void folderview_empty_trash_cb(FolderView *folderview, guint action,
if (prefs_common.ask_on_clean) {
if (alertpanel(_("Empty trash"),
_("Delete all messages in trash?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, _("_Empty trash"), NULL) != G_ALERTALTERNATE)
return;
}

2
src/imap_gtk.c
View file

@ -266,7 +266,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;

4
src/mainwindow.c
View file

@ -1720,7 +1720,7 @@ void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
if (confirm) {
if (alertpanel(_("Empty trash"),
_("Delete all messages in trash folders?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL)
GTK_STOCK_CANCEL, _("_Empty trash"), NULL)
!= G_ALERTALTERNATE)
return;
manage_window_focus_in(mainwin->window, NULL, NULL);
@ -2694,7 +2694,7 @@ static void mainwindow_check_synchronise(MainWindow *mainwin, gboolean ask)
if (offline_ask_sync && ask && alertpanel(_("Folder synchronisation"),
_("Do you want to synchronise your folders now?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, _("_Synchronise"), NULL) != G_ALERTALTERNATE)
return;
folder_synchronise(NULL);

2
src/mh_gtk.c
View file

@ -177,7 +177,7 @@ static void delete_folder_cb(FolderView *folderview, guint action,
"Recovery will not be possible.\n\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(message);
if (avalue != G_ALERTALTERNATE) return;

2
src/news_gtk.c
View file

@ -200,7 +200,7 @@ static void unsubscribe_newsgroup_cb(FolderView *folderview, guint action,
name = trim_string(item->path, 32);
message = g_strdup_printf(_("Really unsubscribe newsgroup '%s'?"), name);
avalue = alertpanel_full(_("Unsubscribe newsgroup"), message,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, _("_Unsubscribe"), NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(message);
g_free(name);

10
src/prefs_actions.c
View file

@ -612,7 +612,7 @@ static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
if (alertpanel(_("Delete action"),
_("Do you really want to delete this action?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
return;
/* XXX: Here's the reason why we need to store the original
@ -730,8 +730,8 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
{
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES,
NULL) != G_ALERTALTERNATE) {
GTK_STOCK_CLOSE, _("_Continue editing"),
NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;
@ -750,8 +750,8 @@ static void prefs_actions_ok(GtkWidget *widget, gpointer data)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES,
NULL) != G_ALERTALTERNATE) {
GTK_STOCK_CLOSE, _("_Continue editing"),
NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;

2
src/prefs_customheader.c
View file

@ -544,7 +544,7 @@ static void prefs_custom_header_delete_cb(void)
if (alertpanel(_("Delete header"),
_("Do you really want to delete this header?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL) != G_ALERTALTERNATE)
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) != G_ALERTALTERNATE)
return;
gtk_tree_model_get(model, &sel,

10
src/prefs_filtering.c
View file

@ -920,7 +920,7 @@ static void prefs_filtering_delete_cb(void)
if (alertpanel(_("Delete rule"),
_("Do you really want to delete this rule?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL) == G_ALERTDEFAULT)
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL) == G_ALERTDEFAULT)
return;
model = gtk_tree_view_get_model(list_view);
@ -1080,8 +1080,8 @@ static void prefs_filtering_ok(void)
if (!filtering_str) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
if (G_ALERTALTERNATE != val) {
GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
if (G_ALERTDEFAULT != val) {
g_free(filtering_str);
g_free(str); /* fixed two leaks: huzzah! */
filteringprop_free(prop);
@ -1102,8 +1102,8 @@ static void prefs_filtering_ok(void)
strlen(action)) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
if (G_ALERTALTERNATE != val) {
GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
if (G_ALERTDEFAULT != val) {
g_free(name);
g_free(condition);
g_free(action);

6
src/prefs_matcher.c
View file

@ -1634,9 +1634,9 @@ static void prefs_matcher_ok(void)
if (!matcher_str || strcmp(matcher_str, str) != 0) {
val = alertpanel(_("Entry not saved"),
_("The entry was not saved.\nHave you really finished?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
if (G_ALERTALTERNATE != val) {
_("The entry was not saved.\nClose anyway?"),
GTK_STOCK_CLOSE, _("_Continue editing"), NULL);
if (G_ALERTDEFAULT != val) {
g_free(matcher_str);
g_free(str);
return;

10
src/prefs_template.c
View file

@ -397,8 +397,8 @@ static void prefs_template_ok_cb(void)
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES,
NULL) != G_ALERTALTERNATE) {
GTK_STOCK_CLOSE, _("_Continue editing"),
NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;
@ -414,8 +414,8 @@ static void prefs_template_cancel_cb(void)
{
if (modified && alertpanel(_("Entry not saved"),
_("The entry was not saved. Close anyway?"),
GTK_STOCK_NO, GTK_STOCK_YES,
NULL) != G_ALERTALTERNATE) {
GTK_STOCK_CLOSE, _("_Continue editing"),
NULL) != G_ALERTDEFAULT) {
return;
}
modified = FALSE;
@ -605,7 +605,7 @@ static void prefs_template_delete_cb(void)
if (alertpanel(_("Delete template"),
_("Do you really want to delete this template?"),
GTK_STOCK_NO, GTK_STOCK_YES,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE,
NULL) != G_ALERTALTERNATE)
return;

2
src/ssl_manager.c
View file

@ -373,7 +373,7 @@ static void ssl_manager_delete_cb(GtkWidget *widget,
val = alertpanel_full(_("Delete certificate"),
_("Do you really want to delete this certificate?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);

4
src/summaryview.c
View file

@ -848,7 +848,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
gboolean changed = FALSE;
val = alertpanel(_("Process mark"),
_("Some marks are left. Process it?"),
_("Some marks are left. Process them?"),
GTK_STOCK_NO, GTK_STOCK_YES, GTK_STOCK_CANCEL);
if (G_ALERTALTERNATE == val) {
summary_unlock(summaryview);
@ -3277,7 +3277,7 @@ void summary_delete(SummaryView *summaryview)
aval = alertpanel(_("Delete message(s)"),
_("Do you really want to delete selected message(s)?"),
GTK_STOCK_NO, GTK_STOCK_YES, NULL);
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL);
if (aval != G_ALERTALTERNATE) return;
for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL;

2
src/textview.c
View file

@ -2036,7 +2036,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
"Open it anyway?"),
uri->uri, visible_str);
aval = alertpanel_full(_("Fake URL warning"), msg,
GTK_STOCK_NO, GTK_STOCK_YES, NULL, FALSE,
GTK_STOCK_CANCEL, _("_Open URL"), NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
g_free(msg);
if (aval == G_ALERTALTERNATE)

2
src/toolbar.c
View file

@ -1991,7 +1991,7 @@ void send_queue_cb(gpointer data, guint action, GtkWidget *widget)
if (found && !prefs_common.work_offline) {
if (alertpanel(_("Send queued messages"),
_("Send all queued messages?"),
GTK_STOCK_NO, GTK_STOCK_YES,
GTK_STOCK_CANCEL, _("_Send"),
NULL) != G_ALERTALTERNATE)
return;
}