mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=4413
This commit is contained in:
parent
8eaef9f394
commit
47767099a1
|
@ -31,12 +31,19 @@
|
|||
#define ID_FRAMENOTEBOOK 6002
|
||||
#define ID_FRAMETASKRENDERTIMER 6003
|
||||
#define ID_FRAMELISTRENDERTIMER 6004
|
||||
#define ID_ACTIVITYRUNALWAYS 6005
|
||||
#define ID_ACTIVITYRUNBASEDONPREPERENCES 6006
|
||||
#define ID_HIDE 6005
|
||||
#define ID_ACTIVITYRUNALWAYS 6006
|
||||
#define ID_ACTIVITYRUNBASEDONPREPERENCES 6007
|
||||
#define ID_ACTIVITYSUSPEND 6008
|
||||
#define ID_NETWORKRUNALWAYS 6009
|
||||
#define ID_NETWORKRUNBASEDONPREPERENCES 6010
|
||||
#define ID_NETWORKSUSPEND 6011
|
||||
#define ID_TB_ACTIVITYRUNALWAYS 6012
|
||||
#define ID_TB_ACTIVITYRUNBASEDONPREPERENCES 6013
|
||||
#define ID_TB_ACTIVITYSUSPEND 6014
|
||||
#define ID_TB_NETWORKRUNALWAYS 6015
|
||||
#define ID_TB_NETWORKRUNBASEDONPREPERENCES 6016
|
||||
#define ID_TB_NETWORKSUSPEND 6017
|
||||
#define ID_LIST_BASE 7000
|
||||
#define ID_LIST_PROJECTSVIEW 7000
|
||||
#define ID_LIST_WORKVIEW 7001
|
||||
|
|
|
@ -49,18 +49,25 @@ CMainDocument::CMainDocument()
|
|||
|
||||
m_bIsConnected = false;
|
||||
|
||||
m_iCachedActivityRunMode = 0;
|
||||
m_iCachedNetworkRunMode = 0;
|
||||
|
||||
m_fProjectTotalResourceShare = 0.0;
|
||||
|
||||
m_iMessageSequenceNumber = 0;
|
||||
|
||||
m_bCachedStateLocked = false;
|
||||
m_dtCachedStateLockTimestamp = wxDateTime::Now();
|
||||
m_dtCachedStateTimestamp = 0;
|
||||
m_dtCachedStateTimestamp = wxDateTime( (time_t)0 );
|
||||
m_dtCachedActivityRunModeTimestamp = wxDateTime( (time_t)0 );
|
||||
m_dtCachedNetworkRunModeTimestamp = wxDateTime( (time_t)0 );
|
||||
}
|
||||
|
||||
|
||||
CMainDocument::~CMainDocument()
|
||||
{
|
||||
m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now();
|
||||
m_dtCachedActivityRunModeTimestamp = wxDateTime::Now();
|
||||
m_dtCachedStateTimestamp = wxDateTime::Now();
|
||||
m_dtCachedStateLockTimestamp = wxDateTime::Now();
|
||||
m_bCachedStateLocked = false;
|
||||
|
@ -69,6 +76,9 @@ CMainDocument::~CMainDocument()
|
|||
|
||||
m_fProjectTotalResourceShare = 0.0;
|
||||
|
||||
m_iCachedActivityRunMode = 0;
|
||||
m_iCachedNetworkRunMode = 0;
|
||||
|
||||
m_bIsConnected = false;
|
||||
|
||||
#ifdef __WIN32__
|
||||
|
@ -87,7 +97,7 @@ wxInt32 CMainDocument::CachedStateUpdate()
|
|||
wxASSERT(wxDynamicCast(pFrame, CMainFrame));
|
||||
|
||||
wxTimeSpan ts(m_dtCachedStateLockTimestamp - m_dtCachedStateTimestamp);
|
||||
if (!m_bCachedStateLocked && (ts > wxTimeSpan::Seconds(3600)))
|
||||
if (!m_bCachedStateLocked && (ts.GetSeconds() > 3600))
|
||||
{
|
||||
pFrame->UpdateStatusbar( _("Retrieving the BOINC system state. Please wait...") );
|
||||
m_dtCachedStateTimestamp = m_dtCachedStateLockTimestamp;
|
||||
|
@ -168,25 +178,79 @@ wxInt32 CMainDocument::CachedStateUnlock()
|
|||
|
||||
wxInt32 CMainDocument::GetActivityRunMode( wxInt32& iMode )
|
||||
{
|
||||
return rpc.get_run_mode( iMode );
|
||||
wxInt32 iRetVal = 0;
|
||||
|
||||
wxTimeSpan ts(wxDateTime::Now() - m_dtCachedActivityRunModeTimestamp);
|
||||
if ( ts.GetSeconds() > 10 )
|
||||
{
|
||||
m_dtCachedActivityRunModeTimestamp = wxDateTime::Now();
|
||||
|
||||
iRetVal = rpc.get_run_mode( iMode );
|
||||
if ( 0 == iRetVal )
|
||||
{
|
||||
m_iCachedActivityRunMode = iMode;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
iMode = m_iCachedActivityRunMode;
|
||||
}
|
||||
|
||||
return iRetVal;
|
||||
}
|
||||
|
||||
|
||||
wxInt32 CMainDocument::SetActivityRunMode( wxInt32 iMode )
|
||||
{
|
||||
return rpc.set_run_mode( iMode );
|
||||
wxInt32 iRetVal = 0;
|
||||
|
||||
iRetVal = rpc.set_run_mode( iMode );
|
||||
if ( 0 == iRetVal )
|
||||
{
|
||||
m_dtCachedActivityRunModeTimestamp = wxDateTime::Now();
|
||||
m_iCachedActivityRunMode = iMode;
|
||||
}
|
||||
|
||||
return iRetVal;
|
||||
}
|
||||
|
||||
|
||||
wxInt32 CMainDocument::GetNetworkRunMode( wxInt32& iMode )
|
||||
{
|
||||
return rpc.get_network_mode( iMode );
|
||||
wxInt32 iRetVal = 0;
|
||||
|
||||
wxTimeSpan ts(wxDateTime::Now() - m_dtCachedNetworkRunModeTimestamp);
|
||||
if ( ts.GetSeconds() > 10 )
|
||||
{
|
||||
m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now();
|
||||
|
||||
iRetVal = rpc.get_network_mode( iMode );
|
||||
if ( 0 == iRetVal )
|
||||
{
|
||||
m_iCachedNetworkRunMode = iMode;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
iMode = m_iCachedNetworkRunMode;
|
||||
}
|
||||
|
||||
return iRetVal;
|
||||
}
|
||||
|
||||
|
||||
wxInt32 CMainDocument::SetNetworkRunMode( wxInt32 iMode )
|
||||
{
|
||||
return rpc.set_network_mode( iMode );
|
||||
wxInt32 iRetVal = 0;
|
||||
|
||||
iRetVal = rpc.set_network_mode( iMode );
|
||||
if ( 0 == iRetVal )
|
||||
{
|
||||
m_dtCachedNetworkRunModeTimestamp = wxDateTime::Now();
|
||||
m_iCachedNetworkRunMode = iMode;
|
||||
}
|
||||
|
||||
return iRetVal;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -74,10 +74,15 @@ private:
|
|||
HOST_INFO host;
|
||||
wxDateTime m_dtCachedStateTimestamp;
|
||||
wxDateTime m_dtCachedStateLockTimestamp;
|
||||
wxDateTime m_dtCachedActivityRunModeTimestamp;
|
||||
wxDateTime m_dtCachedNetworkRunModeTimestamp;
|
||||
bool m_bCachedStateLocked;
|
||||
|
||||
bool m_bIsConnected;
|
||||
|
||||
wxInt32 m_iCachedActivityRunMode;
|
||||
wxInt32 m_iCachedNetworkRunMode;
|
||||
|
||||
wxInt32 CachedStateUpdate();
|
||||
|
||||
public:
|
||||
|
|
|
@ -44,11 +44,16 @@
|
|||
IMPLEMENT_DYNAMIC_CLASS(CMainFrame, wxFrame)
|
||||
|
||||
BEGIN_EVENT_TABLE (CMainFrame, wxFrame)
|
||||
EVT_CLOSE(CMainFrame::OnClose)
|
||||
EVT_MENU(ID_HIDE, CMainFrame::OnHide)
|
||||
EVT_MENU_RANGE(ID_ACTIVITYRUNALWAYS, ID_ACTIVITYSUSPEND, CMainFrame::OnActivitySelection)
|
||||
EVT_MENU_RANGE(ID_NETWORKRUNALWAYS, ID_NETWORKSUSPEND, CMainFrame::OnNetworkSelection)
|
||||
EVT_MENU(wxID_EXIT, CMainFrame::OnExit)
|
||||
EVT_MENU(ID_TOOLSOPTIONS, CMainFrame::OnToolsOptions)
|
||||
EVT_MENU(wxID_ABOUT, CMainFrame::OnAbout)
|
||||
EVT_UPDATE_UI_RANGE(ID_ACTIVITYRUNALWAYS, ID_ACTIVITYSUSPEND, CMainFrame::OnUpdateActivitySelection)
|
||||
EVT_UPDATE_UI_RANGE(ID_NETWORKRUNALWAYS, ID_NETWORKSUSPEND, CMainFrame::OnUpdateNetworkSelection)
|
||||
EVT_IDLE(CMainFrame::OnIdle)
|
||||
EVT_CLOSE(CMainFrame::OnClose)
|
||||
EVT_NOTEBOOK_PAGE_CHANGED(ID_FRAMENOTEBOOK, CMainFrame::OnNotebookSelectionChanged)
|
||||
EVT_LIST_CACHE_HINT(wxID_ANY, CMainFrame::OnListCacheHint)
|
||||
EVT_LIST_ITEM_SELECTED(wxID_ANY, CMainFrame::OnListSelected)
|
||||
|
@ -132,6 +137,41 @@ bool CMainFrame::CreateMenu()
|
|||
{
|
||||
// File menu
|
||||
wxMenu *menuFile = new wxMenu;
|
||||
|
||||
menuFile->Append(
|
||||
ID_HIDE,
|
||||
_("&Hide"),
|
||||
_("Hides the main BOINC Manager window")
|
||||
);
|
||||
|
||||
menuFile->AppendSeparator();
|
||||
|
||||
menuFile->AppendRadioItem(
|
||||
ID_ACTIVITYRUNALWAYS,
|
||||
_("&Run always"),
|
||||
_("Runs BOINC without regards to the configured preferences for the computer")
|
||||
);
|
||||
menuFile->AppendRadioItem(
|
||||
ID_ACTIVITYRUNBASEDONPREPERENCES,
|
||||
_("Run based on &preferences"),
|
||||
_("Runs BOINC according to the preferences configured for the computer")
|
||||
);
|
||||
menuFile->AppendRadioItem(
|
||||
ID_ACTIVITYSUSPEND,
|
||||
_("&Suspend"),
|
||||
_("Suspends processing and network activity without regards to the configured preferences")
|
||||
);
|
||||
|
||||
menuFile->AppendSeparator();
|
||||
|
||||
menuFile->AppendCheckItem(
|
||||
ID_NETWORKSUSPEND,
|
||||
_("&Disable BOINC Network Access"),
|
||||
_("Disables network activity without suspending BOINC")
|
||||
);
|
||||
|
||||
menuFile->AppendSeparator();
|
||||
|
||||
menuFile->Append(
|
||||
wxID_EXIT,
|
||||
_("E&xit"),
|
||||
|
@ -476,24 +516,68 @@ bool CMainFrame::FireRestoreStateEvent( T pPage, wxConfigBase* pConfig )
|
|||
}
|
||||
|
||||
|
||||
void CMainFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
|
||||
void CMainFrame::OnHide( wxCommandEvent& event )
|
||||
{
|
||||
Close(true);
|
||||
Hide();
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnClose( wxCloseEvent& event )
|
||||
void CMainFrame::OnActivitySelection( wxCommandEvent& event )
|
||||
{
|
||||
if ( !event.CanVeto() )
|
||||
Destroy();
|
||||
else
|
||||
CMainDocument* pDoc = wxGetApp().GetDocument();
|
||||
|
||||
wxASSERT(NULL != pDoc);
|
||||
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
|
||||
|
||||
switch( event.GetId() )
|
||||
{
|
||||
Hide();
|
||||
event.Veto();
|
||||
case ID_ACTIVITYRUNALWAYS:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_ALWAYS );
|
||||
break;
|
||||
case ID_ACTIVITYSUSPEND:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_NEVER );
|
||||
break;
|
||||
case ID_ACTIVITYRUNBASEDONPREPERENCES:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_AUTO );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnNetworkSelection( wxCommandEvent& event )
|
||||
{
|
||||
CMainDocument* pDoc = wxGetApp().GetDocument();
|
||||
|
||||
wxASSERT(NULL != pDoc);
|
||||
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
|
||||
|
||||
switch( event.GetId() )
|
||||
{
|
||||
case ID_NETWORKSUSPEND:
|
||||
if ( event.IsChecked() )
|
||||
{
|
||||
pDoc->SetNetworkRunMode( CMainDocument::MODE_ALWAYS );
|
||||
}
|
||||
else
|
||||
{
|
||||
pDoc->SetNetworkRunMode( CMainDocument::MODE_NEVER );
|
||||
}
|
||||
break;
|
||||
case ID_NETWORKRUNALWAYS:
|
||||
case ID_NETWORKRUNBASEDONPREPERENCES:
|
||||
default:
|
||||
pDoc->SetNetworkRunMode( CMainDocument::MODE_ALWAYS );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnExit( wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
Close(true);
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnToolsOptions( wxCommandEvent& WXUNUSED(event) )
|
||||
{
|
||||
CDlgOptions* pDlg = new CDlgOptions(this);
|
||||
|
@ -518,6 +602,57 @@ void CMainFrame::OnAbout( wxCommandEvent& WXUNUSED(event) )
|
|||
}
|
||||
|
||||
|
||||
void CMainFrame::OnUpdateActivitySelection( wxUpdateUIEvent& WXUNUSED(event) )
|
||||
{
|
||||
CMainDocument* pDoc = wxGetApp().GetDocument();
|
||||
wxMenuBar* pMenuBar = GetMenuBar();
|
||||
wxInt32 iActivityMode = -1;
|
||||
|
||||
wxASSERT(NULL != pDoc);
|
||||
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
|
||||
wxASSERT(NULL != pMenuBar);
|
||||
wxASSERT(wxDynamicCast(pMenuBar, wxMenuBar));
|
||||
|
||||
pDoc->GetActivityRunMode( iActivityMode );
|
||||
switch( iActivityMode )
|
||||
{
|
||||
case CMainDocument::MODE_ALWAYS:
|
||||
pMenuBar->Check( ID_ACTIVITYRUNALWAYS, true );
|
||||
break;
|
||||
case CMainDocument::MODE_NEVER:
|
||||
pMenuBar->Check( ID_ACTIVITYSUSPEND, true );
|
||||
break;
|
||||
case CMainDocument::MODE_AUTO:
|
||||
pMenuBar->Check( ID_ACTIVITYRUNBASEDONPREPERENCES, true );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnUpdateNetworkSelection( wxUpdateUIEvent& WXUNUSED(event) )
|
||||
{
|
||||
CMainDocument* pDoc = wxGetApp().GetDocument();
|
||||
wxMenuBar* pMenuBar = GetMenuBar();
|
||||
wxInt32 iNetworkMode = -1;
|
||||
|
||||
wxASSERT(NULL != pDoc);
|
||||
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
|
||||
wxASSERT(NULL != pMenuBar);
|
||||
wxASSERT(wxDynamicCast(pMenuBar, wxMenuBar));
|
||||
|
||||
pDoc->GetNetworkRunMode( iNetworkMode );
|
||||
switch( iNetworkMode )
|
||||
{
|
||||
case CMainDocument::MODE_NEVER:
|
||||
pMenuBar->Check( ID_NETWORKSUSPEND, true );
|
||||
break;
|
||||
default:
|
||||
pMenuBar->Check( ID_NETWORKSUSPEND, false );
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnIdle( wxIdleEvent& event )
|
||||
{
|
||||
CMainDocument* pDoc = wxGetApp().GetDocument();
|
||||
|
@ -525,7 +660,6 @@ void CMainFrame::OnIdle( wxIdleEvent& event )
|
|||
if ( NULL != pDoc )
|
||||
{
|
||||
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
|
||||
|
||||
pDoc->OnIdle();
|
||||
}
|
||||
|
||||
|
@ -533,6 +667,18 @@ void CMainFrame::OnIdle( wxIdleEvent& event )
|
|||
}
|
||||
|
||||
|
||||
void CMainFrame::OnClose( wxCloseEvent& event )
|
||||
{
|
||||
if ( !event.CanVeto() )
|
||||
Destroy();
|
||||
else
|
||||
{
|
||||
Hide();
|
||||
event.Veto();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMainFrame::OnNotebookSelectionChanged( wxNotebookEvent& event )
|
||||
{
|
||||
if ( (-1 != event.GetSelection()) && IsShown() )
|
||||
|
|
|
@ -42,13 +42,19 @@ public:
|
|||
|
||||
bool UpdateStatusbar( const wxString& strStatusbarText );
|
||||
|
||||
void OnHide( wxCommandEvent& event );
|
||||
void OnActivitySelection( wxCommandEvent& event );
|
||||
void OnNetworkSelection( wxCommandEvent& event );
|
||||
void OnExit( wxCommandEvent& event );
|
||||
void OnClose( wxCloseEvent& event );
|
||||
|
||||
void OnToolsOptions( wxCommandEvent& event );
|
||||
void OnAbout( wxCommandEvent& event );
|
||||
|
||||
void OnUpdateActivitySelection( wxUpdateUIEvent& event );
|
||||
void OnUpdateNetworkSelection( wxUpdateUIEvent& event );
|
||||
|
||||
void OnIdle ( wxIdleEvent& event );
|
||||
void OnClose( wxCloseEvent& event );
|
||||
|
||||
void OnNotebookSelectionChanged( wxNotebookEvent& event );
|
||||
|
||||
|
|
|
@ -37,12 +37,12 @@
|
|||
IMPLEMENT_DYNAMIC_CLASS(CTaskBarIcon, wxTaskBarIcon)
|
||||
|
||||
BEGIN_EVENT_TABLE (CTaskBarIcon, wxTaskBarIcon)
|
||||
EVT_CLOSE(CTaskBarIcon::OnClose)
|
||||
EVT_MENU(wxID_OPEN, CTaskBarIcon::OnOpen)
|
||||
EVT_MENU_RANGE(ID_ACTIVITYRUNALWAYS, ID_ACTIVITYSUSPEND, CTaskBarIcon::OnActivitySelection)
|
||||
EVT_MENU_RANGE(ID_NETWORKRUNALWAYS, ID_NETWORKSUSPEND, CTaskBarIcon::OnNetworkSelection)
|
||||
EVT_MENU_RANGE(ID_TB_ACTIVITYRUNALWAYS, ID_TB_ACTIVITYSUSPEND, CTaskBarIcon::OnActivitySelection)
|
||||
EVT_MENU_RANGE(ID_TB_NETWORKRUNALWAYS, ID_TB_NETWORKSUSPEND, CTaskBarIcon::OnNetworkSelection)
|
||||
EVT_MENU(wxID_ABOUT, CTaskBarIcon::OnAbout)
|
||||
EVT_MENU(wxID_EXIT, CTaskBarIcon::OnExit)
|
||||
EVT_CLOSE(CTaskBarIcon::OnClose)
|
||||
END_EVENT_TABLE ()
|
||||
|
||||
|
||||
|
@ -82,13 +82,13 @@ void CTaskBarIcon::OnActivitySelection( wxCommandEvent& event )
|
|||
|
||||
switch( event.GetId() )
|
||||
{
|
||||
case ID_ACTIVITYRUNALWAYS:
|
||||
case ID_TB_ACTIVITYRUNALWAYS:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_ALWAYS );
|
||||
break;
|
||||
case ID_ACTIVITYSUSPEND:
|
||||
case ID_TB_ACTIVITYSUSPEND:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_NEVER );
|
||||
break;
|
||||
case ID_ACTIVITYRUNBASEDONPREPERENCES:
|
||||
case ID_TB_ACTIVITYRUNBASEDONPREPERENCES:
|
||||
pDoc->SetActivityRunMode( CMainDocument::MODE_AUTO );
|
||||
break;
|
||||
}
|
||||
|
@ -104,7 +104,7 @@ void CTaskBarIcon::OnNetworkSelection( wxCommandEvent& event )
|
|||
|
||||
switch( event.GetId() )
|
||||
{
|
||||
case ID_NETWORKSUSPEND:
|
||||
case ID_TB_NETWORKSUSPEND:
|
||||
if ( event.IsChecked() )
|
||||
{
|
||||
pDoc->SetNetworkRunMode( CMainDocument::MODE_ALWAYS );
|
||||
|
@ -114,8 +114,8 @@ void CTaskBarIcon::OnNetworkSelection( wxCommandEvent& event )
|
|||
pDoc->SetNetworkRunMode( CMainDocument::MODE_NEVER );
|
||||
}
|
||||
break;
|
||||
case ID_NETWORKRUNALWAYS:
|
||||
case ID_NETWORKRUNBASEDONPREPERENCES:
|
||||
case ID_TB_NETWORKRUNALWAYS:
|
||||
case ID_TB_NETWORKRUNBASEDONPREPERENCES:
|
||||
default:
|
||||
pDoc->SetNetworkRunMode( CMainDocument::MODE_ALWAYS );
|
||||
break;
|
||||
|
@ -216,11 +216,11 @@ void CTaskBarIcon::OnRButtonDown( wxEvent& event )
|
|||
|
||||
menu->Append( wxID_OPEN, _("&Open"), wxEmptyString );
|
||||
menu->AppendSeparator();
|
||||
menu->AppendRadioItem( ID_ACTIVITYRUNALWAYS, _("&Run always"), wxEmptyString );
|
||||
menu->AppendRadioItem( ID_ACTIVITYRUNBASEDONPREPERENCES, _("Run based on &preferences"), wxEmptyString );
|
||||
menu->AppendRadioItem( ID_ACTIVITYSUSPEND, _("&Suspend"), wxEmptyString );
|
||||
menu->AppendRadioItem( ID_TB_ACTIVITYRUNALWAYS, _("&Run always"), wxEmptyString );
|
||||
menu->AppendRadioItem( ID_TB_ACTIVITYRUNBASEDONPREPERENCES, _("Run based on &preferences"), wxEmptyString );
|
||||
menu->AppendRadioItem( ID_TB_ACTIVITYSUSPEND, _("&Suspend"), wxEmptyString );
|
||||
menu->AppendSeparator();
|
||||
menu->AppendCheckItem( ID_NETWORKSUSPEND, _("&Disable BOINC Network Access"), wxEmptyString );
|
||||
menu->AppendCheckItem( ID_TB_NETWORKSUSPEND, _("&Disable BOINC Network Access"), wxEmptyString );
|
||||
menu->AppendSeparator();
|
||||
menu->Append( wxID_ABOUT, _("&About BOINC Manager..."), wxEmptyString );
|
||||
menu->AppendSeparator();
|
||||
|
@ -230,13 +230,13 @@ void CTaskBarIcon::OnRButtonDown( wxEvent& event )
|
|||
switch( iActivityMode )
|
||||
{
|
||||
case CMainDocument::MODE_ALWAYS:
|
||||
menu->Check( ID_ACTIVITYRUNALWAYS, true );
|
||||
menu->Check( ID_TB_ACTIVITYRUNALWAYS, true );
|
||||
break;
|
||||
case CMainDocument::MODE_NEVER:
|
||||
menu->Check( ID_ACTIVITYSUSPEND, true );
|
||||
menu->Check( ID_TB_ACTIVITYSUSPEND, true );
|
||||
break;
|
||||
case CMainDocument::MODE_AUTO:
|
||||
menu->Check( ID_ACTIVITYRUNBASEDONPREPERENCES, true );
|
||||
menu->Check( ID_TB_ACTIVITYRUNBASEDONPREPERENCES, true );
|
||||
break;
|
||||
}
|
||||
|
||||
|
@ -244,10 +244,10 @@ void CTaskBarIcon::OnRButtonDown( wxEvent& event )
|
|||
switch( iNetworkMode )
|
||||
{
|
||||
case CMainDocument::MODE_NEVER:
|
||||
menu->Check( ID_NETWORKSUSPEND, true );
|
||||
menu->Check( ID_TB_NETWORKSUSPEND, true );
|
||||
break;
|
||||
default:
|
||||
menu->Check( ID_NETWORKSUSPEND, false );
|
||||
menu->Check( ID_TB_NETWORKSUSPEND, false );
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -51,6 +51,7 @@ public:
|
|||
void OnNetworkSelection( wxCommandEvent& event );
|
||||
void OnAbout( wxCommandEvent& event );
|
||||
void OnExit( wxCommandEvent& event );
|
||||
|
||||
void OnClose( wxCloseEvent& event );
|
||||
|
||||
virtual void OnMouseMove( wxEvent& event );
|
||||
|
|
Binary file not shown.
|
@ -2,7 +2,7 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: BOINC Manager 3.x\n"
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: 2004-10-22 11:38-0800\n"
|
||||
"PO-Revision-Date: 2004-10-24 00:38-0800\n"
|
||||
"Last-Translator: Rom Walton <rwalton@ssl.berkeley.edu>\n"
|
||||
"Language-Team: BOINC Development Team <rwalton@ssl.berkeley.edu>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
|
@ -14,15 +14,15 @@ msgstr ""
|
|||
"X-Poedit-Basepath: C:\\BOINCSRC\\Main\\boinc\n"
|
||||
"X-Poedit-SearchPath-0: clientgui\n"
|
||||
|
||||
#: clientgui/BOINCGUIApp.cpp:114
|
||||
#: clientgui/BOINCGUIApp.cpp:124
|
||||
msgid "You have specified -e on the commmand line. The application will exit now."
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/BOINCGUIApp.cpp:115
|
||||
#: clientgui/BOINCGUIApp.cpp:125
|
||||
msgid "Example command line option"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/DlgAbout.cpp:137
|
||||
#: clientgui/DlgAbout.cpp:143
|
||||
#: clientgui/DlgAttachProject.cpp:114
|
||||
#: clientgui/DlgConnection.cpp:92
|
||||
#: clientgui/DlgOptions.cpp:210
|
||||
|
@ -102,50 +102,100 @@ msgstr ""
|
|||
msgid "SOCKS Proxy"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainDocument.cpp:129
|
||||
#: clientgui/MainDocument.cpp:102
|
||||
msgid "Retrieving the BOINC system state. Please wait..."
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainDocument.cpp:139
|
||||
#: clientgui/MainDocument.cpp:112
|
||||
msgid "Retrieving the BOINC host information. Please wait..."
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:138
|
||||
msgid "E&xit"
|
||||
#: clientgui/MainFrame.cpp:143
|
||||
msgid "&Hide"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:139
|
||||
msgid "Exit the BOINC Manager"
|
||||
#: clientgui/MainFrame.cpp:144
|
||||
msgid "Hides the main BOINC Manager window"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:146
|
||||
msgid "&Options"
|
||||
#: clientgui/MainFrame.cpp:151
|
||||
#: clientgui/TaskBarIcon.cpp:219
|
||||
msgid "&Run always"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:147
|
||||
msgid "Configure GUI options and proxy settings"
|
||||
#: clientgui/MainFrame.cpp:152
|
||||
msgid "Runs BOINC without regards to the configured preferences for the computer"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:154
|
||||
msgid "&About BOINC..."
|
||||
#: clientgui/MainFrame.cpp:156
|
||||
#: clientgui/TaskBarIcon.cpp:220
|
||||
msgid "Run based on &preferences"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:155
|
||||
msgid "Displays general information about BOINC and BOINC Manager"
|
||||
#: clientgui/MainFrame.cpp:157
|
||||
msgid "Runs BOINC according to the preferences configured for the computer"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:161
|
||||
#: clientgui/TaskBarIcon.cpp:221
|
||||
msgid "&Suspend"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:162
|
||||
msgid "&File"
|
||||
msgid "Suspends processing and network activity without regards to the configured preferences"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:166
|
||||
msgid "&Tools"
|
||||
#: clientgui/MainFrame.cpp:169
|
||||
#: clientgui/TaskBarIcon.cpp:223
|
||||
msgid "&Disable BOINC Network Access"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:170
|
||||
msgid "Disables network activity without suspending BOINC"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:177
|
||||
#: clientgui/TaskBarIcon.cpp:227
|
||||
msgid "E&xit"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:178
|
||||
msgid "Exit the BOINC Manager"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:185
|
||||
msgid "&Options"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:186
|
||||
msgid "Configure GUI options and proxy settings"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:193
|
||||
#: clientgui/TaskBarIcon.cpp:225
|
||||
msgid "&About BOINC Manager..."
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:194
|
||||
msgid "Displays general information about BOINC and BOINC Manager"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:201
|
||||
msgid "&File"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:205
|
||||
msgid "&Tools"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/MainFrame.cpp:209
|
||||
msgid "&Help"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/TaskBarIcon.cpp:217
|
||||
msgid "&Open"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ValidateAccountKey.cpp:89
|
||||
msgid "Invalid Account Key, please enter a valid Account Key"
|
||||
msgstr ""
|
||||
|
@ -188,7 +238,7 @@ msgstr ""
|
|||
|
||||
#: clientgui/ViewMessages.cpp:99
|
||||
#: clientgui/ViewProjects.cpp:152
|
||||
#: clientgui/ViewResources.cpp:86
|
||||
#: clientgui/ViewResources.cpp:85
|
||||
#: clientgui/ViewTransfers.cpp:102
|
||||
#: clientgui/ViewWork.cpp:113
|
||||
msgid "Tasks"
|
||||
|
@ -196,7 +246,7 @@ msgstr ""
|
|||
|
||||
#: clientgui/ViewMessages.cpp:100
|
||||
#: clientgui/ViewProjects.cpp:154
|
||||
#: clientgui/ViewResources.cpp:87
|
||||
#: clientgui/ViewResources.cpp:86
|
||||
#: clientgui/ViewTransfers.cpp:103
|
||||
#: clientgui/ViewWork.cpp:114
|
||||
msgid "Quick Tips"
|
||||
|
@ -205,7 +255,7 @@ msgstr ""
|
|||
#: clientgui/ViewMessages.cpp:102
|
||||
#: clientgui/ViewProjects.cpp:156
|
||||
#: clientgui/ViewProjects.cpp:668
|
||||
#: clientgui/ViewResources.cpp:89
|
||||
#: clientgui/ViewResources.cpp:88
|
||||
#: clientgui/ViewTransfers.cpp:105
|
||||
#: clientgui/ViewWork.cpp:116
|
||||
msgid "Project"
|
||||
|
@ -348,7 +398,7 @@ msgid "Project Suspended"
|
|||
msgstr ""
|
||||
|
||||
#: clientgui/ViewProjects.cpp:813
|
||||
#: clientgui/ViewTransfers.cpp:618
|
||||
#: clientgui/ViewTransfers.cpp:662
|
||||
msgid "Retry in "
|
||||
msgstr ""
|
||||
|
||||
|
@ -356,11 +406,11 @@ msgstr ""
|
|||
msgid "No available options currently defined."
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewResources.cpp:90
|
||||
#: clientgui/ViewResources.cpp:89
|
||||
msgid "Disk Space"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewResources.cpp:110
|
||||
#: clientgui/ViewResources.cpp:109
|
||||
msgid "Disk"
|
||||
msgstr ""
|
||||
|
||||
|
@ -397,31 +447,40 @@ msgstr ""
|
|||
msgid "Transfers"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:413
|
||||
#: clientgui/ViewTransfers.cpp:351
|
||||
#, c-format
|
||||
msgid "Are you sure you wish to abort this file transfer '%s'?"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:356
|
||||
msgid "Abort File Transfer"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:454
|
||||
msgid "Retry Now"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:414
|
||||
#: clientgui/ViewTransfers.cpp:455
|
||||
msgid "Abort Upload"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:622
|
||||
#: clientgui/ViewWork.cpp:711
|
||||
#: clientgui/ViewTransfers.cpp:666
|
||||
#: clientgui/ViewWork.cpp:717
|
||||
msgid "Download failed"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:626
|
||||
#: clientgui/ViewWork.cpp:753
|
||||
#: clientgui/ViewTransfers.cpp:670
|
||||
#: clientgui/ViewWork.cpp:759
|
||||
msgid "Upload failed"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:630
|
||||
#: clientgui/ViewWork.cpp:757
|
||||
#: clientgui/ViewTransfers.cpp:674
|
||||
#: clientgui/ViewWork.cpp:763
|
||||
msgid "Uploading"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewTransfers.cpp:630
|
||||
#: clientgui/ViewWork.cpp:715
|
||||
#: clientgui/ViewTransfers.cpp:674
|
||||
#: clientgui/ViewWork.cpp:721
|
||||
msgid "Downloading"
|
||||
msgstr ""
|
||||
|
||||
|
@ -491,40 +550,40 @@ msgstr ""
|
|||
msgid "Show Graphics"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:706
|
||||
#: clientgui/ViewWork.cpp:712
|
||||
msgid "New"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:724
|
||||
#: clientgui/ViewWork.cpp:730
|
||||
msgid "Running"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:730
|
||||
#: clientgui/ViewWork.cpp:736
|
||||
msgid "Suspended"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:734
|
||||
#: clientgui/ViewWork.cpp:740
|
||||
msgid "Paused"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:739
|
||||
#: clientgui/ViewWork.cpp:744
|
||||
#: clientgui/ViewWork.cpp:745
|
||||
#: clientgui/ViewWork.cpp:750
|
||||
msgid "Ready to run"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:748
|
||||
#: clientgui/ViewWork.cpp:754
|
||||
msgid "Computation error"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:763
|
||||
#: clientgui/ViewWork.cpp:769
|
||||
msgid "Acknowledged"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:767
|
||||
#: clientgui/ViewWork.cpp:773
|
||||
msgid "Ready to report"
|
||||
msgstr ""
|
||||
|
||||
#: clientgui/ViewWork.cpp:771
|
||||
#: clientgui/ViewWork.cpp:777
|
||||
#, c-format
|
||||
msgid "Error: invalid state '%d'"
|
||||
msgstr ""
|
||||
|
|
Loading…
Reference in New Issue