Ticket #1208: Mail - Query Toolbar Icon.diff

src/apps/mail/Messages.h

@@ -103 +103 @@
     M_ACCOUNTS,
 
     // queries
+    M_SHOW_QUERIES,
     M_EDIT_QUERIES,
     M_EXECUTE_QUERY,
 

src/apps/mail/MailWindow.cpp

@@ -473 +473 @@
     }
 
     // Queries Menu
-
     fQueryMenu = new BMenu(MDR_DIALECT_CHOICE("Queries","???"));
     fMenuBar->AddItem(fQueryMenu);
-
     _RebuildQueryMenu(true);
 
     // Menu Bar
-
     AddChild(fMenuBar);
     height = fMenuBar->Bounds().bottom + 1;
 
@@ -621 +618 @@
     }
     bbar->AddButton(MDR_DIALECT_CHOICE ("Inbox","受信箱"), 36, new BMessage(M_OPEN_MAIL_BOX));
     bbar->AddButton(MDR_DIALECT_CHOICE ("Mail","メール"), 32, new BMessage(M_OPEN_MAIL_FOLDER));
+    bbar->AddButton(MDR_DIALECT_CHOICE ("Queries","???"), 32, new BMessage(M_SHOW_QUERIES));
 
     bbar->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
     bbar->Hide();
@@ -1497 +1495 @@
                 fContentView->fTextView->EnableSpellCheck(fSpelling->IsMarked());
             }
             break;
+            
+        case M_SHOW_QUERIES:
+        {
+            if (!fQueryMenu)
+                break;
 
+            uint32 buttons = B_SECONDARY_MOUSE_BUTTON;
+            if (msg->FindInt32("buttons", (int32 *)&buttons) != B_OK
+                || buttons != B_PRIMARY_MOUSE_BUTTON)
+                break;
+
+            int count = fQueryMenu->CountItems();
+            if (count == 0) {
+                PostMessage(M_EDIT_QUERIES);
+                break;
+            }
+            
+            BPopUpMenu menu("Queries", false, false);
+            while (fQueryMenu->CountItems() > 0) {
+                BMenuItem * item = fQueryMenu->ItemAt(0);
+                fQueryMenu->RemoveItems(0, 1, false);
+                menu.AddItem(item);
+            }
+
+            BPoint where;
+            msg->FindPoint("where", &where);
+
+            BMenuItem *item = menu.Go(where, false, true, false);
+            if (item != NULL)
+                PostMessage(item->Message());
+
+            while (menu.CountItems() > 0) {
+                BMenuItem * item = menu.ItemAt(0);
+                menu.RemoveItems(0, 1, false);
+                fQueryMenu->AddItem(item);
+            }
+            break;
+        }
+
         case M_EDIT_QUERIES:
         {
             BPath path;
@@ -2934 +2970 @@
         BMenuItem* item = fQueryMenu->RemoveItem((int32)0);
         delete item;
     }
-
+    
     fQueryMenu->AddItem(new BMenuItem(MDR_DIALECT_CHOICE("Edit Queries" B_UTF8_ELLIPSIS,"???" B_UTF8_ELLIPSIS),
         new BMessage(M_EDIT_QUERIES), 'E', B_SHIFT_KEY));