Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- MGR: Update the project list in the wizard to make use 

of more of the information contained in the all projects
        list and also make it more accessible than the previous
        implementation.
        
    clientgui/
        ProjectInfoPage.cpp, .h
        WizardAttach.cpp, .h
    clientgui/res/
        linuxicon.xpm
        macosicon.xpm
        windowsicon.xpm
    clientgui/res/skins/default/graphic/
        advanced_link_image.xpm
    win_build/
        libboinc.vcproj
        libboincapi_staticcrt.vcproj

svn path=/trunk/boinc/; revision=23727
This commit is contained in:
Rom Walton 2011-06-15 21:00:02 +00:00
parent 3185e08fbf
commit 778ab31ea2
11 changed files with 651 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
checkin_notes
View File

@ -3514,3 +3514,22 @@ Bernd 14 Jun 2011
lib/
Makefile.mingw
Rom 15 Jun 2011
- MGR: Update the project list in the wizard to make use
of more of the information contained in the all projects
list and also make it more accessible than the previous
implementation.
clientgui/
ProjectInfoPage.cpp, .h
WizardAttach.cpp, .h
clientgui/res/
linuxicon.xpm
macosicon.xpm
windowsicon.xpm
clientgui/res/skins/default/graphic/
advanced_link_image.xpm
win_build/
libboinc.vcproj
libboincapi_staticcrt.vcproj

575
clientgui/ProjectInfoPage.cpp
View File

