From 58013b53d0825331b4e4dd86d5b040b423b11bed Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Sep 2010 11:31:56 -0400 Subject: Reorganize composer preferences Move alert checkboxes to a new "Confirmations" tab and reword the options. Also, split reply and forward-related options into a new "Replies and Forwards" section. --- mail/mail-config.ui | 869 ++++++++++++++++++++++++---------------------------- 1 file changed, 392 insertions(+), 477 deletions(-) diff --git a/mail/mail-config.ui b/mail/mail-config.ui index ee700e260a..93cecf03ae 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -1,7 +1,6 @@ - 1.5 @@ -1442,35 +1441,6 @@ For example: "Work" or "Personal" - - - True - True - True - Select Sent Folder - - - 1 - 2 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - True - Select Drafts Folder - - - 1 - 2 - GTK_FILL - - _Trash Folder: @@ -1487,22 +1457,6 @@ For example: "Work" or "Personal" - - - True - True - True - Select Trash Folder - - - 1 - 2 - 2 - 3 - GTK_FILL - GTK_FILL - - _Junk Folder: @@ -1519,22 +1473,6 @@ For example: "Work" or "Personal" - - - True - True - True - Select Junk Folder - - - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - True @@ -1560,6 +1498,18 @@ For example: "Work" or "Personal" + + + + + + + + + + + + @@ -3710,455 +3660,282 @@ For example: "Work" or "Personal" True 12 - + True - 6 - 2 + vertical + 8 - + + Format messages in _HTML True - vertical - 8 + True + False + True + True + + + False + False + 0 + + + + + Automatically insert _emoticon images + True + True + False + True + True + + + False + False + 1 + + + + + Always request rea_d receipt + True + True + False + True + True + + + False + False + 2 + + + + + Encode file names in an Outlook/GMail way + True + True + False + True + True + + + False + False + 3 + + + + + True + 6 - - Format messages in _HTML + True - True - False + 1 + C_haracter set: True - True + center False - False 0 - - Automatically insert _emoticon images - True - True - False - True - True - - - False - False - 1 - + + + + 4 + + + + + + + 1 + + + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0 + Replies and Forwards + + + + + + 0 + + + + + True + 12 + + + True + 6 + 2 + 6 + 6 + + + True + 1 + _Reply style: + True + + + GTK_FILL + + + + + + True + 1 + _Forward style: + True + + + 1 + 2 + GTK_FILL + + + + + + Start _typing at the bottom on replying + True + True + False + True + True + + + 2 + 2 + 3 + + + + + + _Keep signature above the original message on replying + True + True + False + True + True + + + 2 + 3 + 4 + + + + + + Ignore Reply-To: for mailing lists + True + True + False + True + True + + + 2 + 4 + 5 + + + + + + Group Reply goes only to mailing list, if possible + True + True + False + True + True + + + 2 + 5 + 6 + + + + + + True + 0 + 0 - - Always request rea_d receipt + True - True - False - True - True - - - False - False - 2 - - - - - Start _typing at the bottom on replying - True - True - False - True - True - - - False - False - 3 - - - - - Encode file names in an Outlook/GMail way - True - True - False - True - True - - - False - False - 4 - - - - - Ignore Reply-To: for mailing lists - True - True - False - True - True - - - False - False - 5 - - - - - Group Reply goes only to mailing list, if possible - True - True - False - True - True - - - False - False - 6 - - - - - True - 3 - 2 - 12 - 6 - - - True - 0 - _Reply style: - True - - - 1 - 2 - GTK_FILL - - - - - - True - 7.4505801528346183e-09 - 0 - - - True - - - True - model3 - - - - 0 - - - - - 0 - - - - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - + model3 - - True - - - True - model4 - - - - 0 - - - - - False - False - 0 - - - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - 0 - _Forward style: - True - - - GTK_FILL - - - - - - True - 0 - C_haracter set: - True - center - - - 2 - 3 - GTK_FILL - - - - - - True - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - 7 - - - - - True - 2 - - - True - vertical - 8 - - - True - 6 - - - True - 0 - 0.47999998927116394 - Top Posting Option - - - - - - False - False - 0 - - - - - True - 0 - 0.47999998927116394 - (Not Recommended) - - - False - False - 1 - - - - - False - False - 0 - - - - - _Keep Signature above the original message on replying - True - True - False - True - True - - - False - False - 1 - - - - - 0 - + + + 0 + - - 8 - + + 1 + 2 + - - - - - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Alerts - - - - - - False - False - 0 - - - - - True - - - True - 6 - 2 - + True - vertical - 6 - - - _Prompt when sending messages with an empty subject line - True - True - False - True - True - - - False - False - 0 - - - - - Pr_ompt when sending messages with only Bcc recipients defined - True - True - False - True - True - - - False - False - 1 - - - - - Prompt when sending private replies to mailing _list messages - True - True - False - True - True - - - False - False - 2 - - - - - Prompt when sending replies to _many recipients - True - True - False - True - True - - - False - False - 3 - - + 0 + 0 - - Prompt when mailing list redirects private reply back to list + True - True - False - True - True + model4 + + + + 0 + + - - False - False - 4 - + + 1 + 2 + 1 + 2 + + False + False 1 @@ -4506,6 +4283,131 @@ For example: "Work" or "Personal" False + + + True + 12 + vertical + 12 + + + True + 0 + To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions: + True + + + False + False + 0 + + + + + True + 12 + + + True + vertical + 6 + + + Sending a message with an _empty subject line + True + True + False + True + True + + + False + False + 0 + + + + + Sending a message with only _Bcc recipients defined + True + True + False + True + True + + + False + False + 1 + + + + + Sending a _private reply to a mailing list message + True + True + False + True + True + + + False + False + 2 + + + + + Sending a reply to a large _number of recipients + True + True + False + True + True + + + False + False + 3 + + + + + Allowing a _mailing list to redirect a private reply to the list + True + True + False + True + True + + + False + False + 4 + + + + + + + 1 + + + + + 3 + + + + + True + Confirmations + + + 3 + False + + normal @@ -5094,4 +4996,17 @@ for display purposes only. + + + + + + + + + + + + + -- cgit v1.2.3