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

*** empty log message *** 

svn path=/trunk/boinc/; revision=9499
This commit is contained in:
Rom Walton 2006-02-17 20:59:15 +00:00
parent e06eb314c5
commit 9f20b793c6
7 changed files with 65 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -2025,3 +2025,12 @@ Rom 17 Feb 2006
WizardAccountManager.cpp
WizardAttachProject.cpp
Rom 17 Feb 2006
- Bug Fix: Reset the reminder timers when the user updates something.
clientgui/
BOINCDialupManager.cpp, .h
MainFrame.cpp, .h
ViewProjects.cpp
ViewTransfers.cpp

15
clientgui/BOINCDialupManager.cpp
View File

@ -35,9 +35,7 @@ CBOINCDialUpManager::CBOINCDialUpManager() {
m_pDialupManager = wxDialUpManager::Create();
wxASSERT(m_pDialupManager->IsOk());
m_dtLastDialupAlertSent = wxDateTime((time_t)0);
m_dtLastDialupRequest = wxDateTime((time_t)0);
m_dtDialupConnectionTimeout = wxDateTime((time_t)0);
ResetReminderTimers();
m_bSetConnectionTimer = false;
m_bNotifyConnectionAvailable = false;
m_bConnectedSuccessfully = false;
@ -112,9 +110,7 @@ void CBOINCDialUpManager::poll() {
m_bResetTimers = false;
m_bSetConnectionTimer = false;
m_dtLastDialupAlertSent = wxDateTime((time_t)0);
m_dtLastDialupRequest = wxDateTime((time_t)0);
m_dtDialupConnectionTimeout = wxDateTime((time_t)0);
ResetReminderTimers();
}
// Log out the trace information for debugging purposes.
@ -464,3 +460,10 @@ int CBOINCDialUpManager::Disconnect() {
return 0;
}
void CMainFrame::ResetReminderTimers() {
m_dtLastDialupAlertSent = wxDateTime((time_t)0);
m_dtLastDialupRequest = wxDateTime((time_t)0);
m_dtDialupConnectionTimeout = wxDateTime((time_t)0);
}

1
clientgui/BOINCDialupManager.h
View File

@ -47,6 +47,7 @@ public:
int Disconnect();
void ResetReminderTimers();
protected:
wxDialUpManager* m_pDialupManager;

63
clientgui/MainFrame.cpp
View File

@ -1171,6 +1171,7 @@ void CMainFrame::OnAccountManagerUpdate(wxCommandEvent& WXUNUSED(event)) {
DeleteMenu();
CreateMenu();
FireRefreshView();
ResetReminderTimers();
m_pRefreshStateTimer->Start();
m_pFrameRenderTimer->Start();
@ -1875,6 +1876,37 @@ void CMainFrame::OnNotebookSelectionChanged(wxNotebookEvent& event) {
}
void CMainFrame::ExecuteBrowserLink(const wxString &strLink) {
wxHyperLink::ExecuteLink(strLink);
}
void CMainFrame::FireInitialize() {
CMainFrameEvent event(wxEVT_MAINFRAME_INITIALIZED, this);
AddPendingEvent(event);
}
void CMainFrame::FireRefreshView() {
CMainFrameEvent event(wxEVT_MAINFRAME_REFRESHVIEW, this);
AddPendingEvent(event);
}
void CMainFrame::FireConnect() {
CMainFrameEvent event(wxEVT_MAINFRAME_CONNECT, this);
AddPendingEvent(event);
}
void CMainFrame::ResetReminderTimers() {
wxASSERT(m_pDialupManager);
wxASSERT(wxDynamicCast(m_pDialupManager, CBOINCDialUpManager));
m_pDialupManager->ResetReminderTimers();
}
void CMainFrame::SetFrameListPanelRenderTimerRate() {
static wxWindowID previousPane = -1;
static int connectedCount = 0;
@ -1920,31 +1952,6 @@ void CMainFrame::SetFrameListPanelRenderTimerRate() {
}
void CMainFrame::UpdateStatusText(const wxChar* szStatus) {
wxString strStatus = szStatus;
m_pStatusbar->SetStatusText(strStatus);
::wxSleep(0);
}
void CMainFrame::FireInitialize() {
CMainFrameEvent event(wxEVT_MAINFRAME_INITIALIZED, this);
AddPendingEvent(event);
}
void CMainFrame::FireRefreshView() {
CMainFrameEvent event(wxEVT_MAINFRAME_REFRESHVIEW, this);
AddPendingEvent(event);
}
void CMainFrame::FireConnect() {
CMainFrameEvent event(wxEVT_MAINFRAME_CONNECT, this);
AddPendingEvent(event);
}
void CMainFrame::ShowConnectionBadPasswordAlert() {
wxString strDialogTitle = wxEmptyString;
@ -2046,8 +2053,10 @@ void CMainFrame::ShowAlert( const wxString title, const wxString message, const
}
void CMainFrame::ExecuteBrowserLink(const wxString &strLink) {
wxHyperLink::ExecuteLink(strLink);
void CMainFrame::UpdateStatusText(const wxChar* szStatus) {
wxString strStatus = szStatus;
m_pStatusbar->SetStatusText(strStatus);
::wxSleep(0);
}

11
clientgui/MainFrame.h
View File

@ -100,8 +100,7 @@ public:
void OnRefreshView( CMainFrameEvent& event );
void OnConnect( CMainFrameEvent& event );
void SetFrameListPanelRenderTimerRate();
void UpdateStatusText( const wxChar* szStatus );
void ExecuteBrowserLink( const wxString& strLink );
void FireInitialize();
void FireRefreshView();
@ -111,6 +110,12 @@ public:
wxString GetDialupConnectionName() { return m_strNetworkDialupConnectionName; }
bool GetDialupPromptForCredentials() { return m_bNetworkDialupPromptCredentials; }
void ResetReminderTimers();
void SetFrameListPanelRenderTimerRate(); // TODO: refactor out of the frame and put the
// relevent code in OnPageChanged function
// and the base/statistics view.
void ShowConnectionBadPasswordAlert();
void ShowConnectionFailedAlert();
void ShowNotCurrentlyConnectedAlert();
@ -122,7 +127,7 @@ public:
const MainFrameAlertEventType alert_event_type = AlertNormal
);
void ExecuteBrowserLink( const wxString& strLink );
void UpdateStatusText( const wxChar* szStatus );
#ifdef __WXMAC__
bool Show( bool show = true );

1
clientgui/ViewProjects.cpp
View File

@ -195,6 +195,7 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) {
m_bForceUpdateSelection = true;
UpdateSelection();
pFrame->ResetReminderTimers();
pFrame->FireRefreshView();
wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectUpdate - Function End"));

1
clientgui/ViewTransfers.cpp
View File

@ -159,6 +159,7 @@ void CViewTransfers::OnTransfersRetryNow( wxCommandEvent& WXUNUSED(event) ) {
pFrame->UpdateStatusText(wxT(""));
UpdateSelection();
pFrame->ResetReminderTimers();
pFrame->FireRefreshView();
wxLogTrace(wxT("Function Start/End"), wxT("CViewTransfers::OnTransfersRetryNow - Function End"));