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=8486
This commit is contained in:
Rom Walton 2005-10-05 19:01:28 +00:00
parent a9f33076dd
commit bf7985ca68
6 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
checkin_notes
View File

@ -12742,3 +12742,13 @@ Charlie 4 Oct 2005
project.pbxproj
mac_installer/
release_boinc.sh
Rom 5 Oct 2005
- Remove the 'update all' button from the projects tab and add the
'retry communications' menu item off the commands menu.
clientgui/
Events.h
MainFrame.cpp, .h
ViewProjects.cpp, .h

28
clientgui/Events.h
View File

@ -35,19 +35,20 @@
#define ID_FILENETWORKRUNALWAYS 6012
#define ID_FILENETWORKRUNBASEDONPREPERENCES 6013
#define ID_FILENETWORKSUSPEND 6014
#define ID_FILERUNBENCHMARKS 6015
#define ID_FILESELECTCOMPUTER 6016
#define ID_PROJECTSATTACHACCOUNTMANAGER 6017
#define ID_PROJECTSATTACHPROJECT 6018
#define ID_OPTIONSOPTIONS 6019
#define ID_HELPBOINC 6020
#define ID_HELPBOINCMANAGER 6021
#define ID_TB_ACTIVITYRUNALWAYS 6022
#define ID_TB_ACTIVITYRUNBASEDONPREPERENCES 6023
#define ID_TB_ACTIVITYSUSPEND 6024
#define ID_TB_NETWORKRUNALWAYS 6025
#define ID_TB_NETWORKRUNBASEDONPREPERENCES 6026
#define ID_TB_NETWORKSUSPEND 6027
#define ID_COMMADSRETRYCOMMUNICATIONS 6015
#define ID_FILERUNBENCHMARKS 6016
#define ID_FILESELECTCOMPUTER 6017
#define ID_PROJECTSATTACHACCOUNTMANAGER 6018
#define ID_PROJECTSATTACHPROJECT 6019
#define ID_OPTIONSOPTIONS 6020
#define ID_HELPBOINC 6021
#define ID_HELPBOINCMANAGER 6022
#define ID_TB_ACTIVITYRUNALWAYS 6023
#define ID_TB_ACTIVITYRUNBASEDONPREPERENCES 6024
#define ID_TB_ACTIVITYSUSPEND 6025
#define ID_TB_NETWORKRUNALWAYS 6026
#define ID_TB_NETWORKRUNBASEDONPREPERENCES 6027
#define ID_TB_NETWORKSUSPEND 6028
#define ID_LIST_BASE 7000
#define ID_LIST_PROJECTSVIEW 7000
#define ID_LIST_WORKVIEW 7001
@ -63,7 +64,6 @@
#define ID_TASK_STATISTICSVIEW 8004
#define ID_TASK_RESOURCEUTILIZATIONVIEW 8005
#define ID_TASK_PROJECT_UPDATE 9000
#define ID_TASK_PROJECT_UPDATE_ALL 9001
#define ID_TASK_PROJECT_SUSPEND 9002
#define ID_TASK_PROJECT_RESUME 9003
#define ID_TASK_PROJECT_NONEWWORK 9004

28
clientgui/MainFrame.cpp
View File

