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=6499
This commit is contained in:
Rom Walton 2005-06-30 06:12:49 +00:00
parent ceac89502f
commit a59c502e30
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -8781,3 +8781,12 @@ Rom 29 June 2005
clientgui/ clientgui/
MainFrame.cpp MainFrame.cpp
Rom 29 June 2005
- Bug Fix: Reset the notification timers when the modem looses connection in some
random event or we successfully connect to the target network.
- Bug Fix: Post a notification if the network connection disappears out from under
us.
clientgui/
MainFrame.cpp, .h

30
clientgui/MainFrame.cpp
View File

@ -203,6 +203,7 @@ CMainFrame::CMainFrame(wxString strTitle) :
// Working Variables // Working Variables
m_strBaseTitle = strTitle; m_strBaseTitle = strTitle;
m_bInternetSuccessfullyConnected = false; m_bInternetSuccessfullyConnected = false;
m_bInternetResetTimers = false;
m_bInternetDisconnectEventAlreadyDetected = false; m_bInternetDisconnectEventAlreadyDetected = false;
m_aSelectedComputerMRU.Clear(); m_aSelectedComputerMRU.Clear();
@ -1396,7 +1397,7 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) {
static wxDateTime dtLastDialupCheck = wxDateTime((time_t)0); static wxDateTime dtLastDialupCheck = wxDateTime((time_t)0);
static wxDateTime dtLastDialupAlertSent = wxDateTime((time_t)0); static wxDateTime dtLastDialupAlertSent = wxDateTime((time_t)0);
static wxDateTime dtLastDialupRequest = wxDateTime((time_t)0); static wxDateTime dtLastDialupRequest = wxDateTime((time_t)0);
bool already_notified_update_all_projects = false; static bool already_notified_update_all_projects = false;
bool should_check_connection = false; bool should_check_connection = false;
int want_network = 0; int want_network = 0;
int answer = 0; int answer = 0;
@ -1424,8 +1425,20 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) {
wxASSERT(wxDynamicCast(pDoc, CMainDocument)); wxASSERT(wxDynamicCast(pDoc, CMainDocument));
dtLastDialupCheck = wxDateTime::Now(); dtLastDialupCheck = wxDateTime::Now();
// If we have successfully connected up to the Internet, then we should
// reset the dtLastDialupAlertSent and dtLastDialupRequest variables
// so that if we are disconnected without completing the user will
// be notifed in a prompt fashion.
if (m_bInternetSuccessfullyConnected || m_bInternetResetTimers) {
if (m_bInternetResetTimers) {
m_bInternetResetTimers = false;
}
dtLastDialupAlertSent = wxDateTime((time_t)0);
dtLastDialupRequest = wxDateTime((time_t)0);
}
pDoc->rpc.network_query(want_network); pDoc->rpc.network_query(want_network);
if (!m_pDialupManager->IsOnline() && want_network) { if (!m_pDialupManager->IsOnline() && !m_pDialupManager->IsDialing() && want_network) {
if (!IsShown()) { if (!IsShown()) {
// BOINC Manager is hidden and displaying a dialog might interupt what they // BOINC Manager is hidden and displaying a dialog might interupt what they
// are doing. // are doing.
@ -1708,13 +1721,24 @@ void CMainFrame::OnInternetConnection(wxDialUpEvent& event) {
ShowAlert( ShowAlert(
_("BOINC Manager - Network Status"), _("BOINC Manager - Network Status"),
_("BOINC failed to connect to the internet."), _("BOINC failed to connect to the internet."),
wxICON_ERROR wxICON_ERROR,
true
); );
m_bInternetSuccessfullyConnected = false; m_bInternetSuccessfullyConnected = false;
m_bInternetDisconnectEventAlreadyDetected = false; m_bInternetDisconnectEventAlreadyDetected = false;
} }
} else {
if (!event.IsConnectedEvent()) {
ShowAlert(
_("BOINC Manager - Network Status"),
_("BOINC has lost network connectivity."),
wxICON_INFORMATION,
true
);
}
} }
m_bInternetResetTimers = true;
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnInternetConnection - Function End")); wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnInternetConnection - Function End"));
} }

2
clientgui/MainFrame.h
View File

@ -126,9 +126,9 @@ private:
wxArrayString m_aSelectedComputerMRU; wxArrayString m_aSelectedComputerMRU;
bool m_bInternetSuccessfullyConnected; bool m_bInternetSuccessfullyConnected;
bool m_bInternetResetTimers;
bool m_bInternetDisconnectEventAlreadyDetected; bool m_bInternetDisconnectEventAlreadyDetected;
bool CreateMenu(); bool CreateMenu();
bool DeleteMenu(); bool DeleteMenu();