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

*** empty log message *** 

svn path=/trunk/boinc/; revision=10596
This commit is contained in:
Rom Walton 2006-07-07 18:22:31 +00:00
parent dc57c257c1
commit 56feddacd0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
checkin_notes
View File

@ -7333,3 +7333,10 @@ David 6 July 2006
html/inc/ html/inc/
prefs.inc prefs.inc
Rom 7 July 2006
- Only display the suspended icon in the taskbar if the activity runmode
is set to never.
clientgui/
BOINCTaskBar.cpp

7
clientgui/BOINCTaskBar.cpp
View File

@ -125,8 +125,7 @@ void CTaskBarIcon::OnRefresh(wxTimerEvent& event) {
wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnRefresh - Function Begin")); wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnRefresh - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument(); CMainDocument* pDoc = wxGetApp().GetDocument();
bool bActivitiesSuspended = false; wxInt32 iActivityMode = -1;
bool bNetworkSuspended = false;
wxASSERT(pDoc); wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument)); wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@ -145,14 +144,14 @@ void CTaskBarIcon::OnRefresh(wxTimerEvent& event) {
// What is the current status of the client? // What is the current status of the client?
pDoc->GetActivityState(bActivitiesSuspended, bNetworkSuspended); pDoc->GetActivityRunMode(iActivityMode);
// Which icon should be displayed? // Which icon should be displayed?
if (!pDoc->IsConnected()) { if (!pDoc->IsConnected()) {
SetIcon(m_iconTaskBarDisconnected, m_strDefaultTitle); SetIcon(m_iconTaskBarDisconnected, m_strDefaultTitle);
} else { } else {
if (bActivitiesSuspended) { if (RUN_MODE_NEVER == iActivityMode) {
SetIcon(m_iconTaskBarSnooze, m_strDefaultTitle); SetIcon(m_iconTaskBarSnooze, m_strDefaultTitle);
} else { } else {
SetIcon(m_iconTaskBarNormal, m_strDefaultTitle); SetIcon(m_iconTaskBarNormal, m_strDefaultTitle);

6
clientgui/MainDocument.cpp
View File

@ -482,7 +482,7 @@ int CMainDocument::GetActivityRunMode(int& iMode) {
if (IsConnected()) { if (IsConnected()) {
wxTimeSpan ts(wxDateTime::Now() - m_dtCachedActivityRunModeTimestamp); wxTimeSpan ts(wxDateTime::Now() - m_dtCachedActivityRunModeTimestamp);
if (ts.GetSeconds() > 10) { if (ts.GetSeconds() > 2) {
m_dtCachedActivityRunModeTimestamp = wxDateTime::Now(); m_dtCachedActivityRunModeTimestamp = wxDateTime::Now();
iRetVal = rpc.get_run_mode(iMode); iRetVal = rpc.get_run_mode(iMode);
@ -520,7 +520,7 @@ int CMainDocument::GetNetworkRunMode(int& iMode) {
if (IsConnected()) { if (IsConnected()) {
wxTimeSpan ts(wxDateTime::Now() - m_dtCachedNetworkRunModeTimestamp); wxTimeSpan ts(wxDateTime::Now() - m_dtCachedNetworkRunModeTimestamp);
if (ts.GetSeconds() > 10) { if (ts.GetSeconds() > 2) {
m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now(); m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now();
iRetVal = rpc.get_network_mode(iMode); iRetVal = rpc.get_network_mode(iMode);
@ -557,7 +557,7 @@ int CMainDocument::GetActivityState(bool& bActivitiesSuspended, bool& bNetworkSu
int iRetVal = 0; int iRetVal = 0;
wxTimeSpan ts(wxDateTime::Now() - m_dtCachedActivityStateTimestamp); wxTimeSpan ts(wxDateTime::Now() - m_dtCachedActivityStateTimestamp);
if (ts.GetSeconds() > 10) { if (ts.GetSeconds() > 2) {
m_dtCachedActivityStateTimestamp = wxDateTime::Now(); m_dtCachedActivityStateTimestamp = wxDateTime::Now();
if (IsConnected()) { if (IsConnected()) {