From 3e26627b55d4524371b0aaeae0279b822b948bd3 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Fri, 5 Feb 2010 22:29:06 +0000
Subject: [PATCH]     - MGR: Change the 'Open BOINC Manager' menu item ID for
 the task bar icon.  wxID_OPEN         causes a folder icon to be prepended to
 the menu item on Linux.     - MGR: Enable the Test Notification menu item on
 Linux

    clientgui/
        BOINCTaskBar.cpp, .h

svn path=/trunk/boinc/; revision=20452
---
 checkin_notes              |  9 +++++++++
 clientgui/BOINCTaskBar.cpp |  8 +++-----
 clientgui/Events.h         | 10 +++++-----
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 044e7eed1d..9afb9e2c02 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -956,3 +956,12 @@ Rom    5 Feb 2010
         BOINCTaskBar.cpp, .h
     clientgui/msw/
         taskbarex.cpp, .h
+
+Rom    5 Feb 2010
+    - MGR: Change the 'Open BOINC Manager' menu item ID for the task bar icon.  wxID_OPEN
+        causes a folder icon to be prepended to the menu item on Linux.
+    - MGR: Enable the Test Notification menu item on Linux
+        
+    clientgui/
+        BOINCTaskBar.cpp, .h
+ 
\ No newline at end of file
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index defc7dc86b..a7558903e1 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -54,7 +54,7 @@ BEGIN_EVENT_TABLE(CTaskBarIcon, wxTaskBarIconEx)
     EVT_TASKBAR_RIGHT_DOWN(CTaskBarIcon::OnRButtonDown)
     EVT_TASKBAR_RIGHT_UP(CTaskBarIcon::OnRButtonUp)
     EVT_TASKBAR_MOVE(CTaskBarIcon::OnMouseMove)
-    EVT_MENU(wxID_OPEN, CTaskBarIcon::OnOpen)
+    EVT_MENU(ID_OPENBOINCMANAGER, CTaskBarIcon::OnOpen)
     EVT_MENU(ID_OPENWEBSITE, CTaskBarIcon::OnOpenWebsite)
     EVT_MENU(ID_TB_SUSPEND, CTaskBarIcon::OnSuspendResume)
     EVT_MENU(ID_TB_SUSPEND_GPU, CTaskBarIcon::OnSuspendResumeGPU)
@@ -611,7 +611,7 @@ wxMenu *CTaskBarIcon::BuildContextMenu() {
         _("Open %s..."),
         pSkinAdvanced->GetApplicationName().c_str()
     );
-    pMenu->Append(wxID_OPEN, menuName, wxEmptyString);
+    pMenu->Append(ID_OPENBOINCMANAGER, menuName, wxEmptyString);
 
     pMenu->AppendSeparator();
 
@@ -622,12 +622,10 @@ wxMenu *CTaskBarIcon::BuildContextMenu() {
 
     pMenu->AppendSeparator();
 
-#ifdef _DEBUG
-
     pMenu->Append(ID_TB_TEST_NOTIFICATION, _("Test Notification"), wxEmptyString);
+
     pMenu->AppendSeparator();
 
-#endif
 
     menuName.Printf(
         _("&About %s..."),
diff --git a/clientgui/Events.h b/clientgui/Events.h
index 7235026ee6..047160f570 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -23,11 +23,11 @@
 #define ID_CLOSEWINDOW                          6100
 #define ID_CHANGEGUI                            6101
 #define ID_OPENWEBSITE                          6102
-#define ID_PERIODICRPCTIMER                     6103
-#define ID_DOCUMENTPOLLTIMER                    6104
-#define ID_ALERTPOLLTIMER                       6105
-#define ID_REFRESHSTATETIMER                    6106
-//#define ID_REFRESHTIMER                         6107
+#define ID_OPENBOINCMANAGER                     6103
+#define ID_PERIODICRPCTIMER                     6104
+#define ID_DOCUMENTPOLLTIMER                    6105
+#define ID_ALERTPOLLTIMER                       6106
+#define ID_REFRESHSTATETIMER                    6107
 #define ID_WIZARDATTACH                         6108
 #define ID_WIZARDUPDATE                         6109
 #define ID_WIZARDDETACH                         6110