diff --git a/checkin_notes b/checkin_notes index 024aee4553..b6c759eae8 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1309,3 +1309,13 @@ Charlie 3 Mar 2011 project.pbxproj win_build/ boincmgr.vcproj + +Rom 3 Mar 2011 + - MGR: Change the reminder frequency interval to hours and adjust the min/max + values to 0/24. Default value is now 6 hours between notification reminders. + + clientgui/ + BOINCBaseFrame.cpp + BOINCDialupManager.cpp + BOINCTaskBar.cpp + DlgOptions.cpp diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp index 4baa9cbc8f..b331c9163f 100644 --- a/clientgui/BOINCBaseFrame.cpp +++ b/clientgui/BOINCBaseFrame.cpp @@ -772,7 +772,7 @@ bool CBOINCBaseFrame::SaveState() { pConfig->SetPath(strBaseConfigLocation); pConfig->Write(wxT("Language"), m_iSelectedLanguage); - pConfig->Write(wxT("ReminderFrequencyV2"), m_iReminderFrequency); + pConfig->Write(wxT("ReminderFrequencyV3"), m_iReminderFrequency); pConfig->Write(wxT("NetworkDialupConnectionName"), m_strNetworkDialupConnectionName); @@ -829,7 +829,7 @@ bool CBOINCBaseFrame::RestoreState() { pConfig->SetPath(strBaseConfigLocation); pConfig->Read(wxT("Language"), &m_iSelectedLanguage, 0L); - pConfig->Read(wxT("ReminderFrequencyV2"), &m_iReminderFrequency, 60L); + pConfig->Read(wxT("ReminderFrequencyV3"), &m_iReminderFrequency, 6L); pConfig->Read(wxT("NetworkDialupConnectionName"), &m_strNetworkDialupConnectionName, wxEmptyString); diff --git a/clientgui/BOINCDialupManager.cpp b/clientgui/BOINCDialupManager.cpp index 3a81d4d10f..13ccbc4216 100644 --- a/clientgui/BOINCDialupManager.cpp +++ b/clientgui/BOINCDialupManager.cpp @@ -226,7 +226,7 @@ int CBOINCDialUpManager::Connect() { tsLastDialupRequest = wxDateTime::Now() - m_dtLastDialupRequest; - if ((tsLastDialupRequest.GetMinutes() >= pFrame->GetReminderFrequency()) && (pFrame->GetReminderFrequency() != 0)) { + if ((tsLastDialupRequest.GetMinutes() >= (pFrame->GetReminderFrequency() * 60)) && (pFrame->GetReminderFrequency() != 0)) { wxLogTrace(wxT("Function Status"), wxT("CBOINCDialUpManager::Connect - Begin connection process")); m_dtLastDialupRequest = wxDateTime::Now(); diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 10fa9af52b..5732b2031f 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -740,7 +740,7 @@ void CTaskBarIcon::UpdateNoticeStatus() { // Repeat notification for unread notices at user-selected reminder frequency wxTimeSpan tsLastNotificationDisplayed = wxDateTime::Now() - m_dtLastNotificationAlertExecuted; if ( - (tsLastNotificationDisplayed.GetMinutes() >= pFrame->GetReminderFrequency()) + (tsLastNotificationDisplayed.GetMinutes() >= (pFrame->GetReminderFrequency() * 60)) && (pFrame->GetReminderFrequency() != 0) ) { diff --git a/clientgui/DlgOptions.cpp b/clientgui/DlgOptions.cpp index 141bd63368..2ced25bed0 100644 --- a/clientgui/DlgOptions.cpp +++ b/clientgui/DlgOptions.cpp @@ -165,11 +165,11 @@ void CDlgOptions::CreateControls() itemFlexGridSizer6->Add(m_LanguageSelectionCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5); wxStaticText* itemStaticText9 = new wxStaticText; - itemStaticText9->Create( itemPanel4, wxID_STATIC, _("Notice reminder interval:\n(minutes; 0 means no reminders)"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + itemStaticText9->Create( itemPanel4, wxID_STATIC, _("Notice reminder interval:\n(hours; 0 means no reminders)"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); itemFlexGridSizer6->Add(itemStaticText9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5); m_ReminderFrequencyCtrl = new wxSlider; - m_ReminderFrequencyCtrl->Create( itemPanel4, ID_REMINDERFREQUENCY, 60, 0, 120, wxDefaultPosition, + m_ReminderFrequencyCtrl->Create( itemPanel4, ID_REMINDERFREQUENCY, 6, 0, 24, wxDefaultPosition, #if defined(__WXMSW__) || defined(__WXMAC__) wxDefaultSize, #else