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=5820
This commit is contained in:
David Anderson 2005-04-10 19:01:23 +00:00
parent ac5f4b014c
commit f0e0f67371
11 changed files with 332 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
clientgui/BOINCBaseView.cpp
View File

@ -37,8 +37,8 @@ IMPLEMENT_DYNAMIC_CLASS(CBOINCBaseView, wxPanel)
CBOINCBaseView::CBOINCBaseView() {}
CBOINCBaseView::CBOINCBaseView(
wxNotebook* pNotebook, wxWindowID iHtmlWindowID, wxInt32 iHtmlWindowFlags,
wxWindowID iListWindowID, wxInt32 iListWindowFlags, bool donothing
wxNotebook* pNotebook, wxWindowID iHtmlWindowID, int iHtmlWindowFlags,
wxWindowID iListWindowID, int iListWindowFlags, bool donothing
) : wxPanel(pNotebook, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL) {
if (!donothing) {
wxASSERT(NULL != pNotebook);
@ -104,7 +104,7 @@ const char** CBOINCBaseView::GetViewIcon() {
}
wxInt32 CBOINCBaseView::GetListRowCount() {
int CBOINCBaseView::GetListRowCount() {
wxASSERT(m_pListPane);
return m_pListPane->GetItemCount();
}
@ -174,7 +174,7 @@ void CBOINCBaseView::FireOnTaskCellMouseHover(
}
wxInt32 CBOINCBaseView::GetDocCount() {
int CBOINCBaseView::GetDocCount() {
return 0;
}
@ -185,15 +185,15 @@ void CBOINCBaseView::OnListRender (wxTimerEvent& event) {
wxASSERT(m_pListPane);
wxInt32 iDocCount = GetDocCount();
wxInt32 iCacheCount = GetCacheCount();
int iDocCount = GetDocCount();
int iCacheCount = GetCacheCount();
if (iDocCount != iCacheCount) {
if (0 >= iDocCount) {
EmptyCache();
m_pListPane->DeleteAllItems();
} else {
wxInt32 iIndex = 0;
wxInt32 iReturnValue = -1;
int iIndex = 0;
int iReturnValue = -1;
if (iDocCount > iCacheCount) {
for (iIndex = 0; iIndex < (iDocCount - iCacheCount); iIndex++
) {
@ -344,31 +344,31 @@ void CBOINCBaseView::SetCurrentQuickTip(const wxString& strQuickTip, const wxStr
}
wxInt32 CBOINCBaseView::AddCacheElement() {
int CBOINCBaseView::AddCacheElement() {
return -1;
}
wxInt32 CBOINCBaseView::EmptyCache() {
int CBOINCBaseView::EmptyCache() {
return -1;
}
wxInt32 CBOINCBaseView::GetCacheCount() {
int CBOINCBaseView::GetCacheCount() {
return -1;
}
wxInt32 CBOINCBaseView::RemoveCacheElement() {
int CBOINCBaseView::RemoveCacheElement() {
return -1;
}
wxInt32 CBOINCBaseView::SyncronizeCache() {
wxInt32 iRowIndex = 0;
wxInt32 iRowTotal = 0;
wxInt32 iColumnIndex = 0;
wxInt32 iColumnTotal = 0;
int CBOINCBaseView::SyncronizeCache() {
int iRowIndex = 0;
int iRowTotal = 0;
int iColumnIndex = 0;
int iColumnTotal = 0;
wxString strDocumentText = wxEmptyString;
wxString strListPaneText = wxEmptyString;
bool bNeedRefreshData = false;
@ -403,7 +403,7 @@ wxInt32 CBOINCBaseView::SyncronizeCache() {
}
wxInt32 CBOINCBaseView::UpdateCache(
int CBOINCBaseView::UpdateCache(
long WXUNUSED(item), long WXUNUSED(column), wxString& WXUNUSED(strNewData)
) {
return -1;

26
clientgui/BOINCBaseView.h
View File

@ -32,8 +32,7 @@
class CBOINCTaskCtrl;
class CBOINCListCtrl;
class CTaskItem : wxObject
{
class CTaskItem : wxObject {
public:
wxString m_strTaskName;
wxString m_strTaskDescription;
@ -43,8 +42,7 @@ public:
bool m_bIsClicked;
};
class CBOINCBaseView : public wxPanel
{
class CBOINCBaseView : public wxPanel {
DECLARE_DYNAMIC_CLASS( CBOINCBaseView )
public:
@ -53,9 +51,9 @@ public:
CBOINCBaseView(
wxNotebook* pNotebook,
wxWindowID iHtmlWindowID,
wxInt32 iHtmlWindowFlags,
int iHtmlWindowFlags,
wxWindowID iListWindowID,
wxInt32 iListWindowFlags,
int iListWindowFlags,
bool donothing=false
);
@ -63,7 +61,7 @@ public:
virtual wxString GetViewName();
virtual const char** GetViewIcon();
virtual wxInt32 GetListRowCount();
virtual int GetListRowCount();
void FireOnListRender( wxTimerEvent& event );
bool FireOnSaveState( wxConfigBase* pConfig );
@ -82,7 +80,7 @@ public:
protected:
virtual wxInt32 GetDocCount();
virtual int GetDocCount();
virtual void OnListRender( wxTimerEvent& event );
@ -109,12 +107,12 @@ protected:
wxString GetCurrentQuickTipText();
void SetCurrentQuickTip( const wxString& strQuickTip, const wxString& strQuickTipText );
virtual wxInt32 AddCacheElement();
virtual wxInt32 EmptyCache();
virtual wxInt32 GetCacheCount();
virtual wxInt32 RemoveCacheElement();
virtual wxInt32 SyncronizeCache();
virtual wxInt32 UpdateCache( long item, long column, wxString& strNewData );
virtual int AddCacheElement();
virtual int EmptyCache();
virtual int GetCacheCount();
virtual int RemoveCacheElement();
virtual int SyncronizeCache();
virtual int UpdateCache( long item, long column, wxString& strNewData );
bool _EnsureLastItemVisible();
virtual bool EnsureLastItemVisible();

23
clientgui/BOINCGUIApp.h
View File

@ -36,8 +36,7 @@
#endif
class CBOINCGUIApp : public wxApp
{
class CBOINCGUIApp : public wxApp {
DECLARE_DYNAMIC_CLASS(CBOINCGUIApp)
protected:
@ -54,8 +53,8 @@ protected:
void StartupBOINCCore();
void ShutdownBOINCCore();
wxInt32 StartupSystemIdleDetection();
wxInt32 ShutdownSystemIdleDetection();
int StartupSystemIdleDetection();
int ShutdownSystemIdleDetection();
wxConfig* m_pConfig;
wxLocale* m_pLocale;
@ -73,7 +72,7 @@ protected:
bool m_bBOINCStartedByManager;
bool m_bFrameVisible;
wxInt32 m_lBOINCCoreProcessId;
int m_lBOINCCoreProcessId;
#ifdef __WXMSW__
HANDLE m_hBOINCCoreProcess;
@ -92,19 +91,19 @@ public:
bool OnInit();
wxInt32 UpdateSystemIdleDetection();
int UpdateSystemIdleDetection();
CMainFrame* GetFrame() { return m_pFrame; };
CMainDocument* GetDocument() { return m_pDocument; };
CMainFrame* GetFrame() { return m_pFrame; }
CMainDocument* GetDocument() { return m_pDocument; }
#ifndef NOTASKBAR
CTaskBarIcon* GetTaskBarIcon() { return m_pTaskBarIcon; };
CTaskBarIcon* GetTaskBarIcon() { return m_pTaskBarIcon; }
#ifdef __APPLE__
CMacSystemMenu* GetMacSystemMenu() { return m_pMacSystemMenu; };
CMacSystemMenu* GetMacSystemMenu() { return m_pMacSystemMenu; }
#endif
#endif
wxString* GetSupportedLanguages() { return (wxString*)&m_strLanguages; };
wxInt32 GetSupportedLanguagesCount() { return WXSIZEOF(m_strLanguages); };
wxString* GetSupportedLanguages() { return (wxString*)&m_strLanguages; }
int GetSupportedLanguagesCount() { return WXSIZEOF(m_strLanguages); }
};

23
clientgui/BOINCListCtrl.h
View File

@ -27,28 +27,27 @@
class CBOINCBaseView;
class CBOINCListCtrl : public wxListView
{
DECLARE_DYNAMIC_CLASS( CBOINCListCtrl )
class CBOINCListCtrl : public wxListView {
DECLARE_DYNAMIC_CLASS(CBOINCListCtrl)
public:
CBOINCListCtrl();
CBOINCListCtrl( CBOINCBaseView* pView, wxWindowID iListWindowID, wxInt32 iListWindowFlags );
CBOINCListCtrl(CBOINCBaseView* pView, wxWindowID iListWindowID, int iListWindowFlags);
~CBOINCListCtrl();
virtual bool OnSaveState( wxConfigBase* pConfig );
virtual bool OnRestoreState( wxConfigBase* pConfig );
virtual bool OnSaveState(wxConfigBase* pConfig);
virtual bool OnRestoreState(wxConfigBase* pConfig);
private:
virtual void OnClick( wxCommandEvent& event );
virtual void OnSelected( wxListEvent& event );
virtual void OnDeselected( wxListEvent& event );
virtual void OnClick(wxCommandEvent& event);
virtual void OnSelected(wxListEvent& event);
virtual void OnDeselected(wxListEvent& event);
virtual wxString OnGetItemText( long item, long column ) const;
virtual int OnGetItemImage( long item ) const;
virtual wxListItemAttr* OnGetItemAttr( long item ) const;
virtual wxString OnGetItemText(long item, long column) const;
virtual int OnGetItemImage(long item) const;
virtual wxListItemAttr* OnGetItemAttr(long item) const;
bool m_bIsSingleSelection;

31
clientgui/BOINCTaskBar.h
View File

@ -35,39 +35,38 @@
#endif
class CTaskBarIcon : public wxTaskBarIconEx
{
class CTaskBarIcon : public wxTaskBarIconEx {
DECLARE_DYNAMIC_CLASS(CTaskBarIcon)
public:
CTaskBarIcon();
~CTaskBarIcon();
void OnOpen( wxCommandEvent& event );
void OnActivitySelection( wxCommandEvent& event );
void OnNetworkSelection( wxCommandEvent& event );
void OnAbout( wxCommandEvent& event );
void OnExit( wxCommandEvent& event );
void OnOpen(wxCommandEvent& event);
void OnActivitySelection(wxCommandEvent& event);
void OnNetworkSelection(wxCommandEvent& event);
void OnAbout(wxCommandEvent& event);
void OnExit(wxCommandEvent& event);
#ifdef __WXMSW__
void OnShutdown( wxTaskBarIconExEvent& event );
void OnShutdown(wxTaskBarIconExEvent& event);
#endif
void OnIdle( wxIdleEvent& event );
void OnClose( wxCloseEvent& event );
void OnIdle(wxIdleEvent& event);
void OnClose(wxCloseEvent& event);
#ifdef __WXMSW__
void OnMouseMove( wxTaskBarIconEvent& event );
void OnMouseMove(wxTaskBarIconEvent& event);
#endif
void OnLButtonDClick( wxTaskBarIconEvent& event );
void OnLButtonDClick(wxTaskBarIconEvent& event);
#ifdef __WXMSW__
void OnContextMenu( wxTaskBarIconExEvent& event );
void OnContextMenu(wxTaskBarIconExEvent& event);
#else
void OnContextMenu( wxTaskBarIconEvent& event );
void OnContextMenu(wxTaskBarIconEvent& event);
#endif
void OnRButtonDown( wxTaskBarIconEvent& event );
void OnRButtonUp( wxTaskBarIconEvent& event );
void OnRButtonDown(wxTaskBarIconEvent& event);
void OnRButtonUp(wxTaskBarIconEvent& event);
wxMenu *BuildContextMenu();
void AdjustMenuItems(wxMenu* menu);

47
clientgui/BOINCTaskCtrl.h
View File

@ -27,72 +27,71 @@
class CBOINCBaseView;
class CBOINCTaskCtrl : public wxHtmlWindow
{
class CBOINCTaskCtrl : public wxHtmlWindow {
DECLARE_DYNAMIC_CLASS( CBOINCTaskCtrl )
public:
CBOINCTaskCtrl();
CBOINCTaskCtrl( CBOINCBaseView* pView, wxWindowID iHtmlWindowID, wxInt32 iHtmlWindowFlags );
CBOINCTaskCtrl( CBOINCBaseView* pView, wxWindowID iHtmlWindowID, int iHtmlWindowFlags );
~CBOINCTaskCtrl();
virtual void BeginTaskPage();
virtual void BeginTaskSection( const wxString& strTaskHeaderFilename,
virtual void BeginTaskPage();
virtual void BeginTaskSection( const wxString& strTaskHeaderFilename,
bool bHidden );
#if 0
virtual void BeginTaskSection( const wxString& strLink,
virtual void BeginTaskSection( const wxString& strLink,
const wxString& strTaskHeaderFilename,
bool bHidden );
#endif
virtual void CreateTask( const wxString& strLink,
virtual void CreateTask( const wxString& strLink,
const wxString& strTaskName,
bool bHidden );
virtual void CreateTask( const wxString& strLink,
virtual void CreateTask( const wxString& strLink,
const wxString& strTaskIconFilename,
const wxString& strTaskName,
bool bHidden );
virtual void CreateTaskSeparator( bool bHidden );
virtual void EndTaskSection( bool bHidden );
virtual void UpdateQuickTip( const wxString& strIconFilename,
virtual void CreateTaskSeparator( bool bHidden );
virtual void EndTaskSection( bool bHidden );
virtual void UpdateQuickTip( const wxString& strIconFilename,
const wxString& strTip,
bool bHidden );
#if 0
virtual void UpdateQuickTip( const wxString& strLink,
virtual void UpdateQuickTip( const wxString& strLink,
const wxString& strIconFilename,
const wxString& strTip,
bool bHidden );
#endif
virtual void EndTaskPage();
virtual void EndTaskPage();
virtual void CreateTaskHeader( const wxString& strFilename,
virtual void CreateTaskHeader( const wxString& strFilename,
const wxBitmap& itemTaskBitmap,
const wxString& strTaskName );
virtual void AddVirtualFile( const wxString& strFilename,
virtual void AddVirtualFile( const wxString& strFilename,
wxImage& itemImage,
long lType );
virtual void AddVirtualFile( const wxString& strFilename,
virtual void AddVirtualFile( const wxString& strFilename,
const wxBitmap& itemBitmap,
long lType );
virtual void RemoveVirtualFile( const wxString& strFilename );
virtual void RemoveVirtualFile( const wxString& strFilename );
virtual bool OnSaveState( wxConfigBase* pConfig );
virtual bool OnRestoreState( wxConfigBase* pConfig );
virtual bool OnSaveState( wxConfigBase* pConfig );
virtual bool OnRestoreState( wxConfigBase* pConfig );
virtual void OnLinkClicked( const wxHtmlLinkInfo& link );
virtual void OnCellClicked( wxHtmlCell* cell, wxCoord x, wxCoord y, const wxMouseEvent& event );
virtual void OnCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord y );
virtual void OnLinkClicked( const wxHtmlLinkInfo& link );
virtual void OnCellClicked( wxHtmlCell* cell, wxCoord x, wxCoord y, const wxMouseEvent& event );
virtual void OnCellMouseHover( wxHtmlCell* cell, wxCoord x, wxCoord y );
virtual wxHtmlOpeningStatus OnOpeningURL( wxHtmlURLType type, const wxString& url, wxString *redirect );
private:
CBOINCBaseView* m_pParentView;
CBOINCBaseView* m_pParentView;
wxString m_strTaskPage;
wxString m_strTaskPage;
};

2
clientgui/DlgAbout.cpp
View File

@ -187,7 +187,7 @@ wxBitmap CDlgAbout::GetBitmapResource(const wxString& name) {
* Get icon resources
*/
wxIcon CDlgAbout::GetIconResource(const wxString& name) {
wxIcon CDlgAbout::GetIconResource(const wxString&) {
// Icon retrieval
////@begin CDlgAbout icon retrieval
return wxNullIcon;

37
clientgui/DlgAccountManager.cpp
View File

@ -45,13 +45,13 @@
* CDlgAccountManager type definition
*/
IMPLEMENT_DYNAMIC_CLASS( CDlgAccountManager, wxDialog )
IMPLEMENT_DYNAMIC_CLASS(CDlgAccountManager, wxDialog)
/*!
* CDlgAccountManager event table definition
*/
BEGIN_EVENT_TABLE( CDlgAccountManager, wxDialog )
BEGIN_EVENT_TABLE(CDlgAccountManager, wxDialog)
////@begin CDlgAccountManager event table entries
////@end CDlgAccountManager event table entries
@ -62,11 +62,11 @@ END_EVENT_TABLE()
* CDlgAccountManager constructors
*/
CDlgAccountManager::CDlgAccountManager( )
CDlgAccountManager::CDlgAccountManager()
{
}
CDlgAccountManager::CDlgAccountManager( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
CDlgAccountManager::CDlgAccountManager(wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style)
{
Create(parent, id, caption, pos, size, style);
}
@ -75,7 +75,7 @@ CDlgAccountManager::CDlgAccountManager( wxWindow* parent, wxWindowID id, const w
* CDlgAccountManager creator
*/
bool CDlgAccountManager::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style )
bool CDlgAccountManager::Create(wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style)
{
////@begin CDlgAccountManager member initialisation
m_AcctManagerUsernameCtrl = NULL;
@ -84,7 +84,7 @@ bool CDlgAccountManager::Create( wxWindow* parent, wxWindowID id, const wxString
////@begin CDlgAccountManager creation
SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS);
wxDialog::Create( parent, id, caption, pos, size, style );
wxDialog::Create(parent, id, caption, pos, size, style);
CreateControls();
GetSizer()->Fit(this);
@ -114,37 +114,37 @@ void CDlgAccountManager::CreateControls()
itemBoxSizer3->Add(itemFlexGridSizer4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText5 = new wxStaticText;
itemStaticText5->Create( itemDialog1, wxID_STATIC, _("Username:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText5->Create(itemDialog1, wxID_STATIC, _("Username:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
itemFlexGridSizer4->Add(itemStaticText5, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
m_AcctManagerUsernameCtrl = new wxTextCtrl;
m_AcctManagerUsernameCtrl->Create( itemDialog1, ID_ACCTMANAGERUSERNAME, _T(""), wxDefaultPosition, wxSize(200, -1), 0 );
m_AcctManagerUsernameCtrl->Create(itemDialog1, ID_ACCTMANAGERUSERNAME, _T(""), wxDefaultPosition, wxSize(200, -1), 0);
itemFlexGridSizer4->Add(m_AcctManagerUsernameCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxStaticText* itemStaticText7 = new wxStaticText;
itemStaticText7->Create( itemDialog1, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
itemStaticText7->Create(itemDialog1, wxID_STATIC, _("Password:"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT);
itemFlexGridSizer4->Add(itemStaticText7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL|wxADJUST_MINSIZE, 5);
m_AcctManagerPasswordCtrl = new wxTextCtrl;
m_AcctManagerPasswordCtrl->Create( itemDialog1, ID_ACCTMANAGERPASSWORD, _T(""), wxDefaultPosition, wxSize(200, -1), wxTE_PASSWORD );
m_AcctManagerPasswordCtrl->Create(itemDialog1, ID_ACCTMANAGERPASSWORD, _T(""), wxDefaultPosition, wxSize(200, -1), wxTE_PASSWORD);
itemFlexGridSizer4->Add(m_AcctManagerPasswordCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer9, 0, wxALIGN_TOP|wxALL, 5);
wxButton* itemButton10 = new wxButton;
itemButton10->Create( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton10->Create(itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0);
itemButton10->SetDefault();
itemBoxSizer9->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxButton* itemButton11 = new wxButton;
itemButton11->Create( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton11->Create(itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0);
itemBoxSizer9->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
// Set validators
m_AcctManagerUsernameCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerUsername) );
m_AcctManagerPasswordCtrl->SetValidator( wxGenericValidator(& m_strAcctManagerPassword) );
m_AcctManagerUsernameCtrl->SetValidator(wxGenericValidator(& m_strAcctManagerUsername));
m_AcctManagerPasswordCtrl->SetValidator(wxGenericValidator(& m_strAcctManagerPassword));
////@end CDlgAccountManager content construction
}
@ -152,8 +152,7 @@ void CDlgAccountManager::CreateControls()
* Should we show tooltips?
*/
bool CDlgAccountManager::ShowToolTips()
{
bool CDlgAccountManager::ShowToolTips() {
return TRUE;
}
@ -161,8 +160,7 @@ bool CDlgAccountManager::ShowToolTips()
* Get bitmap resources
*/
wxBitmap CDlgAccountManager::GetBitmapResource( const wxString& name )
{
wxBitmap CDlgAccountManager::GetBitmapResource(const wxString&) {
// Bitmap retrieval
////@begin CDlgAccountManager bitmap retrieval
return wxNullBitmap;
@ -173,8 +171,7 @@ wxBitmap CDlgAccountManager::GetBitmapResource( const wxString& name )
* Get icon resources
*/
wxIcon CDlgAccountManager::GetIconResource( const wxString& name )
{
wxIcon CDlgAccountManager::GetIconResource(const wxString&) {
// Icon retrieval
////@begin CDlgAccountManager icon retrieval
return wxNullIcon;

370
clientgui/MainDocument.cpp
View File

File diff suppressed because it is too large Load Diff

75
clientgui/MainFrame.cpp
View File

@ -67,7 +67,7 @@ CStatusBar::CStatusBar(wxWindow *parent) :
{
wxLogTrace(wxT("Function Start/End"), wxT("CStatusBar::CStatusBar - Function Begin"));
const wxInt32 widths[] = {-1, 200, 20};
const int widths[] = {-1, 200, 20};
SetFieldsCount(WXSIZEOF(widths), widths);
m_pbmpConnected = new wxStaticBitmap(this, -1, wxIcon(connect_xpm));
@ -229,21 +229,20 @@ CMainFrame::CMainFrame(wxString strTitle) :
}
CMainFrame::~CMainFrame()
{
CMainFrame::~CMainFrame() {
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::~CMainFrame - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
CMainDocument* pDoc = wxGetApp().GetDocument();
wxASSERT(NULL != pDoc);
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(NULL != m_pRefreshStateTimer);
wxASSERT(NULL != m_pFrameRenderTimer);
wxASSERT(NULL != m_pFrameListPanelRenderTimer);
wxASSERT(NULL != m_pDocumentPollTimer);
wxASSERT(NULL != m_pMenubar);
wxASSERT(NULL != m_pNotebook);
wxASSERT(NULL != m_pStatusbar);
wxASSERT(m_pRefreshStateTimer);
wxASSERT(m_pFrameRenderTimer);
wxASSERT(m_pFrameListPanelRenderTimer);
wxASSERT(m_pDocumentPollTimer);
wxASSERT(m_pMenubar);
wxASSERT(m_pNotebook);
wxASSERT(m_pStatusbar);
SaveState();
@ -299,13 +298,13 @@ bool CMainFrame::CreateMenu() {
ID_HIDE,
_("Close"),
_("Closes the main BOINC Manager window")
);
);
#else
menuFile->Append(
ID_HIDE,
_("&Hide"),
_("Hides the main BOINC Manager window")
);
);
#endif
menuFile->AppendSeparator();
@ -313,17 +312,17 @@ bool CMainFrame::CreateMenu() {
ID_ACTIVITYRUNALWAYS,
_("&Run always"),
_("Does work regardless of preferences")
);
);
menuFile->AppendRadioItem(
ID_ACTIVITYRUNBASEDONPREPERENCES,
_("Run based on &preferences"),
_("Does work according to your preferences")
);
);
menuFile->AppendRadioItem(
ID_ACTIVITYSUSPEND,
_("&Suspend"),
_("Stops work regardless of preferences")
);
);
menuFile->AppendSeparator();
@ -331,7 +330,7 @@ bool CMainFrame::CreateMenu() {
ID_NETWORKSUSPEND,
_("&Disable BOINC Network Access"),
_("Stops BOINC network activity")
);
);
menuFile->AppendSeparator();
@ -339,7 +338,7 @@ bool CMainFrame::CreateMenu() {
ID_RUNBENCHMARKS,
_("Run &Benchmarks"),
_("Runs BOINC CPU benchmarks")
);
);
menuFile->AppendSeparator();
@ -347,7 +346,7 @@ bool CMainFrame::CreateMenu() {
ID_SELECTCOMPUTER,
_("Select Computer..."),
_("Connect to another computer running BOINC")
);
);
menuFile->AppendSeparator();
@ -355,7 +354,7 @@ bool CMainFrame::CreateMenu() {
wxID_EXIT,
_("E&xit"),
_("Exit the BOINC Manager")
);
);
// Tools menu
wxMenu *menuTools = new wxMenu;
@ -364,7 +363,7 @@ bool CMainFrame::CreateMenu() {
ID_TOOLSUPDATEACCOUNTS,
_("&Update Accounts"),
_("Connect to your account manager website and update all of your accounts")
);
);
menuTools->AppendSeparator();
}
@ -373,7 +372,7 @@ bool CMainFrame::CreateMenu() {
ID_TOOLSOPTIONS,
_("&Options"),
_("Configure GUI options and proxy settings")
);
);
// Help menu
wxMenu *menuHelp = new wxMenu;
@ -381,22 +380,22 @@ bool CMainFrame::CreateMenu() {
wxID_ABOUT,
_("&About BOINC Manager..."),
_("Show information about BOINC and BOINC Manager")
);
);
// construct menu
m_pMenubar = new wxMenuBar;
m_pMenubar->Append(
menuFile,
_("&File")
);
);
m_pMenubar->Append(
menuTools,
_("&Tools")
);
);
m_pMenubar->Append(
menuHelp,
_("&Help")
);
);
SetMenuBar(m_pMenubar);
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateMenu - Function End"));
@ -450,7 +449,7 @@ bool CMainFrame::CreateNotebookPage(T pwndNewNotebookPage) {
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::CreateNotebookPage - Function Begin"));
wxImageList* pImageList;
wxInt32 iImageIndex = 0;
int iImageIndex = 0;
wxASSERT(NULL != pwndNewNotebookPage);
wxASSERT(NULL != m_pNotebook);
@ -608,7 +607,7 @@ bool CMainFrame::SaveState() {
pConfig->Write(
strBuffer,
m_aSelectedComputerMRU.Item(iIndex)
);
);
}
pConfig->SetPath(strPreviousLocation);
@ -652,7 +651,7 @@ bool CMainFrame::RestoreState() {
//
// Restore Frame State
//
wxInt32 iCurrentPage;
int iCurrentPage;
pConfig->SetPath(strBaseConfigLocation);
@ -795,7 +794,7 @@ void CMainFrame::OnNetworkSelection(wxCommandEvent& event) {
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnNetworkSelection - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
wxInt32 iCurrentNetworkMode = -1;
int iCurrentNetworkMode = -1;
wxASSERT(NULL != pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
@ -912,7 +911,7 @@ void CMainFrame::OnToolsUpdateAccounts(wxCommandEvent& WXUNUSED(event))
CMainDocument* pDoc = wxGetApp().GetDocument();
CDlgAccountManager* pDlg = new CDlgAccountManager(this);
wxInt32 iAnswer = 0;
int iAnswer = 0;
wxString strLogin = wxEmptyString;
wxString strPassword = wxEmptyString;
@ -945,10 +944,10 @@ void CMainFrame::OnToolsOptions(wxCommandEvent& WXUNUSED(event)) {
CMainDocument* pDoc = wxGetApp().GetDocument();
CDlgOptions* pDlg = new CDlgOptions(this);
wxInt32 iAnswer = 0;
int iAnswer = 0;
bool bProxyInformationConfigured = false;
bool bBuffer = false;
wxInt32 iBuffer = 0;
int iBuffer = 0;
wxString strBuffer = wxEmptyString;
wxASSERT(NULL != pDoc);
@ -1109,7 +1108,7 @@ void CMainFrame::OnConnect(CMainFrameEvent&) {
CMainDocument* pDoc = wxGetApp().GetDocument();
CDlgAttachProject* pDlg = new CDlgAttachProject(this);
wxInt32 iAnswer = 0;
int iAnswer = 0;
long lProjectCount = 0;
wxASSERT(m_pNotebook);
@ -1256,8 +1255,8 @@ void CMainFrame::OnFrameRender(wxTimerEvent &event) {
// Update the menu bar
wxMenuBar* pMenuBar = GetMenuBar();
wxInt32 iActivityMode = -1;
wxInt32 iNetworkMode = -1;
int iActivityMode = -1;
int iNetworkMode = -1;
wxASSERT(NULL != pMenuBar);
wxASSERT(wxDynamicCast(pMenuBar, wxMenuBar));
@ -1373,7 +1372,7 @@ void CMainFrame::OnListPanelRender(wxTimerEvent&) {
}
void CMainFrame::OnDocumentPoll( wxTimerEvent& event ) {
void CMainFrame::OnDocumentPoll(wxTimerEvent& event) {
CMainDocument* pDoc = wxGetApp().GetDocument();
wxASSERT(pDoc);

14
clientgui/Makefile.am
View File

@ -29,17 +29,7 @@ boinc_gui_SOURCES = \
ViewResources.cpp \
ViewStatistics.cpp \
ViewTransfers.cpp \
ViewWork.cpp \
../lib/acct_mgr_client.C \
../lib/diagnostics.C \
../lib/gui_rpc_client.C \
../lib/filesys.C \
../lib/mfile.C \
../lib/miofile.C \
../lib/parse.C \
../lib/util.C \
../lib/md5_file.C \
../lib/md5.c
ViewWork.cpp
EXTRA_DIST = *.h \
res \
@ -48,7 +38,7 @@ EXTRA_DIST = *.h \
boinc_gui_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) $(CLIENTGUIFLAGS)
boinc_gui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CXXFLAGS) $(CLIENTGUIFLAGS)
boinc_gui_LDADD = $(CLIENTGUILIBS)
boinc_gui_LDADD = $(CLIENTGUILIBS) -L ../lib -lboinc
all-local: client_gui-bin
client_gui-bin: @CLIENT_GUI_BIN_FILENAME@