From 43f2e70fdc8015324e50e9e6dc8a5b6ba28842be Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 5 Mar 2009 23:25:41 +0000 Subject: [PATCH] - MGR: Don't display the Simple GUI 'Remove Project' menu item if it was attached via an account manager. Fixes #261 clientgui/ sg_StatImageLoader.cpp svn path=/trunk/boinc/; revision=17517 --- checkin_notes | 7 +++++++ clientgui/sg_StatImageLoader.cpp | 17 +++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/checkin_notes b/checkin_notes index 2e13c3413c..a1aeca35a9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2784,3 +2784,10 @@ Rom 5 Mar 2009 clientgui/ AdvancedFrame.cpp sg_BoincSimpleGUI.cpp, .h + +Rom 5 Mar 2009 + - MGR: Don't display the Simple GUI 'Remove Project' menu item + if it was attached via an account manager. Fixes #261 + + clientgui/ + sg_StatImageLoader.cpp diff --git a/clientgui/sg_StatImageLoader.cpp b/clientgui/sg_StatImageLoader.cpp index 61199c88af..ea028fb143 100644 --- a/clientgui/sg_StatImageLoader.cpp +++ b/clientgui/sg_StatImageLoader.cpp @@ -144,19 +144,20 @@ void StatImageLoader::AddMenuItems() } // Add the 'remove project' option - statPopUpMenu->AppendSeparator(); - wxMenuItemList menuList = statPopUpMenu->GetMenuItems(); + if (!project->attached_via_acct_mgr) { + statPopUpMenu->AppendSeparator(); + wxMenuItemList menuList = statPopUpMenu->GetMenuItems(); #ifdef __WXMSW__ - menuList[statPopUpMenu->GetMenuItemCount()-1]->SetBackgroundColour(wxColour("RED")); + menuList[statPopUpMenu->GetMenuItemCount()-1]->SetBackgroundColour(wxColour("RED")); #endif - urlItem = new wxMenuItem(statPopUpMenu, WEBSITE_URL_MENU_ID_REMOVE_PROJECT, _("Remove Project")); + urlItem = new wxMenuItem(statPopUpMenu, WEBSITE_URL_MENU_ID_REMOVE_PROJECT, _("Remove Project")); #ifdef __WXMSW__ - urlItem->SetBackgroundColour(*pSkinSimple->GetBackgroundImage()->GetBackgroundColor()); + urlItem->SetBackgroundColour(*pSkinSimple->GetBackgroundImage()->GetBackgroundColor()); #endif - Connect( WEBSITE_URL_MENU_ID_REMOVE_PROJECT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(StatImageLoader::OnMenuLinkClicked) ); - statPopUpMenu->Append(urlItem); - + Connect( WEBSITE_URL_MENU_ID_REMOVE_PROJECT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(StatImageLoader::OnMenuLinkClicked) ); + statPopUpMenu->Append(urlItem); + } }