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

- MGR: Remove the visuals in the wizard for multi-core and opencl. This area 

will get a bunch of work in a future commit.
        
    clientgui/
        ProjectInfoPage.cpp, .h
    clientgui/res/
        openclicon.xpm (deleted)
        multicore.xpm (deleted)

svn path=/trunk/boinc/; revision=25696
This commit is contained in:
Rom Walton 2012-05-18 18:33:06 +00:00
parent c8c85f4a75
commit 70c92e317a
5 changed files with 12 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -3924,3 +3924,14 @@ David 18 May 2012
- vboxwrapper: don't run headful if client is sandboxed (it won't work).
samples/vboxwrapper/
vboxwrapper.cpp
Rom 18 May 2012
- MGR: Remove the visuals in the wizard for multi-core and opencl. This area
will get a bunch of work in a future commit.
clientgui/
ProjectInfoPage.cpp, .h
clientgui/res/
openclicon.xpm (deleted)
multicore.xpm (deleted)

44
clientgui/ProjectInfoPage.cpp
View File

@ -44,8 +44,6 @@
#include "res/linuxicon.xpm"
#include "res/atiicon.xpm"
#include "res/nvidiaicon.xpm"
#include "res/openclicon.xpm"
#include "res/multicore.xpm"
#include "res/blankicon.xpm"
@ -63,8 +61,6 @@ class CProjectInfo : public wxObject
m_bProjectSupportsLinux = false;
m_bProjectSupportsCUDA = false;
m_bProjectSupportsCAL = false;
m_bProjectSupportsOpenCL = false;
m_bProjectSupportsMulticore = false;
}
public:
@ -80,8 +76,6 @@ public:
bool m_bProjectSupportsLinux;
bool m_bProjectSupportsCUDA;
bool m_bProjectSupportsCAL;
bool m_bProjectSupportsOpenCL;
bool m_bProjectSupportsMulticore;
};
IMPLEMENT_DYNAMIC_CLASS( CProjectInfo, wxObject )
@ -166,8 +160,6 @@ bool CProjectInfoPage::Create( CBOINCBaseWizard* parent )
m_pProjectDetailsSupportedPlatformLinuxCtrl = NULL;
m_pProjectDetailsSupportedPlatformATICtrl = NULL;
m_pProjectDetailsSupportedPlatformNvidiaCtrl = NULL;
m_pProjectDetailsSupportedPlatformOpenCLCtrl = NULL;
m_pProjectDetailsSupportedPlatformMultiCoreCtrl = NULL;
m_pProjectDetailsSupportedPlatformBlankCtrl = NULL;
m_pProjectURLStaticCtrl = NULL;
m_pProjectURLCtrl = NULL;
@ -314,12 +306,6 @@ void CProjectInfoPage::CreateControls()
m_pProjectDetailsSupportedPlatformNvidiaCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("nvidiaicon.xpm")), wxDefaultPosition, wxSize(16,16), 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformNvidiaCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformOpenCLCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("openclicon.xpm")), wxDefaultPosition, wxSize(16,16), 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformOpenCLCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformMultiCoreCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("multicore.xpm")), wxDefaultPosition, wxSize(16,16), 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformMultiCoreCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
m_pProjectDetailsSupportedPlatformBlankCtrl = new wxStaticBitmap( itemWizardPage23, wxID_STATIC, GetBitmapResource(wxT("blankicon.xpm")), wxDefaultPosition, wxSize(16,16), 0 );
itemBoxSizer26->Add(m_pProjectDetailsSupportedPlatformBlankCtrl, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5);
@ -413,16 +399,6 @@ wxBitmap CProjectInfoPage::GetBitmapResource( const wxString& name )
wxBitmap bitmap(nvidiaicon_xpm);
return bitmap;
}
else if (name == wxT("openclicon.xpm"))
{
wxBitmap bitmap(openclicon_xpm);
return bitmap;
}
else if (name == wxT("multicore.xpm"))
{
wxBitmap bitmap(multicore_xpm);
return bitmap;
}
else if (name == wxT("blankicon.xpm"))
{
wxBitmap bitmap(blankicon_xpm);
@ -510,15 +486,11 @@ void CProjectInfoPage::OnProjectSelected( wxCommandEvent& WXUNUSED(event) ) {
m_pProjectDetailsSupportedPlatformLinuxCtrl->Hide();
m_pProjectDetailsSupportedPlatformATICtrl->Hide();
m_pProjectDetailsSupportedPlatformNvidiaCtrl->Hide();
m_pProjectDetailsSupportedPlatformOpenCLCtrl->Hide();
m_pProjectDetailsSupportedPlatformMultiCoreCtrl->Hide();
if (pProjectInfo->m_bProjectSupportsWindows) m_pProjectDetailsSupportedPlatformWindowsCtrl->Show();
if (pProjectInfo->m_bProjectSupportsMac) m_pProjectDetailsSupportedPlatformMacCtrl->Show();
if (pProjectInfo->m_bProjectSupportsLinux) m_pProjectDetailsSupportedPlatformLinuxCtrl->Show();
if (pProjectInfo->m_bProjectSupportsCAL) m_pProjectDetailsSupportedPlatformATICtrl->Show();
if (pProjectInfo->m_bProjectSupportsCUDA) m_pProjectDetailsSupportedPlatformNvidiaCtrl->Show();
if (pProjectInfo->m_bProjectSupportsOpenCL) m_pProjectDetailsSupportedPlatformOpenCLCtrl->Show();
if (pProjectInfo->m_bProjectSupportsMulticore) m_pProjectDetailsSupportedPlatformMultiCoreCtrl->Show();
// Populate non-control data for use in other places of the wizard
SetProjectURL( pProjectInfo->m_strURL );
@ -582,8 +554,6 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
wxASSERT(m_pProjectDetailsSupportedPlatformLinuxCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformATICtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformNvidiaCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformOpenCLCtrl);
wxASSERT(m_pProjectDetailsSupportedPlatformMultiCoreCtrl);
wxASSERT(m_pProjectURLStaticCtrl);
wxASSERT(m_pProjectURLCtrl);
@ -713,16 +683,6 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
if (!pDoc->state.have_ati) continue;
}
if (strProjectPlatform.Find(_T("[opencl")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsOpenCL = true;
if (!pDoc->state.have_ati && !pDoc->state.have_nvidia) continue;
}
if (strProjectPlatform.Find(_T("[mt")) != wxNOT_FOUND) {
pProjectInfo->m_bProjectSupportsMulticore = true;
if (pDoc->state.host_info.p_ncpus < 4) continue;
}
if (strClientPlatform == strRootProjectPlatform) {
pProjectInfo->m_bSupportedPlatformFound = true;
}
@ -737,14 +697,12 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
wxLogTrace(
wxT("Function Status"),
wxT("CProjectInfoPage::OnPageChanged - Windows: '%d', Mac: '%d', Linux: '%d', Nvidia: '%d', ATI: '%d', OpenCL: '%d', Multicore: '%d', Platform: '%d'"),
wxT("CProjectInfoPage::OnPageChanged - Windows: '%d', Mac: '%d', Linux: '%d', Nvidia: '%d', ATI: '%d', Platform: '%d'"),
pProjectInfo->m_bProjectSupportsWindows,
pProjectInfo->m_bProjectSupportsMac,
pProjectInfo->m_bProjectSupportsLinux,
pProjectInfo->m_bProjectSupportsCUDA,
pProjectInfo->m_bProjectSupportsCAL,
pProjectInfo->m_bProjectSupportsOpenCL,
pProjectInfo->m_bProjectSupportsMulticore,
pProjectInfo->m_bSupportedPlatformFound
);
}

2
clientgui/ProjectInfoPage.h
View File

@ -128,8 +128,6 @@ public:
wxStaticBitmap* m_pProjectDetailsSupportedPlatformLinuxCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformATICtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformNvidiaCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformMultiCoreCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformOpenCLCtrl;
wxStaticBitmap* m_pProjectDetailsSupportedPlatformBlankCtrl;
wxStaticText* m_pProjectURLStaticCtrl;
wxTextCtrl* m_pProjectURLCtrl;

130
clientgui/res/multicore.xpm
View File

@ -1,130 +0,0 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2008 University of California
//
// BOINC is free software; you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation,
// either version 3 of the License, or (at your option) any later version.
//
// BOINC is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
/* XPM */
static const char *multicore_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 91 1",
"O c Black",
"s c #CACACA",
"p c #2D2D2D",
"A c #3C3C3C",
"W c #4B4B4B",
"- c #080808",
"b c #353535",
" c None",
"^ c #444444",
"4 c #535353",
"5 c #717171",
"+ c #010101",
"R c #101010",
"w c #1F1F1F",
") c #2E2E2E",
"h c #A6A6A6",
"G c #B5B5B5",
"* c #D3D3D3",
"2 c #272727",
"a c #909090",
"% c #020202",
"d c #3E3E3E",
"y c #6B6B6B",
"C c #7A7A7A",
"q c #898989",
"T c #A7A7A7",
"J c #0A0A0A",
"' c #282828",
"6 c #373737",
"U c #464646",
"; c #555555",
"~ c #737373",
"x c #919191",
"r c #A0A0A0",
"Q c #AFAFAF",
"Z c #BEBEBE",
"3 c #030303",
"1 c #121212",
"z c #303030",
"F c #FAFAFA",
"X c #3F3F3F",
"B c #6C6C6C",
"9 c #A8A8A8",
"f c #0B0B0B",
"# c #383838",
"u c #474747",
"= c #040404",
"` c #CECECE",
"v c #131313",
"L c #FBFBFB",
"7 c #404040",
"Y c #4F4F4F",
"D c #0C0C0C",
": c #2A2A2A",
"M c #393939",
"l c #484848",
"K c #575757",
"_ c #757575",
"! c #B1B1B1",
"j c #050505",
"$ c #141414",
"o c #232323",
"g c #323232",
". c #FCFCFC",
"0 c #6E6E6E",
"< c #AAAAAA",
"N c #1C1C1C",
"[ c #3A3A3A",
", c #494949",
"> c #060606",
"/ c #D0D0D0",
"S c #151515",
"i c #333333",
"] c #424242",
"8 c #515151",
"H c #7E7E7E",
"I c #9C9C9C",
"( c #ABABAB",
"} c #C9C9C9",
"@ c #E7E7E7",
"E c #2C2C2C",
"P c #F6F6F6",
"c c #3B3B3B",
"{ c #868686",
"t c #A4A4A4",
"& c #070707",
"e c #E0E0E0",
"V c #252525",
"n c #343434",
"k c #707070",
"m c #8E8E8E",
/* pixels */
" .XoOOOO+O@ ",
"#$OOOOOO%&O* ",
"OO=-OOOOOO;: ",
"++>OOOOO,<1O ",
"2O=3OO4<=562 ",
"7O+O89O076#q wOe",
"rO4t=yuipasdfO+O",
"ghjkl#zxscvO&O3&",
":zubnmsMNOO-O=j+",
" BVCZASOO3O3=ODO",
"F G HOO&OO&OJOOK",
"LP wIUVO%3OOYTR",
" UE8d%OOW9Jk7",
" 8OQO,!3~^66",
" . /2(jBXn)_`",
" F '6]c[{} "
};

