From 6f825ae2a509150e1d1dece96fa3730cea0320a4 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 20 Jun 2007 01:04:18 +0000 Subject: [PATCH] v6 graphics work. svn path=/trunk/boinc/; revision=12965 --- clientgui/Events.h | 1 - clientgui/ViewWork.cpp | 81 ++++++---------------------------- clientgui/ViewWork.h | 1 - win_build/boincmgr_curl.vcproj | 2 - 4 files changed, 14 insertions(+), 71 deletions(-) diff --git a/clientgui/Events.h b/clientgui/Events.h index 170c336b7c..2ddbe62430 100644 --- a/clientgui/Events.h +++ b/clientgui/Events.h @@ -106,7 +106,6 @@ #define ID_TASK_WORK_RESUME 9201 #define ID_TASK_WORK_SHOWGRAPHICS 9202 #define ID_TASK_WORK_ABORT 9203 -#define ID_TASK_WORK_SHOWGRAPHICSNEW 9204 #define ID_TASK_TRANSFERS_RETRYNOW 9300 #define ID_TASK_TRANSFERS_ABORT 9301 #define ID_TASK_MESSAGES_COPYALL 9400 diff --git a/clientgui/ViewWork.cpp b/clientgui/ViewWork.cpp index 0498127cef..ef273793cd 100644 --- a/clientgui/ViewWork.cpp +++ b/clientgui/ViewWork.cpp @@ -77,7 +77,6 @@ IMPLEMENT_DYNAMIC_CLASS(CViewWork, CBOINCBaseView) BEGIN_EVENT_TABLE (CViewWork, CBOINCBaseView) EVT_BUTTON(ID_TASK_WORK_SUSPEND, CViewWork::OnWorkSuspend) EVT_BUTTON(ID_TASK_WORK_SHOWGRAPHICS, CViewWork::OnWorkShowGraphics) - EVT_BUTTON(ID_TASK_WORK_SHOWGRAPHICSNEW, CViewWork::OnWorkShowGraphicsNew) EVT_BUTTON(ID_TASK_WORK_ABORT, CViewWork::OnWorkAbort) EVT_CUSTOM_RANGE(wxEVT_COMMAND_BUTTON_CLICKED, ID_TASK_PROJECT_WEB_PROJDEF_MIN, ID_TASK_PROJECT_WEB_PROJDEF_MAX, CViewWork::OnProjectWebsiteClicked) EVT_LIST_ITEM_SELECTED(ID_LIST_WORKVIEW, CViewWork::OnListSelected) @@ -110,13 +109,6 @@ CViewWork::CViewWork(wxNotebook* pNotebook) : _("Show application graphics in a window."), ID_TASK_WORK_SHOWGRAPHICS ); - pGroup->m_Tasks.push_back( pItem ); - - pItem = new CTaskItem( - _("Show new graphics"), - _("Show application v6 graphics in a window."), - ID_TASK_WORK_SHOWGRAPHICSNEW - ); pGroup->m_Tasks.push_back( pItem ); pItem = new CTaskItem( @@ -134,7 +126,6 @@ CViewWork::CViewWork(wxNotebook* pNotebook) : ); pGroup->m_Tasks.push_back( pItem ); - // Create Task Pane Items m_pTaskPane->UpdateControls(); @@ -222,64 +213,6 @@ void CViewWork::OnWorkShowGraphics( wxCommandEvent& WXUNUSED(event) ) { pFrame->UpdateStatusText(_("Showing graphics for task...")); - // TODO: implement hide as well as show -#if (defined(_WIN32) || defined(__WXMAC__)) - pDoc->GetConnectedComputerName(strMachineName); - if (!pDoc->IsComputerNameLocal(strMachineName)) { - iAnswer = ::wxMessageBox( - _("Are you sure you want to display graphics on a remote machine?"), - _("Show graphics"), - wxYES_NO | wxICON_QUESTION, - this - ); - } else { - iAnswer = wxYES; - } -#else - iAnswer = wxYES; -#endif - - if (wxYES == iAnswer) { - RESULT* result = pDoc->result(m_pListPane->GetFirstSelected()); - std::string strDefaultWindowStation = std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str()); - std::string strDefaultDesktop = std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str()); - std::string strDefaultDisplay = std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str()); - pDoc->WorkShowGraphics( - result->project_url, - result->name, - MODE_WINDOW, - strDefaultWindowStation, - strDefaultDesktop, - strDefaultDisplay - ); - } - - pFrame->UpdateStatusText(wxT("")); - - UpdateSelection(); - pFrame->FireRefreshView(); - - wxLogTrace(wxT("Function Start/End"), wxT("CViewWork::OnWorkShowGraphics - Function End")); -} - - -void CViewWork::OnWorkShowGraphicsNew( wxCommandEvent& WXUNUSED(event) ) { - wxLogTrace(wxT("Function Start/End"), wxT("CViewWork::OnWorkShowGraphicsNew - Function Begin")); - - wxInt32 iAnswer = 0; - wxString strMachineName = wxEmptyString; - CMainDocument* pDoc = wxGetApp().GetDocument(); - CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame); - - wxASSERT(pDoc); - wxASSERT(wxDynamicCast(pDoc, CMainDocument)); - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame)); - wxASSERT(m_pTaskPane); - wxASSERT(m_pListPane); - - pFrame->UpdateStatusText(_("Showing graphics for task...")); - // TODO: implement hide as well as show #if (defined(_WIN32) || defined(__WXMAC__)) pDoc->GetConnectedComputerName(strMachineName); @@ -300,6 +233,7 @@ void CViewWork::OnWorkShowGraphicsNew( wxCommandEvent& WXUNUSED(event) ) { if (wxYES == iAnswer) { RESULT* result = pDoc->result(m_pListPane->GetFirstSelected()); if (!result->graphics_exec_path.empty()) { + // V6 Graphics char* argv[2]; argv[0] = "graphics"; argv[1] = 0; @@ -316,6 +250,19 @@ void CViewWork::OnWorkShowGraphicsNew( wxCommandEvent& WXUNUSED(event) ) { 0, id ); + } else { + // V5 and Older + std::string strDefaultWindowStation = std::string((const char*)wxGetApp().m_strDefaultWindowStation.mb_str()); + std::string strDefaultDesktop = std::string((const char*)wxGetApp().m_strDefaultDesktop.mb_str()); + std::string strDefaultDisplay = std::string((const char*)wxGetApp().m_strDefaultDisplay.mb_str()); + pDoc->WorkShowGraphics( + result->project_url, + result->name, + MODE_WINDOW, + strDefaultWindowStation, + strDefaultDesktop, + strDefaultDisplay + ); } } diff --git a/clientgui/ViewWork.h b/clientgui/ViewWork.h index 9497c6ac66..ea9ebb97b5 100644 --- a/clientgui/ViewWork.h +++ b/clientgui/ViewWork.h @@ -61,7 +61,6 @@ public: void OnWorkSuspend( wxCommandEvent& event ); void OnWorkShowGraphics( wxCommandEvent& event ); - void OnWorkShowGraphicsNew( wxCommandEvent& event ); void OnWorkAbort( wxCommandEvent& event ); void OnProjectWebsiteClicked( wxEvent& event ); diff --git a/win_build/boincmgr_curl.vcproj b/win_build/boincmgr_curl.vcproj index 7ad2fe7d65..4df69c2b6c 100644 --- a/win_build/boincmgr_curl.vcproj +++ b/win_build/boincmgr_curl.vcproj @@ -499,7 +499,6 @@ /> @@ -597,7 +596,6 @@ />