[haiku-commits] haiku: hrev53494 - src/apps/mail

  • From: waddlesplash <waddlesplash@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 17 Sep 2019 23:33:31 -0400 (EDT)

hrev53494 adds 1 changeset to branch 'master'
old head: 0227e84378aa990d72b38f813de0b558a3d273c5
new head: 66d438d128c213c8d7988eee14a8d778fbf148df
overview: 
https://git.haiku-os.org/haiku/log/?qt=range&q=66d438d128c2+%5E0227e84378aa

----------------------------------------------------------------------------

66d438d128c2: Mail: change keyboard shortcuts / labels
  
  1) People normally don't change their email account and Mail settings
     often after the initial setup and short tweaking period. Using
     keyboard shortcuts on those menu items is wasteful. Let's remove
     them.
  
  2) OTOH, I need to in/decrease the quoting level rather often (Mail
     could probably be more intelligent here, too...).
     Also, the current shortcuts for this ALT+' and ALT+SHIFT+' are awkward
     and in some keymaps (German, for example) unreachable.
     With the change in 1), ALT +/- becomes available, which is easily
     reched with many keymaps AFAIK, and the numpad.
  
  3) Rename the menu items "Quote" and "Remove quote" to
     "Increase quote level" and "Decrease quote level", which is much
     more correct. Also ties n nicely with the +/- shortcuts.
  
  4) Rename the BMessage constants for consistency.
  
  Change-Id: I2da21ed3aa465c30d09b2520288b64dea70feeec
  Reviewed-on: https://review.haiku-os.org/c/haiku/+/1868
  Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>

                                        [ Humdinger <humdingerb@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev53494
Commit:      66d438d128c213c8d7988eee14a8d778fbf148df
URL:         https://git.haiku-os.org/haiku/commit/?id=66d438d128c2
Author:      Humdinger <humdingerb@xxxxxxxxx>
Date:        Tue Sep 17 15:54:37 2019 UTC
Committer:   waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Sep 18 03:33:26 2019 UTC

----------------------------------------------------------------------------

3 files changed, 12 insertions(+), 12 deletions(-)
src/apps/mail/Content.cpp    |  4 ++--
src/apps/mail/MailWindow.cpp | 16 ++++++++--------
src/apps/mail/Messages.h     |  4 ++--

----------------------------------------------------------------------------

diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index e174f74185..d990e2eb77 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -693,14 +693,14 @@ TContentView::MessageReceived(BMessage *msg)
                        break;
                }
 
-               case M_QUOTE:
+               case M_ADD_QUOTE_LEVEL:
                {
                        int32 start, finish;
                        fTextView->GetSelection(&start, &finish);
                        fTextView->AddQuote(start, finish);
                        break;
                }
-               case M_REMOVE_QUOTE:
+               case M_SUB_QUOTE_LEVEL:
                {
                        int32 start, finish;
                        fTextView->GetSelection(&start, &finish);
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index c41c5087e7..584dc455af 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -366,11 +366,11 @@ TMailWindow::TMailWindow(BRect rect, const char* title, 
TMailApp* app,
                new BMessage(M_FIND_AGAIN), 'G'));
        if (!fIncoming) {
                menu->AddSeparatorItem();
-               fQuote = new BMenuItem(B_TRANSLATE("Quote"),
-                       new BMessage(M_QUOTE), '\'');
+               fQuote = new BMenuItem(B_TRANSLATE("Increase quote level"),
+                       new BMessage(M_ADD_QUOTE_LEVEL), '+');
                menu->AddItem(fQuote);
-               fRemoveQuote = new BMenuItem(B_TRANSLATE("Remove quote"),
-                       new BMessage(M_REMOVE_QUOTE), '\'', B_SHIFT_KEY);
+               fRemoveQuote = new BMenuItem(B_TRANSLATE("Decrease quote 
level"),
+                       new BMessage(M_SUB_QUOTE_LEVEL), '-');
                menu->AddItem(fRemoveQuote);
 
                menu->AddSeparatorItem();
@@ -383,12 +383,12 @@ TMailWindow::TMailWindow(BRect rect, const char* title, 
TMailApp* app,
        menu->AddSeparatorItem();
        menu->AddItem(item = new BMenuItem(
                B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
-               new BMessage(M_PREFS),','));
+               new BMessage(M_PREFS)));
        item->SetTarget(be_app);
        fMenuBar->AddItem(menu);
        menu->AddItem(item = new BMenuItem(
                B_TRANSLATE("Accounts" B_UTF8_ELLIPSIS),
-               new BMessage(M_ACCOUNTS),'-'));
+               new BMessage(M_ACCOUNTS)));
        item->SetTarget(be_app);
 
        // View Menu
@@ -1462,8 +1462,8 @@ TMailWindow::MessageReceived(BMessage* msg)
                        FindWindow::FindAgain(this);
                        break;
 
-               case M_QUOTE:
-               case M_REMOVE_QUOTE:
+               case M_ADD_QUOTE_LEVEL:
+               case M_SUB_QUOTE_LEVEL:
                        PostMessage(msg->what, fContentView);
                        break;
 
diff --git a/src/apps/mail/Messages.h b/src/apps/mail/Messages.h
index bd986055ec..ad2d9c9170 100644
--- a/src/apps/mail/Messages.h
+++ b/src/apps/mail/Messages.h
@@ -90,8 +90,8 @@ enum MENUS {
 
        // edit
        M_SELECT,
-       M_QUOTE,
-       M_REMOVE_QUOTE,
+       M_ADD_QUOTE_LEVEL,
+       M_SUB_QUOTE_LEVEL,
        M_CHECK_SPELLING,
        M_SIGNATURE,
        M_RANDOM_SIG,


Other related posts:

  • » [haiku-commits] haiku: hrev53494 - src/apps/mail - waddlesplash