@ -149,13 +149,14 @@ DEFINE_EVENT_TYPE(wxEVT_MAINFRAME_REFRESHVIEW)
IMPLEMENT_DYNAMIC_CLASS(CMainFrame, wxFrame)
BEGIN_EVENT_TABLE (CMainFrame, wxFrame)
EVT_MENU_RANGE(ID_FILEACTIVITYRUNALWAYS, ID_FILEACTIVITYSUSPEND, CMainFrame::OnActivitySelection)
EVT_MENU_RANGE(ID_FILENETWORKRUNALWAYS, ID_FILENETWORKSUSPEND, CMainFrame::OnNetworkSelection)
EVT_MENU(ID_FILERUNBENCHMARKS, CMainFrame::OnRunBenchmarks)
EVT_MENU(ID_FILESELECTCOMPUTER, CMainFrame::OnSelectComputer)
EVT_MENU(wxID_EXIT, CMainFrame::OnExit)
EVT_MENU_RANGE(ID_FILEACTIVITYRUNALWAYS, ID_FILEACTIVITYSUSPEND, CMainFrame::OnActivitySelection)
EVT_MENU_RANGE(ID_FILENETWORKRUNALWAYS, ID_FILENETWORKSUSPEND, CMainFrame::OnNetworkSelection)
EVT_MENU(ID_PROJECTSATTACHACCOUNTMANAGER, CMainFrame::OnProjectsAttachToAccountManager)
EVT_MENU(ID_PROJECTSATTACHPROJECT, CMainFrame::OnProjectsAttachToProject)
EVT_MENU(ID_COMMADSRETRYCOMMUNICATIONS, CMainFrame::OnCommandsRetryCommunications)
EVT_MENU(ID_OPTIONSOPTIONS, CMainFrame::OnOptionsOptions)
EVT_HELP(ID_FRAME, CMainFrame::OnHelp)
EVT_MENU(ID_HELPBOINCMANAGER, CMainFrame::OnHelpBOINCManager)
@ -375,6 +376,12 @@ bool CMainFrame::CreateMenu() {
menuCommands->AppendSeparator();
menuCommands->Append(
ID_COMMADSRETRYCOMMUNICATIONS,
_("Retry &Communications"),
_("Report completed work, get latest credit, "
"get latest preferences, and possibly get more work.")
);
menuCommands->Append(
ID_FILERUNBENCHMARKS,
_("Run &benchmarks"),
@ -1041,6 +1048,23 @@ void CMainFrame::OnProjectsAttachToProject( wxCommandEvent& WXUNUSED(event) ) {
}
void CMainFrame::OnCommandsRetryCommunications( wxCommandEvent& WXUNUSED(event) ) {
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnCommandsRetryCommunications - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
UpdateStatusText(_("Retrying communications for project(s)..."));
pDoc->rpc.network_available();
UpdateStatusText(wxT(""));
FireRefreshView();
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnCommandsRetryCommunications - Function End"));
}
void CMainFrame::OnOptionsOptions(wxCommandEvent& WXUNUSED(event)) {
wxLogTrace(wxT("Function Start/End"), wxT("CMainFrame::OnOptionsOptions - Function Begin"));

2
clientgui/MainFrame.h
View File

@ -65,6 +65,8 @@ public:
void OnSelectComputer( wxCommandEvent& event );
void OnExit( wxCommandEvent& event );
void OnCommandsRetryCommunications( wxCommandEvent& event );
void OnProjectsAttachToAccountManager( wxCommandEvent& event );
void OnProjectsAttachToProject( wxCommandEvent& event );

45
clientgui/ViewProjects.cpp
View File

@ -47,11 +47,10 @@
// buttons in the "tasks" area
#define BTN_UPDATE 0
#define BTN_UPDATE_ALL 1
#define BTN_SUSPEND 2
#define BTN_NOWORK 3
#define BTN_RESET 4
#define BTN_DETACH 5
#define BTN_SUSPEND 1
#define BTN_NOWORK 2
#define BTN_RESET 3
#define BTN_DETACH 4
CProject::CProject() {
@ -73,7 +72,6 @@ IMPLEMENT_DYNAMIC_CLASS(CViewProjects, CBOINCBaseView)
BEGIN_EVENT_TABLE (CViewProjects, CBOINCBaseView)
EVT_BUTTON(ID_TASK_PROJECT_UPDATE, CViewProjects::OnProjectUpdate)
EVT_BUTTON(ID_TASK_PROJECT_UPDATE_ALL, CViewProjects::OnProjectUpdateAll)
EVT_BUTTON(ID_TASK_PROJECT_SUSPEND, CViewProjects::OnProjectSuspend)
EVT_BUTTON(ID_TASK_PROJECT_NONEWWORK, CViewProjects::OnProjectNoNewWork)
EVT_BUTTON(ID_TASK_PROJECT_RESET, CViewProjects::OnProjectReset)
@ -110,14 +108,6 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
"get latest preferences, and possibly get more work."),
ID_TASK_PROJECT_UPDATE
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
_("Update all"),
_("Report completed work, get latest credit, "
"get latest preferences, and possibly get more work."),
ID_TASK_PROJECT_UPDATE_ALL
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
@ -211,31 +201,6 @@ void CViewProjects::OnProjectUpdate( wxCommandEvent& WXUNUSED(event) ) {
}
void CViewProjects::OnProjectUpdateAll( wxCommandEvent& WXUNUSED(event) ) {
wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectUpdateAll - Function Begin"));
CMainDocument* pDoc = wxGetApp().GetDocument();
CMainFrame* pFrame = wxGetApp().GetFrame();
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(pFrame);
wxASSERT(wxDynamicCast(pFrame, CMainFrame));
wxASSERT(m_pTaskPane);
wxASSERT(m_pListPane);
pFrame->UpdateStatusText(_("Updating all project(s)..."));
pDoc->rpc.network_available();
pFrame->UpdateStatusText(wxT(""));
m_bForceUpdateSelection = true;
UpdateSelection();
pFrame->FireRefreshView();
wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectUpdateAll - Function End"));
}
void CViewProjects::OnProjectSuspend( wxCommandEvent& WXUNUSED(event) ) {
wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectSuspend - Function Begin"));
@ -576,7 +541,6 @@ void CViewProjects::UpdateSelection() {
if (m_pListPane->GetSelectedItemCount()) {
project = pDoc->project(m_pListPane->GetFirstSelected());
m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_UPDATE]);
m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_UPDATE_ALL]);
m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_SUSPEND]);
if (project) {
if (project->suspended_via_gui) {
@ -605,7 +569,6 @@ void CViewProjects::UpdateSelection() {
m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_DETACH]);
} else {
m_pTaskPane->DisableTaskGroupTasks(pGroup);
m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_UPDATE_ALL]);
}
// Update the websites list

1
clientgui/ViewProjects.h
View File

@ -58,7 +58,6 @@ public:
virtual const char** GetViewIcon();
void OnProjectUpdate( wxCommandEvent& event );
void OnProjectUpdateAll( wxCommandEvent& event );
void OnProjectSuspend( wxCommandEvent& event );
void OnProjectNoNewWork( wxCommandEvent& event );
void OnProjectReset( wxCommandEvent& event );