From d954b96e30899b159ed5ac8e558426feee3bf247 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 19 Mar 2007 20:00:43 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=12245 --- checkin_notes | 6 ++++++ clientgui/ProjectListCtrl.cpp | 17 ++++++++++++++++- clientgui/ProjectListCtrl.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/checkin_notes b/checkin_notes index 59c8aaa4fd..f5e5b272c4 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2611,3 +2611,9 @@ David 19 Mar 2007 client_types.C cs_statefile.C scheduler_op.C + +Rom 19 Mar 2007 + - MGR: Strip out all the extra fluff, and add a website link. + + clientgui/ + ProjectListCtrl.cpp, .h diff --git a/clientgui/ProjectListCtrl.cpp b/clientgui/ProjectListCtrl.cpp index 2c2eccc59d..5f18a6ff0d 100644 --- a/clientgui/ProjectListCtrl.cpp +++ b/clientgui/ProjectListCtrl.cpp @@ -23,6 +23,7 @@ #include "stdwx.h" #include "BOINCGUIApp.h" +#include "hyperlink.h" #include "ProjectListCtrl.h" ////@begin XPM images @@ -218,6 +219,7 @@ bool CProjectListItemCtrl::Create( wxWindow* parent ) { ////@begin CProjectListItemCtrl member initialisation m_pTitleStaticCtrl = NULL; + m_pWebsiteCtrl = NULL; m_pHomeStaticCtrl = NULL; m_pImageCtrl = NULL; m_pGeneralAreaDescriptionStaticCtrl = NULL; @@ -251,11 +253,19 @@ void CProjectListItemCtrl::CreateControls() wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxVERTICAL); SetSizer(itemBoxSizer3); + wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL); + itemBoxSizer3->Add(itemBoxSizer4); + m_pTitleStaticCtrl = new CProjectListItemStaticCtrl; m_pTitleStaticCtrl->Create( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_pTitleStaticCtrl->SetFont(wxFont(8, wxSWISS, wxNORMAL, wxBOLD, false, _T("Tahoma"))); - itemBoxSizer3->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 1); + itemBoxSizer4->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 1); + m_pWebsiteCtrl = new wxHyperLink; + m_pWebsiteCtrl->Create( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + itemBoxSizer4->Add(m_pWebsiteCtrl, 0, wxALIGN_LEFT|wxALL, 1); + +/* m_pHomeStaticCtrl = new CProjectListItemStaticCtrl; m_pHomeStaticCtrl->Create( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer3->Add(m_pHomeStaticCtrl, 0, wxALIGN_LEFT|wxALL, 1); @@ -296,6 +306,7 @@ void CProjectListItemCtrl::CreateControls() m_pDescriptionStaticCtrl = new CProjectListItemStaticCtrl; m_pDescriptionStaticCtrl->Create( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); itemBoxSizer8->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT||wxALIGN_CENTER_VERTICAL|wxALL, 1); +*/ ////@end CProjectListItemCtrl content construction } @@ -380,6 +391,10 @@ bool CProjectListItemCtrl::SetDescription( wxString strDescription ) { bool CProjectListItemCtrl::SetURL( wxString strURL ) { + if (m_pWebsiteCtrl) { + m_pWebsiteCtrl->SetLabel(wxT("Website")); + m_pWebsiteCtrl->SetURL(strURL); + } m_strURL = strURL; return true; } diff --git a/clientgui/ProjectListCtrl.h b/clientgui/ProjectListCtrl.h index 3c8a370953..4d4ec2a86c 100644 --- a/clientgui/ProjectListCtrl.h +++ b/clientgui/ProjectListCtrl.h @@ -27,6 +27,7 @@ class CProjectListItemCtrl; class CProjectListItemStaticCtrl; +class wxHyperLink; class ProjectListCtrlEvent; class ProjectListItemCtrlEvent; @@ -165,6 +166,7 @@ public: private: CProjectListItemStaticCtrl* m_pTitleStaticCtrl; + wxHyperLink* m_pWebsiteCtrl; CProjectListItemStaticCtrl* m_pHomeStaticCtrl; wxStaticBitmap* m_pImageCtrl; CProjectListItemStaticCtrl* m_pGeneralAreaDescriptionStaticCtrl;