Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Disable new "Resume" items in system tray menu if modal dialog is open 

svn path=/trunk/boinc/; revision=25164
This commit is contained in:
Charlie Fenton 2012-01-27 22:39:20 +00:00
parent 6441ddf4d0
commit 960f27cb2b
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -1074,7 +1074,7 @@ Charlie 26 Jan 2012
HowToBuildBOINC_XCode.rtf HowToBuildBOINC_XCode.rtf
Charlie 27 Jan 2012 Charlie 27 Jan 2012
- MGR: If CPU or GPU is suspended from Activity Menu, change "Snooze" item - MGR: If CPU or GPU is suspended from Activity Menu, change "Snooze" items
to "Resume" in system tray menu. to "Resume" in system tray menu.
- client: Always remember previous CPU and GPU activity settings. - client: Always remember previous CPU and GPU activity settings.
@ -1105,3 +1105,9 @@ David 27 Jan 2012
clientgui/ clientgui/
BOINCBaseView.cpp BOINCBaseView.cpp
BOINCTaskCtrl.cpp BOINCTaskCtrl.cpp
Charlie 27 Jan 2012
- MGR: Disable new "Resume" items in system tray menu if modal dialog is open.
clientgui/
BOINCTaskBar.cpp

4
clientgui/BOINCTaskBar.cpp
View File

@ -592,7 +592,9 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
case RUN_MODE_NEVER: case RUN_MODE_NEVER:
m_SnoozeMenuItem->SetItemLabel(_("Resume")); m_SnoozeMenuItem->SetItemLabel(_("Resume"));
m_SnoozeMenuItem->Check(false); m_SnoozeMenuItem->Check(false);
if (!is_dialog_detected) {
m_SnoozeMenuItem->Enable(true); m_SnoozeMenuItem->Enable(true);
}
break; break;
default: default:
m_SnoozeMenuItem->SetItemLabel(_("Snooze")); m_SnoozeMenuItem->SetItemLabel(_("Snooze"));
@ -617,7 +619,9 @@ void CTaskBarIcon::AdjustMenuItems(wxMenu* pMenu) {
case RUN_MODE_NEVER: case RUN_MODE_NEVER:
m_SnoozeGPUMenuItem->SetItemLabel(_("Resume GPU")); m_SnoozeGPUMenuItem->SetItemLabel(_("Resume GPU"));
m_SnoozeGPUMenuItem->Check(false); m_SnoozeGPUMenuItem->Check(false);
if (!is_dialog_detected) {
m_SnoozeGPUMenuItem->Enable(true); m_SnoozeGPUMenuItem->Enable(true);
}
break; break;
default: default:
m_SnoozeGPUMenuItem->SetItemLabel(_("Snooze GPU")); m_SnoozeGPUMenuItem->SetItemLabel(_("Snooze GPU"));