127
clientgui/res/openclicon.xpm
View File

@ -1,127 +0,0 @@
// This file is part of BOINC.
// http://boinc.berkeley.edu
//
/* XPM */
static char *openclicon_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 101 2",
" c Black",
"_ c #DEDDDD",
"' c #EC2E2D",
"s c #F1D346",
"m c #F6D134",
"8 c #F1C721",
"6 c #D8DF30",
"H c #E24C37",
"o. c #F0807E",
". c None",
"F c #BF8E77",
"x c #E7F5ED",
"^ c #A8D5BB",
"K c #F4D5D4",
"z c #71C694",
"O c #CAE4D6",
"P c #4AAD73",
"W c #EB322C",
"p c #CFDB37",
"t c #14A850",
"l c #74C494",
"d c #F7C31F",
"1 c #14A54F",
"g c #EA974C",
"$. c #EAEAEA",
"+. c #F28E8D",
"n c #F5E791",
"7 c #F0E69C",
"- c #95C540",
"X c #FEFDFC",
"] c #EB5857",
"~ c #91C9A8",
"y c #8DD2A1",
"@ c #E1EFE8",
"b c #FAFADA",
"4 c #BEDE8F",
"+ c #79B98E",
"N c #C07143",
"e c #47B173",
"C c #F0F5F3",
"= c #ADD89E",
", c #F5F9F7",
"a c #EDEA7C",
"! c #EE8887",
"R c #DE5748",
"J c #E93D29",
") c #ADACAC",
"i c #CBE192",
".. c #E4E4E3",
"# c #FDFEFC",
"U c #E4E4E4",
"L c #89CCA5",
"$ c #FDFEFD",
"w c #FDFEFE",
"@. c #F2A2A0",
"Z c #59BB81",
"> c #F3E7D5",
"B c #EFB89C",
"O. c #EF8684",
"2 c #83CF95",
"f c #F0A128",
"& c #8AD0A5",
"E c #EC382A",
": c #D3E093",
"( c #D6D6D5",
"S c #F4F4EF",
"v c #FEFFFD",
"q c #FEFFFE",
"D c #B39F78",
"j c #FEFFFF",
"< c #8ACDA7",
"V c #E8B7B1",
"[ c #88D0A6",
"A c #7CC89B",
"Q c #EC2F2D",
"M c #CA9E49",
"o c #E4F2ED",
"r c #7AC89A",
"Y c #AAAAAA",
"5 c #C2D635",
"I c #FAFCFB",
"9 c #EBC368",
"X. c #F5BAB9",
"* c #41B04E",
"h c #FAF6F5",
"k c #90C9A6",
"} c #FDFDFD",
"3 c #6BBE43",
"u c #8FCD73",
"0 c #F8F0EC",
" . c #B0AFAD",
"T c #D3D1CF",
"/ c #F6F6F6",
"` c #EE6F6D",
"% c #C6E5D4",
"#. c #D1D1D1",
"; c #A6C93C",
"c c #FEFEFE",
"G c #E29689",
"{ c #BDE4CE",
"| c #CACAC8",
/* pixels */
". . . . . . . . . . . . . . . . ",
". . . . . . . . . . . . . . . . ",
". . . . . . . . . . . . . . . . ",
". . . . . X o O + @ # . . . . . ",
". . . $ % & * = - ; : > # . . . ",
". . , < 1 2 3 4 5 6 7 8 9 0 q . ",
". w e r t y u i p a s d f g h . ",
"j k l z x c q v b n m M N B V . ",
"C Z A w . . . . . S D F G H J K ",
"L P I . . . . c U Y T R E W Q ! ",
"~ ^ c . . . / ( ) _ w ` ' Q Q ] ",
"[ { . . . } | .... . X.o.O.+.@.",
". . . . . . #.$.. . . . . . . . ",
". . . . . . . . . . . . . . . . ",
". . . . . . . . . . . . . . . . ",
". . . . . . . . . . . . . . . . "
};