*** empty log message ***

svn path=/trunk/boinc/; revision=5915
This commit is contained in:
David Anderson 2005-04-21 22:21:54 +00:00
parent d338b9eeca
commit 4be0b4b634
5 changed files with 79 additions and 42 deletions

View File

@ -26984,13 +26984,13 @@ Rom 9 April 2005
MainFrame.cpp, .h
David 10 April 2005
- debug BOINC manager connection code
- debug BOINC manager connection code
clientgui/
MainDocument.cpp
MainFrame.cpp
lib/
gui_rpc_client.C
clientgui/
MainDocument.cpp
MainFrame.cpp
lib/
gui_rpc_client.C
David 10 April 2005
- add is_file() to lib interface
@ -27127,16 +27127,16 @@ Rom 12 April 2005
gui_rpc_client.C
David 13 April 2005
client/
app_control.C
client_state.C,h
client_types.C,h
cs_apps.C
cs_scheduler.C
scheduler_op.C,h
lib/
boinc_win.h
prefs.C,h
client/
app_control.C
client_state.C,h
client_types.C,h
cs_apps.C
cs_scheduler.C
scheduler_op.C,h
lib/
boinc_win.h
prefs.C,h
Rom 13 April 2005
- Bug Fix: Re-enable INADDR_ANY for the *nix platforms since they cannot
@ -27296,12 +27296,12 @@ Charlie 16 April 2005
project.pbxproj
David 16 April 2005
- fixed GUI RPC connection problem on Mac
(if a connect on a socket fails, you need to close it
and make a new one before trying another connect)
- fixed GUI RPC connection problem on Mac
(if a connect on a socket fails, you need to close it
and make a new one before trying another connect)
lib/
gui_rpc_client.C
lib/
gui_rpc_client.C
Bruce 17 April 2005
- Made default choice 'ACCEPT' for screening user profiles for UOTD.
@ -27397,11 +27397,11 @@ Bruce 19 April 2005
problem_host.php
David 19 April 2005
- BOINC manager: remote connection wasn't working because
it was using the wrong password variable.
- BOINC manager: remote connection wasn't working because
it was using the wrong password variable.
clientgui/
MainDocument.cpp
clientgui/
MainDocument.cpp
David 19 April 2005
- error checking in boinc_cmd
@ -27513,3 +27513,11 @@ Rom 20 April 2005
clientgui/
BOINCGUIApp.cpp
David 21 April 2005
- change buttons in task tab based on selection
clientgui/
BOINCBaseView.h
MainDocument.cpp,h
ViewProjects.cpp

View File

@ -53,6 +53,7 @@ public:
CTaskItemGroup( wxString strName ) :
m_strName(strName), m_pStaticBox(NULL), m_pStaticBoxSizer(NULL) { m_Tasks.clear(); };
~CTaskItemGroup() {};
wxButton* button(int i) {return m_Tasks[i]->m_pButton;}
wxString m_strName;

View File

@ -1059,6 +1059,10 @@ int CMainDocument::ProjectAllowMoreWork(int iIndex) {
return iRetVal;
}
PROJECT* CMainDocument::project(int i) {
return project_status.projects[i];
}
int CMainDocument::CachedResultsStatusUpdate() {
int iRetVal = 0;

View File

@ -163,7 +163,7 @@ private:
int CachedProjectStatusUpdate();
public:
PROJECT* project(int);
int GetProjectCount();
int GetProjectProjectName(int iIndex, wxString& strBuffer);
int GetProjectProjectURL(int iIndex, wxString& strBuffer);

View File

@ -42,6 +42,13 @@
#define COLUMN_RESOURCESHARE 5
#define COLUMN_STATUS 6
// buttons in the "tasks" area
#define BTN_UPDATE 0
#define BTN_SUSPEND 1
#define BTN_NOWORK 2
#define BTN_RESET 3
#define BTN_DETACH 4
#define BTN_ATTACH 5
CProject::CProject() {
m_strProjectName = wxEmptyString;
@ -112,13 +119,6 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
"(you can resume later)."),
ID_TASK_PROJECT_SUSPEND
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
_("Resume project"),
_("Resume work for this project"),
ID_TASK_PROJECT_RESUME
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
@ -129,14 +129,6 @@ CViewProjects::CViewProjects(wxNotebook* pNotebook) :
"still be processed and returned."),
ID_TASK_PROJECT_NONEWWORK
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
_("Allow Work Downloads"),
_("Allow the project to fetch "
"additional work."),
ID_TASK_PROJECT_ALLOWNEWWORK
);
pGroup->m_Tasks.push_back( pItem );
pItem = new CTaskItem(
@ -580,8 +572,40 @@ wxInt32 CViewProjects::UpdateCache(long item, long column, wxString& strNewData)
void CViewProjects::UpdateSelection() {
}
CTaskItemGroup* pGroup = m_TaskGroups[0];
if (m_pListPane->GetSelectedItemCount() == 0) {
pGroup->button(BTN_UPDATE)->Disable;
pGroup->button(BTN_SUSPEND)->Disable();
pGroup->button(BTN_NOWORK)->Disable();
pGroup->button(BTN_RESET)->Disable();
pGroup->button(BTN_DETACH)->Disable();
pGroup->button(BTN_ATTACH)->Enable();
} else {
CMainDocument* pDoc = wxGetApp().GetDocument();
PROJECT* project = pDoc->project(m_pListPane->GetFirstSelected());
pGroup->button(BTN_UPDATE)->Enable();
pGroup->button(BTN_SUSPEND)->Enable();
if (project->suspended_via_gui) {
pGroup->button(BTN_SUSPEND)->SetLabel(wxString("Resume"));
pGroup->button(BTN_SUSPEND)->SetToolTip(wxString("Resume work for this project"));
} else {
pGroup->button(BTN_SUSPEND)->SetLabel(wxString("Suspend"));
pGroup->button(BTN_SUSPEND)->SetToolTip(wxString("Suspend work for this project"));
}
pGroup->button(BTN_NOWORK)->Enable();
if (project->dont_request_more_work) {
pGroup->button(BTN_NOWORK)->SetLabel(wxString("Allow new work"));
pGroup->button(BTN_NOWORK)->SetToolTip(wxString("Allow fetching new work for this project"));
} else {
pGroup->button(BTN_NOWORK)->SetLabel(wxString("No new work"));
pGroup->button(BTN_NOWORK)->SetToolTip(wxString("Don't allow fetching new work for this project"));
}
pGroup->button(BTN_RESET)->Enable();
pGroup->button(BTN_DETACH)->Enable();
pGroup->button(BTN_ATTACH)->Enable();
}
}
void CViewProjects::UpdateTaskPane() {