@ -37,7 +37,50 @@
#include "BOINCBaseWizard.h"
#include "WizardAttach.h"
#include "ProjectInfoPage.h"
#include "ProjectListCtrl.h"
#include "res/windowsicon.xpm"
#include "res/macosicon.xpm"
#include "res/linuxicon.xpm"
#include "res/atiicon.xpm"
#include "res/nvidiaicon.xpm"
#include "res/multicore.xpm"
/*!
* CProject type
*/
class CProjectInfo : public wxObject
{
DECLARE_DYNAMIC_CLASS( CProjectInfo )
CProjectInfo() {
m_bSupportedPlatformFound = false;
m_bProjectSupportsWindows = false;
m_bProjectSupportsMac = false;
m_bProjectSupportsLinux = false;
m_bProjectSupportsNvidiaGPU = false;
m_bProjectSupportsATIGPU = false;
m_bProjectSupportsMulticore = false;
}
public:
wxString m_strURL;
wxString m_strName;
wxString m_strDescription;
wxString m_strGeneralArea;
wxString m_strSpecificArea;
wxString m_strOrganization;
bool m_bSupportedPlatformFound;
bool m_bProjectSupportsWindows;
bool m_bProjectSupportsMac;
bool m_bProjectSupportsLinux;
bool m_bProjectSupportsNvidiaGPU;
bool m_bProjectSupportsATIGPU;
bool m_bProjectSupportsMulticore;
};
IMPLEMENT_DYNAMIC_CLASS( CProjectInfo, wxObject )
/*!
@ -53,10 +96,10 @@ IMPLEMENT_DYNAMIC_CLASS( CProjectInfoPage, wxWizardPageEx )
BEGIN_EVENT_TABLE( CProjectInfoPage, wxWizardPageEx )
////@begin CProjectInfoPage event table entries
EVT_COMBOBOX( ID_CATEGORIES, CProjectInfoPage::OnProjectCategorySelected )
EVT_LISTBOX( ID_PROJECTS, CProjectInfoPage::OnProjectSelected )
EVT_WIZARDEX_PAGE_CHANGED( -1, CProjectInfoPage::OnPageChanged )
EVT_WIZARDEX_PAGE_CHANGING( -1, CProjectInfoPage::OnPageChanging )
EVT_PROJECTLIST_ITEM_CHANGE( CProjectInfoPage::OnProjectItemChange )
EVT_PROJECTLIST_ITEM_DISPLAY( CProjectInfoPage::OnProjectItemDisplay )
EVT_WIZARDEX_CANCEL( -1, CProjectInfoPage::OnCancel )
////@end CProjectInfoPage event table entries
@ -77,6 +120,21 @@ CProjectInfoPage::CProjectInfoPage( CBOINCBaseWizard* parent )
}
/*!
* CProjectInfoPage destructor
*/
CProjectInfoPage::~CProjectInfoPage( )
{
for (std::vector<CProjectInfo*>::iterator iter = m_Projects.begin(); iter != m_Projects.end(); ++iter)
{
CProjectInfo* pEntry = (CProjectInfo*)*iter;
delete pEntry;
}
m_Projects.clear();
}
/*!
* CProjectInfoPage creator
*/
@ -86,11 +144,31 @@ bool CProjectInfoPage::Create( CBOINCBaseWizard* parent )
////@begin CProjectInfoPage member initialisation
m_pTitleStaticCtrl = NULL;
m_pDescriptionStaticCtrl = NULL;
m_pProjectListCtrl = NULL;
m_pProjectUrlStaticCtrl = NULL;
m_pProjectUrlCtrl = NULL;
m_pProjectCategoriesStaticCtrl = NULL;
m_pProjectCategoriesCtrl = NULL;
m_pProjectsStaticCtrl = NULL;
m_pProjectsCtrl = NULL;
m_pProjectDetailsStaticCtrl = NULL;
m_pProjectDetailsDescriptionStaticCtrl = NULL;
m_pProjectDetailsDescriptionCtrl = NULL;
m_pProjectDetailsResearchAreaStaticCtrl = NULL;
m_pProjectDetailsResearchAreaCtrl = NULL;
m_pProjectDetailsOrganizationStaticCtrl = NULL;
m_pProjectDetailsOrganizationCtrl = NULL;
m_pProjectDetailsURLStaticCtrl = NULL;
m_pProjectDetailsURLCtrl = NULL;
m_pProjectDetailsSupportedPlatformsStaticCtrl = NULL;
m_pProjectDetailsSupportedPlatformWindowsCtrl = NULL;
m_pProjectDetailsSupportedPlatformMacCtrl = NULL;
m_pProjectDetailsSupportedPlatformLinuxCtrl = NULL;
m_pProjectDetailsSupportedPlatformATICtrl = NULL;
m_pProjectDetailsSupportedPlatformNvidiaCtrl = NULL;
m_pProjectDetailsSupportedPlatformMultiCoreCtrl = NULL;
m_pProjectURLStaticCtrl = NULL;
m_pProjectURLCtrl = NULL;
////@end CProjectInfoPage member initialisation
m_strProjectURL = wxEmptyString;
m_Projects.clear();
m_bProjectSupported = false;
m_bProjectListPopulated = false;
@ -118,52 +196,130 @@ void CProjectInfoPage::CreateControls()
itemWizardPage23->SetSizer(itemBoxSizer24);
m_pTitleStaticCtrl = new wxStaticText;
m_pTitleStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pTitleStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
m_pTitleStaticCtrl->SetFont(wxFont(10, wxSWISS, wxNORMAL, wxBOLD, FALSE, _T("Verdana")));
itemBoxSizer24->Add(m_pTitleStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
m_pDescriptionStaticCtrl = new wxStaticText;
m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_pDescriptionStaticCtrl->Create( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer24->Add(m_pDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer3 = new wxFlexGridSizer(2, 1, 0, 0);
itemFlexGridSizer3->AddGrowableRow(0);
itemFlexGridSizer3->AddGrowableCol(0);
itemBoxSizer24->Add(itemFlexGridSizer3, 1, wxGROW|wxALL, 5);
itemBoxSizer24->Add(5, 5, 0, wxALIGN_LEFT|wxALL, 5);
m_pProjectListCtrl = new CProjectListCtrl;
m_pProjectListCtrl->Create( itemWizardPage23 );
itemFlexGridSizer3->Add(m_pProjectListCtrl, 0, wxGROW|wxRIGHT, 10);
wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(1, 1, 0, 0);
itemFlexGridSizer4->AddGrowableRow(0);
itemFlexGridSizer4->AddGrowableCol(0);
itemBoxSizer24->Add(itemFlexGridSizer4, 0, wxGROW|wxALL, 0);
wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(2, 1, 0, 0);
wxFlexGridSizer* itemFlexGridSizer6 = new wxFlexGridSizer(0, 2, 0, 0);
itemFlexGridSizer6->AddGrowableRow(1);
itemFlexGridSizer6->AddGrowableCol(1);
itemFlexGridSizer4->Add(itemFlexGridSizer6, 0, wxGROW|wxGROW|wxALL, 0);
wxBoxSizer* itemBoxSizer7 = new wxBoxSizer(wxVERTICAL);
itemFlexGridSizer6->Add(itemBoxSizer7, 0, wxALIGN_LEFT|wxALIGN_TOP, 0);
m_pProjectCategoriesStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer7->Add(m_pProjectCategoriesStaticCtrl, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxArrayString m_pProjectCategoriesCtrlStrings;
m_pProjectCategoriesCtrl = new wxComboBox( itemWizardPage23, ID_CATEGORIES, wxT(""), wxDefaultPosition, wxDefaultSize, m_pProjectCategoriesCtrlStrings, wxCB_READONLY|wxCB_SORT );
itemBoxSizer7->Add(m_pProjectCategoriesCtrl, 0, wxGROW|wxLEFT|wxRIGHT, 5);
m_pProjectsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer7->Add(m_pProjectsStaticCtrl, 0, wxALIGN_LEFT|wxALL, 5);
wxFlexGridSizer* itemFlexGridSizer11 = new wxFlexGridSizer(0, 1, 0, 0);
itemFlexGridSizer11->AddGrowableRow(0);
itemFlexGridSizer11->AddGrowableCol(0);
itemBoxSizer24->Add(itemFlexGridSizer11, 0, wxGROW|wxALL, 0);
itemBoxSizer7->Add(itemFlexGridSizer11, 0, wxGROW|wxALL, 5);
wxBoxSizer* itemBoxSizer22 = new wxBoxSizer(wxVERTICAL);
itemFlexGridSizer11->Add(itemBoxSizer22, 0, wxGROW|wxALL, 0);
wxArrayString m_pProjectsCtrlStrings;
m_pProjectsCtrl = new wxListBox( itemWizardPage23, ID_PROJECTS, wxDefaultPosition, wxSize(150, 175), m_pProjectsCtrlStrings, wxLB_SINGLE|wxLB_SORT );
itemFlexGridSizer11->Add(m_pProjectsCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 0);
wxFlexGridSizer* itemFlexGridSizer14 = new wxFlexGridSizer(1, 2, 0, 0);
itemFlexGridSizer14->AddGrowableCol(1);
itemBoxSizer24->Add(itemFlexGridSizer14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT, 10);
m_pProjectDetailsStaticCtrl = new wxStaticBox(itemWizardPage23, wxID_ANY, wxT(""));
wxStaticBoxSizer* itemStaticBoxSizer13 = new wxStaticBoxSizer(m_pProjectDetailsStaticCtrl, wxVERTICAL);
itemFlexGridSizer6->Add(itemStaticBoxSizer13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pProjectUrlStaticCtrl = new wxStaticText;
m_pProjectUrlStaticCtrl->Create( itemWizardPage23, ID_PROJECTURLSTATICCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer14->Add(m_pProjectUrlStaticCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pProjectDetailsDescriptionStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemStaticBoxSizer13->Add(m_pProjectDetailsDescriptionStaticCtrl, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT, 5);
m_pProjectUrlCtrl = new wxTextCtrl;
m_pProjectUrlCtrl->Create( itemWizardPage23, ID_PROJECTURLCTRL, wxEmptyString, wxDefaultPosition, wxSize(200, -1), 0 );
itemFlexGridSizer14->Add(m_pProjectUrlCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pProjectDetailsDescriptionCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTDESCRIPTION, wxEmptyString, wxDefaultPosition, wxSize(200, 100), wxTE_MULTILINE|wxTE_READONLY|wxTE_RICH2|wxTE_WORDWRAP );
itemStaticBoxSizer13->Add(m_pProjectDetailsDescriptionCtrl, 0, wxGROW|wxLEFT|wxTOP|wxBOTTOM, 5);
wxFlexGridSizer* itemFlexGridSizer16 = new wxFlexGridSizer(0, 2, 0, 0);
itemFlexGridSizer16->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer16, 0, wxGROW|wxALL, 0);
m_pProjectDetailsResearchAreaStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer16->Add(m_pProjectDetailsResearchAreaStaticCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsResearchAreaCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer16->Add(m_pProjectDetailsResearchAreaCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxFlexGridSizer* itemFlexGridSizer19 = new wxFlexGridSizer(0, 2, 0, 0);
itemFlexGridSizer19->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer19, 0, wxGROW|wxALL, 0);
m_pProjectDetailsOrganizationStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer19->Add(m_pProjectDetailsOrganizationStaticCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsOrganizationCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer19->Add(m_pProjectDetailsOrganizationCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
wxFlexGridSizer* itemFlexGridSizer20 = new wxFlexGridSizer(0, 2, 0, 0);
itemFlexGridSizer20->AddGrowableCol(1);
itemStaticBoxSizer13->Add(itemFlexGridSizer20, 0, wxGROW|wxALL, 0);
m_pProjectDetailsURLStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer20->Add(m_pProjectDetailsURLStaticCtrl, 0, wxALIGN_LEFT|wxRIGHT|wxBOTTOM, 2);
m_pProjectDetailsURLCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer20->Add(m_pProjectDetailsURLCtrl, 0, wxALIGN_LEFT|wxLEFT|wxRIGHT|wxBOTTOM, 5);
wxFlexGridSizer* itemFlexGridSizer24 = new wxFlexGridSizer(2, 1, 0, 0);
itemFlexGridSizer24->AddGrowableRow(1);
itemFlexGridSizer24->AddGrowableCol(0);
itemStaticBoxSizer13->Add(itemFlexGridSizer24, 0, wxGROW|wxALL, 0);
m_pProjectDetailsSupportedPlatformsStaticCtrl = new wxStaticText( itemWizardPage23, wxID_STATIC, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer24->Add(m_pProjectDetailsSupportedPlatformsStaticCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5);
wxBoxSizer* itemBoxSizer26 = new wxBoxSizer(wxHORIZONTAL);
itemFlexGridSizer24->Add(itemBoxSizer26, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 0);
m_pProjectDetailsSupportedPlatformWindowsCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("windowsicon.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformWindowsCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformMacCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("macosicon.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformMacCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformLinuxCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("linuxicon.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformLinuxCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformATICtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("atiicon.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformATICtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformNvidiaCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("nvidiaicon.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformNvidiaCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformMultiCoreCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("multicore.xpm")), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformMultiCoreCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
wxFlexGridSizer* itemFlexGridSizer33 = new wxFlexGridSizer(0, 2, 0, 0);
itemFlexGridSizer33->AddGrowableCol(1);
itemFlexGridSizer4->Add(itemFlexGridSizer33, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
m_pProjectURLStaticCtrl = new wxStaticText( itemWizardPage23, ID_PROJECTURLSTATICCTRL, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer33->Add(m_pProjectURLStaticCtrl, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 5);
m_pProjectURLCtrl = new wxTextCtrl( itemWizardPage23, ID_PROJECTURLCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
itemFlexGridSizer33->Add(m_pProjectURLCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5);
// Set validators
m_pProjectUrlCtrl->SetValidator( CValidateURL( & m_strProjectURL ) );
m_pProjectURLCtrl->SetValidator( CValidateURL( & m_strProjectURL ) );
#ifdef __WXMAC__
//Accessibility
HIViewRef listView = (HIViewRef)m_pProjectListCtrl->GetHandle();
HIObjectRef theObject = (HIObjectRef)HIViewGetSuperview(listView);
HIObjectSetAccessibilityIgnored(theObject, true);
#endif
////@end CProjectInfoPage content construction
}
@ -207,10 +363,41 @@ bool CProjectInfoPage::ShowToolTips()
* Get bitmap resources
*/
wxBitmap CProjectInfoPage::GetBitmapResource( const wxString& WXUNUSED(name) )
wxBitmap CProjectInfoPage::GetBitmapResource( const wxString& name )
{
// Bitmap retrieval
////@begin CProjectInfoPage bitmap retrieval
wxUnusedVar(name);
if (name == wxT("windowsicon.xpm"))
{
wxBitmap bitmap(Win32_xpm);
return bitmap;
}
else if (name == wxT("macosicon.xpm"))
{
wxBitmap bitmap(MacOS_xpm);
return bitmap;
}
else if (name == wxT("linuxicon.xpm"))
{
wxBitmap bitmap(Linux_xpm);
return bitmap;
}
else if (name == wxT("atiicon.xpm"))
{
wxBitmap bitmap(atiicon_xpm);
return bitmap;
}
else if (name == wxT("nvidiaicon.xpm"))
{
wxBitmap bitmap(nvidiaicon_xpm);
return bitmap;
}
else if (name == wxT("multicore.xpm"))
{
wxBitmap bitmap(multicore_xpm);
return bitmap;
}
return wxNullBitmap;
////@end CProjectInfoPage bitmap retrieval
}
@ -229,6 +416,80 @@ wxIcon CProjectInfoPage::GetIconResource( const wxString& WXUNUSED(name) )
}
/*
* wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_CATEGORIES
*/
void CProjectInfoPage::OnProjectCategorySelected( wxCommandEvent& WXUNUSED(event) ) {
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectCategorySelected - Function Begin"));
wxLogTrace(wxT("Function Status"), wxT("CProjectInfoPage::OnProjectCategorySelected - Clearing list box"));
m_pProjectsCtrl->Clear();
// Populate the list box with the list of project names that belong to eith the specific
// category or all of them.
wxLogTrace(wxT("Function Status"), wxT("CProjectInfoPage::OnProjectCategorySelected - Adding desired projects"));
for (unsigned int i=0; i<m_Projects.size(); i++) {
if ((m_pProjectCategoriesCtrl->GetValue() == _("All")) ||
(m_pProjectCategoriesCtrl->GetValue() == m_Projects[i]->m_strGeneralArea)
) {
wxLogTrace(
wxT("Function Status"),
wxT("CProjectInfoPage::OnProjectCategorySelected - Adding '%s'"),
m_Projects[i]->m_strName
);
m_pProjectsCtrl->Append(m_Projects[i]->m_strName, m_Projects[i]);
}
}
// Set the first item to be the selected item and then pop the next event.
m_pProjectsCtrl->SetSelection(0);
wxCommandEvent evtEvent(wxEVT_COMMAND_LISTBOX_SELECTED, ID_PROJECTS);
ProcessEvent(evtEvent);
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectCategorySelected - Function End"));
}
/*
* wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_PROJECTS
*/
void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) {
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectSelected - Function Begin"));
CProjectInfo* pProjectInfo = (CProjectInfo*)m_pProjectsCtrl->GetClientData(m_pProjectsCtrl->GetSelection());
m_pProjectDetailsSupportedPlatformWindowsCtrl->Hide();
m_pProjectDetailsSupportedPlatformMacCtrl->Hide();
m_pProjectDetailsSupportedPlatformLinuxCtrl->Hide();
m_pProjectDetailsSupportedPlatformATICtrl->Hide();
m_pProjectDetailsSupportedPlatformNvidiaCtrl->Hide();
m_pProjectDetailsSupportedPlatformMultiCoreCtrl->Hide();
// Populate the project details area
m_pProjectDetailsDescriptionCtrl->SetLabel(pProjectInfo->m_strDescription);
m_pProjectDetailsResearchAreaCtrl->SetLabel(pProjectInfo->m_strSpecificArea);
m_pProjectDetailsOrganizationCtrl->SetLabel(pProjectInfo->m_strOrganization);
m_pProjectDetailsURLCtrl->SetLabel(pProjectInfo->m_strURL);
if (pProjectInfo->m_bProjectSupportsWindows) m_pProjectDetailsSupportedPlatformWindowsCtrl->Show();
if (pProjectInfo->m_bProjectSupportsMac) m_pProjectDetailsSupportedPlatformMacCtrl->Show();
if (pProjectInfo->m_bProjectSupportsLinux) m_pProjectDetailsSupportedPlatformLinuxCtrl->Show();
if (pProjectInfo->m_bProjectSupportsATIGPU) m_pProjectDetailsSupportedPlatformATICtrl->Show();
if (pProjectInfo->m_bProjectSupportsNvidiaGPU) m_pProjectDetailsSupportedPlatformNvidiaCtrl->Show();
if (pProjectInfo->m_bProjectSupportsMulticore) m_pProjectDetailsSupportedPlatformMultiCoreCtrl->Show();
// Populate non-control data for use in other places of the wizard
SetProjectURL( pProjectInfo->m_strURL );
SetProjectSupported( pProjectInfo->m_bSupportedPlatformFound );
TransferDataToWindow();
Layout();
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnProjectSelected - Function End"));
}
/*!
* wxEVT_WIZARD_PAGE_CHANGED event handler for ID_PROJECTINFOPAGE
*/
@ -237,44 +498,105 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
if (event.GetDirection() == false) return;
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnPageChanged - Function Begin"));
unsigned int i, j, k;
bool bSupportedPlatformFound = false;
bool bProjectSupportsNvidiaGPU = false;
bool bProjectSupportsATIGPU = false;
bool bProjectSupportsMulticore = false;
ALL_PROJECTS_LIST pl;
CMainDocument* pDoc = wxGetApp().GetDocument();
unsigned int i = 0, j = 0, k = 0;
ALL_PROJECTS_LIST pl;
wxArrayString aClientPlatforms;
wxArrayString aProjectPlatforms;
wxArrayString aCategories;
bool bCategoryFound = false;
CProjectInfo* pProjectInfo = NULL;
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
wxASSERT(m_pTitleStaticCtrl);
wxASSERT(m_pDescriptionStaticCtrl);
wxASSERT(m_pProjectListCtrl);
wxASSERT(m_pProjectUrlStaticCtrl);
wxASSERT(m_pProjectUrlCtrl);
wxASSERT(m_pProjectCategoriesStaticCtrl);
wxASSERT(m_pProjectCategoriesCtrl);
wxASSERT(m_pProjectsStaticCtrl);
wxASSERT(m_pProjectsCtrl);
wxASSERT(m_pProjectDetailsStaticCtrl);
wxASSERT(m_pProjectDetailsDescriptionStaticCtrl);
wxASSERT(m_pProjectDetailsDescriptionCtrl);
wxASSERT(m_pProjectDetailsResearchAreaStaticCtrl);
wxASSERT(m_pProjectDetailsResearchAreaCtrl);
wxASSERT(m_pProjectDetailsOrganizationStaticCtrl);
wxASSERT(m_pProjectDetailsOrganizationStaticCtrl);
wxASSERT(m_pProjectDetailsURLStaticCtrl);
wxASSERT(m_pProjectDetailsURLCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformsStaticCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformWindowsCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformMacCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformLinuxCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformATICtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformNvidiaCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformMultiCoreCtrl);
wxASSERT(m_pProjectURLStaticCtrl);
wxASSERT(m_pProjectURLCtrl);
m_pTitleStaticCtrl->SetLabel(
_("Choose a project")
);
m_pDescriptionStaticCtrl->SetLabel(
_("To choose a project, click its name or type its URL below.")
);
m_pProjectUrlStaticCtrl->SetLabel(
_("Project &URL:")
m_pProjectCategoriesStaticCtrl->SetLabel(
_("Projects Categories:")
);
m_pProjectsStaticCtrl->SetLabel(
_("Projects:")
);
m_pProjectDetailsStaticCtrl->SetLabel(
_("Details")
);
m_pProjectDetailsDescriptionStaticCtrl->SetLabel(
_("Description:")
);
m_pProjectDetailsResearchAreaStaticCtrl->SetLabel(
_("Research Area:")
);
m_pProjectDetailsOrganizationStaticCtrl->SetLabel(
_("Organization:")
);
m_pProjectDetailsURLStaticCtrl->SetLabel(
_("Project URL:")
);
m_pProjectDetailsSupportedPlatformsStaticCtrl->SetLabel(
_("Supported Platform(s):")
);
m_pProjectURLStaticCtrl->SetLabel(
_("Project URL:")
);
// Populate the virtual list control with project information
//
// Populate the ProjectInfo data structure with the list of projects we want to show and
// any other activity we need to prep the page.
if (!m_bProjectListPopulated) {
std::vector<std::string> &client_platforms = pDoc->state.platforms;
// Get the project list
pDoc->rpc.get_all_projects_list(pl);
// Convert the supported client platforms into something useful
for (i=0; i<pDoc->state.platforms.size(); i++) {
aClientPlatforms.Add(wxString(pDoc->state.platforms[i].c_str(), wxConvUTF8));
}
// Iterate through the project list and add them to the ProjectInfo data structure
for (i=0; i<pl.projects.size(); i++) {
bSupportedPlatformFound = false;
bProjectSupportsNvidiaGPU = false;
bProjectSupportsATIGPU = false;
bProjectSupportsMulticore = false;
pProjectInfo = new CProjectInfo();
m_Projects.push_back(pProjectInfo);
wxLogTrace(
wxT("Function Status"),
@ -283,85 +605,116 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
wxString(pl.projects[i]->url.c_str(), wxConvUTF8).c_str()
);
std::vector<std::string> &project_platforms = pl.projects[i]->platforms;
// Convert the easy stuff
pProjectInfo->m_strURL = wxString(pl.projects[i]->url.c_str(), wxConvUTF8);
pProjectInfo->m_strName = wxString(pl.projects[i]->name.c_str(), wxConvUTF8);
pProjectInfo->m_strDescription = wxString(pl.projects[i]->description.c_str(), wxConvUTF8);
pProjectInfo->m_strGeneralArea = wxString(pl.projects[i]->general_area.c_str(), wxConvUTF8);
pProjectInfo->m_strSpecificArea = wxString(pl.projects[i]->specific_area.c_str(), wxConvUTF8);
pProjectInfo->m_strOrganization = wxString(pl.projects[i]->home.c_str(), wxConvUTF8);
// Add the category if it isn't already in the category list
bCategoryFound = false;
for (j=0; j<aCategories.size(); j++) {
if (aCategories[j] == pProjectInfo->m_strGeneralArea) {
bCategoryFound = true;
}
}
if (!bCategoryFound) {
aCategories.Add(pProjectInfo->m_strGeneralArea);
}
// Can the core client support a platform that this project
// supports?
for (j = 0;j < client_platforms.size(); j++) {
for (k = 0;k < project_platforms.size(); k++) {
wxString strClientPlatform = wxString(client_platforms[j].c_str(), wxConvUTF8);
wxString strProjectPlatform = wxString(project_platforms[k].c_str(), wxConvUTF8);
// Convert the supported project platforms into something useful
aProjectPlatforms.Clear();
for (j=0; j<pl.projects[i]->platforms.size(); j++) {
aProjectPlatforms.Add(wxString(pl.projects[i]->platforms[j].c_str(), wxConvUTF8));
}
// Can the core client support a platform that this project supports?
for (j = 0;j < aClientPlatforms.size(); j++) {
for (k = 0;k < aProjectPlatforms.size(); k++) {
wxString strClientPlatform = aClientPlatforms[j];
wxString strProjectPlatform = aProjectPlatforms[k];
wxString strRootProjectPlatform = strProjectPlatform.SubString(0, strProjectPlatform.Find(_T("[")) - 1);
if (strProjectPlatform.Find(_T("windows")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsWindows = true;
if (strClientPlatform == strRootProjectPlatform) {
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strProjectPlatform.Find(_T("apple")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsMac = true;
if (strClientPlatform == strRootProjectPlatform) {
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strProjectPlatform.Find(_T("linux")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsLinux = true;
if (strClientPlatform == strRootProjectPlatform) {
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strProjectPlatform.Find(_T("[cuda")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsNvidiaGPU = true;
if ((pDoc->state.have_cuda) && (strClientPlatform == strRootProjectPlatform)) {
bProjectSupportsNvidiaGPU = true;
bSupportedPlatformFound = true;
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strProjectPlatform.Find(_T("[ati")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsATIGPU = true;
if ((pDoc->state.have_ati) && (strClientPlatform == strRootProjectPlatform)) {
bProjectSupportsATIGPU = true;
bSupportedPlatformFound = true;
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strProjectPlatform.Find(_T("[mt")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsMulticore = true;
if ((pDoc->host.p_ncpus >= 4) && (strClientPlatform == strRootProjectPlatform)) {
bProjectSupportsMulticore = true;
bSupportedPlatformFound = true;
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
if (strClientPlatform == strRootProjectPlatform) {
bSupportedPlatformFound = true;
pProjectInfo->m_bSupportedPlatformFound = true;
}
}
}
// if project didn't export platform list,
// assume it supports this platform
//
if (project_platforms.size() == 0) {
bSupportedPlatformFound = true;
}
wxLogTrace(
wxT("Function Status"),
wxT("CProjectInfoPage::OnPageChanged - Nvidia: '%d', ATI: '%d', Multicore: '%d', Platform: '%d'"),
bProjectSupportsNvidiaGPU,
bProjectSupportsATIGPU,
bProjectSupportsMulticore,
bSupportedPlatformFound
);
m_pProjectListCtrl->Append(
wxString(pl.projects[i]->url.c_str(), wxConvUTF8),
wxString(pl.projects[i]->name.c_str(), wxConvUTF8),
wxString(pl.projects[i]->image.c_str(), wxConvUTF8),
wxString(pl.projects[i]->description.c_str(), wxConvUTF8),
bProjectSupportsNvidiaGPU,
bProjectSupportsATIGPU,
bProjectSupportsMulticore,
bSupportedPlatformFound
wxT("CProjectInfoPage::OnPageChanged - Windows: '%d', Mac: '%d', Linux: '%d', Nvidia: '%d', ATI: '%d', Multicore: '%d', Platform: '%d'"),
pProjectInfo->m_bProjectSupportsWindows,
pProjectInfo->m_bProjectSupportsMac,
pProjectInfo->m_bProjectSupportsLinux,
pProjectInfo->m_bProjectSupportsNvidiaGPU,
pProjectInfo->m_bProjectSupportsATIGPU,
pProjectInfo->m_bProjectSupportsMulticore,
pProjectInfo->m_bSupportedPlatformFound
);
}
// Pre select the first element
if (m_pProjectListCtrl->GetItemCount()) {
m_pProjectListCtrl->SetSelection(0);
m_strProjectURL = m_pProjectListCtrl->GetItem(0)->GetURL();
m_bProjectSupported = m_pProjectListCtrl->GetItem(0)->IsPlatformSupported();
}
TransferDataToWindow();
// Populate the category combo box
m_pProjectCategoriesCtrl->Clear();
m_pProjectCategoriesCtrl->Append(_("All"));
for (i=0; i<aCategories.size(); i++) {
m_pProjectCategoriesCtrl->Append(aCategories[i]);
}
m_pProjectCategoriesCtrl->SetValue(_("All"));
// Trigger initial event to populate the list control
wxCommandEvent evtEvent(wxEVT_COMMAND_COMBOBOX_SELECTED, ID_CATEGORIES);
ProcessEvent(evtEvent);
m_bProjectListPopulated = true;
}
Layout();
FitInside();
m_pProjectListCtrl->SetFocus();
m_pProjectsCtrl->SetFocus();
wxLogTrace(wxT("Function Start/End"), wxT("CProjectInfoPage::OnPageChanged - Function End"));
}
@ -437,26 +790,6 @@ void CProjectInfoPage::OnPageChanging( wxWizardExEvent& event ) {
}
/*!
* wxEVT_PROJECTLIST_ITEM_CHANGE event handler for ID_PROJECTSELECTIONCTRL
*/
void CProjectInfoPage::OnProjectItemChange( ProjectListCtrlEvent& event ) {
SetProjectURL( event.GetURL() );
SetProjectSupported( event.IsSupported() );
TransferDataToWindow();
}
/*!
* wxEVT_PROJECTLIST_ITEM_DISPLAY event handler for ID_PROJECTSELECTIONCTRL
*/
void CProjectInfoPage::OnProjectItemDisplay( ProjectListCtrlEvent& event ) {
wxLaunchDefaultBrowser( event.GetURL() );
}
/*!
* wxEVT_WIZARD_CANCEL event handler for ID_PROJECTINFOPAGE
*/

63
clientgui/ProjectInfoPage.h
View File

@ -22,8 +22,9 @@
#pragma interface "ProjectInfoPage.cpp"
#endif
class CProjectListCtrl;
class ProjectListCtrlEvent;
class CProjectInfo;
/*!
* CProjectInfoPage class declaration
@ -40,6 +41,9 @@ public:
CProjectInfoPage( CBOINCBaseWizard* parent );
/// Destructor
~CProjectInfoPage( );
/// Creation
bool Create( CBOINCBaseWizard* parent );
@ -48,18 +52,18 @@ public:
////@begin CProjectInfoPage event handler declarations
/// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_PROJECTCATEGORY
void OnProjectCategorySelected( wxCommandEvent& event );
/// wxEVT_COMMAND_LISTBOX_SELECTED event handler for ID_PROJECTS
void OnProjectSelected( wxCommandEvent& event );
/// wxEVT_WIZARD_PAGE_CHANGED event handler for ID_PROJECTINFOPAGE
void OnPageChanged( wxWizardExEvent& event );
/// wxEVT_WIZARD_PAGE_CHANGING event handler for ID_PROJECTINFOPAGE
void OnPageChanging( wxWizardExEvent& event );
/// wxEVT_PROJECTLIST_ITEM_CHANGE event handler for ID_PROJECTSELECTIONCTRL
void OnProjectItemChange( ProjectListCtrlEvent& event );
/// wxEVT_PROJECTLIST_ITEM_DISPLAY event handler for ID_PROJECTSELECTIONCTRL
void OnProjectItemDisplay( ProjectListCtrlEvent& event );
/// wxEVT_WIZARD_CANCEL event handler for ID_PROJECTINFOPAGE
void OnCancel( wxWizardExEvent& event );
@ -76,6 +80,18 @@ public:
wxString GetProjectURL() const { return m_strProjectURL ; }
void SetProjectURL(wxString value) { m_strProjectURL = value ; }
wxString GetProjectDetailsDescription() const { return m_strProjectDetailsDescription ; }
void SetProjectDetailsDescription(wxString value) { m_strProjectDetailsDescription = value ; }
wxString GetProjectDetailsResearchArea() const { return m_strProjectDetailsResearchArea ; }
void SetProjectDetailsResearchArea(wxString value) { m_strProjectDetailsResearchArea = value ; }
wxString GetProjectDetailsOrganization() const { return m_strProjectDetailsOrganization ; }
void SetProjectDetailsOrganization(wxString value) { m_strProjectDetailsOrganization = value ; }
wxString GetProjectDetailsURL() const { return m_strProjectDetailsURL ; }
void SetProjectDetailsURL(wxString value) { m_strProjectDetailsURL = value ; }
bool GetProjectSupported() const { return m_bProjectSupported ; }
void SetProjectSupported(bool value) { m_bProjectSupported = value ; }
@ -92,11 +108,36 @@ public:
////@begin CProjectInfoPage member variables
wxStaticText* m_pTitleStaticCtrl;
wxStaticText* m_pDescriptionStaticCtrl;
CProjectListCtrl* m_pProjectListCtrl;
wxStaticText* m_pProjectUrlStaticCtrl;
wxTextCtrl* m_pProjectUrlCtrl;
wxStaticText* m_pProjectCategoriesStaticCtrl;
wxComboBox* m_pProjectCategoriesCtrl;
wxStaticText* m_pProjectsStaticCtrl;
wxListBox* m_pProjectsCtrl;
wxStaticBox* m_pProjectDetailsStaticCtrl;
wxStaticText* m_pProjectDetailsDescriptionStaticCtrl;
wxTextCtrl* m_pProjectDetailsDescriptionCtrl;
wxStaticText* m_pProjectDetailsResearchAreaStaticCtrl;
wxStaticText* m_pProjectDetailsResearchAreaCtrl;
wxStaticText* m_pProjectDetailsOrganizationStaticCtrl;
wxStaticText* m_pProjectDetailsOrganizationCtrl;
wxStaticText* m_pProjectDetailsURLStaticCtrl;
wxStaticText* m_pProjectDetailsURLCtrl;
wxStaticText* m_pProjectDetailsSupportedPlatformsStaticCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformWindowsCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformMacCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformLinuxCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformATICtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformNvidiaCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformMultiCoreCtrl;
wxStaticText* m_pProjectURLStaticCtrl;
wxTextCtrl* m_pProjectURLCtrl;
////@end CProjectInfoPage member variables
private:
wxString m_strProjectURL;
wxString m_strProjectDetailsDescription;
wxString m_strProjectDetailsResearchArea;
wxString m_strProjectDetailsOrganization;
wxString m_strProjectDetailsURL;
std::vector<CProjectInfo*> m_Projects;
bool m_bProjectSupported;
bool m_bProjectListPopulated;
};

2
clientgui/WizardAttach.cpp
View File

@ -624,7 +624,7 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
// Page specific rules - Disable the validator(s)
if (wxYES == iRetVal) {
if ((page == m_ProjectInfoPage) || (page == m_AccountManagerInfoPage)) {
m_ProjectInfoPage->m_pProjectUrlCtrl->SetValidator(wxDefaultValidator);
m_ProjectInfoPage->m_pProjectURLCtrl->SetValidator(wxDefaultValidator);
} else if (page == m_AccountInfoPage) {
m_AccountInfoPage->m_pAccountEmailAddressCtrl->SetValidator(wxDefaultValidator);
m_AccountInfoPage->m_pAccountPasswordCtrl->SetValidator(wxDefaultValidator);

9
clientgui/WizardAttach.h
View File

@ -75,9 +75,12 @@
#define ID_WELCOMECHANGEAPPS 11102
// Project Info/Account Manager Info Controls
#define ID_PROJECTLISTCTRL 11200
#define ID_PROJECTURLSTATICCTRL 11201
#define ID_PROJECTURLCTRL 11202
#define ID_CATEGORIES 11200
#define ID_PROJECTS 11201
#define ID_PROJECTDESCRIPTION 11202
#define ID_PROJECTLISTCTRL 11203
#define ID_PROJECTURLSTATICCTRL 11204
#define ID_PROJECTURLCTRL 11205
// Terms Of Use Controls
#define ID_TERMSOFUSECTRL 11300

37
clientgui/res/linuxicon.xpm Normal file
View File

@ -0,0 +1,37 @@
/* XPM */
static char *Linux_xpm[] = {
/* columns rows colors chars-per-pixel */
"14 14 17 1",
". c #8F8979",
"o c #2E281A",
"+ c #514D44",
"> c #A47610",
" c None",
"@ c #3E3E3C",
": c #F9F9F9",
"% c #C39B1C",
"& c #B1A995",
"# c #BEBBB7",
"= c #CBC7BF",
"- c #E8DAB2",
"* c #736C58",
"; c #EBEAE6",
"O c #999894",
"$ c #EAB81B",
"X c #0E0E0D",
/* pixels */
" .XoO ",
" XXXX ",
" +@.X# ",
" +$%o& ",
" *%&+* ",
" .=-;OX# ",
" =+:::-Xo ",
" *#;:::.XO ",
" o::;::&X@ ",
" #*;:::;&X+ ",
" -$$*;::;%o$ ",
" $$$%.::=%$$- ",
" $$$$.O*X$$$- ",
" =$>.&&O>% "
};

34
clientgui/res/macosicon.xpm Normal file
View File

@ -0,0 +1,34 @@
/* XPM */
static char *MacOS_xpm[] = {
/* columns rows colors chars-per-pixel */
"14 14 14 1",
"= c #295A9C",
"O c #4A7394",
"% c #213152",
"# c #C6D6E7",
"X c #424A52",
"o c #6384BD",
"* c #314A84",
"$ c #6B8CBD",
"+ c #181829",
" c None",
". c #5A6B73",
"& c #A5ADB5",
"- c #9CB5CE",
"@ c #B5CEEF",
/* pixels */
" .X ",
"oOooooO+@#@@@@",
"OooOo$%.#&$@@@",
"ooo*oo+@@..#@@",
"ooo=o*X@@&-@@@",
"ooo$$%$@@@@@@@",
"Ooooo%&#@@@@@@",
"ooooo+%X.@@#@@",
"ooo$$OO%X#@@@@",
"oo*=Oo$X.-.%-@",
"Ooo==*=%+%.-#@",
"ooooooo%.#@@@@",
"Ooooooo*X@@#@@",
" #% "
};

2
clientgui/res/skins/default/graphic/advanced_link_image.xpm
View File

@ -1,5 +1,5 @@
/* XPM */
static char *advanced_link_image_xpm[] = {
static const char *advanced_link_image_xpm[] = {
/* columns rows colors chars-per-pixel */
"101 20 67 1",
"o c Black",

43
clientgui/res/windowsicon.xpm Normal file
View File

@ -0,0 +1,43 @@
/* XPM */
static char *Win32_xpm[] = {
/* columns rows colors chars-per-pixel */
"14 14 23 1",
"4 c #6CC0EE",
"o c #E3BD74",
"* c #B12804",
"$ c #5D1D0C",
"@ c #2C3734",
"= c #F13404",
". c #959792",
"# c #331D15",
" c None",
"O c #11141E",
"% c #195A67",
"3 c #B7D2DC",
"X c #676E67",
"+ c #595750",
": c #EA9667",
"> c #F46634",
"2 c #FECE04",
"; c #227477",
"& c #DFD3C4",
"< c #8E7010",
", c #513F37",
"1 c #029AFC",
"- c #66CB34",
/* pixels */
" ..X. ",
" oXOOOOOOX",
"...X+@##$O+%@O",
"&X.+X+*=*#--;O",
"o:&>+@==*O--;O",
" o&:X,==*#--+O",
"o:o>X,*$#O@@OO",
"&...X,@O@O<<#O",
".,X@+,11%O22<O",
"3334X@11;#22<O",
" 434X,11%Ooo<O",
"3434+@;%@O#$@O",
" 334X+OOO@@OOO",
".@XO+,.. .X"
};

4
win_build/libboinc.vcproj
View File

@ -352,6 +352,10 @@
RelativePath="..\lib\coproc.h"
>
</File>
<File
RelativePath="..\lib\coproc_impl.h"
>
</File>
<File
RelativePath="..\lib\crypt.h"
>

6
win_build/libboincapi_staticcrt.vcproj
View File

@ -453,12 +453,6 @@
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>