[boinc] 03/06: Imported Upstream version 7.2.44+dfsg
Guo Yixuan
yixuan-guest at moszumanska.debian.org
Sun Apr 6 00:42:04 UTC 2014
This is an automated email from the git hooks/post-receive script.
yixuan-guest pushed a commit to branch master
in repository boinc.
commit 4204c10fadd21938e7d36b0fd2bf9d8f0640a99f
Author: Guo Yixuan <culu.gyx at gmail.com>
Date: Sat Apr 5 12:53:34 2014 -0400
Imported Upstream version 7.2.44+dfsg
---
client/win/boinc_cli.rc | 2 +-
client/win/boinc_cmd.rc | 2 +-
client/win/boinc_log.rc | 2 +-
client/win/res/boinc.ico | Bin 0 -> 445726 bytes
client/win/res/icon.ico | Bin 284646 -> 0 bytes
clientgui/AdvancedFrame.cpp | 7 +-
clientgui/AdvancedFrame.h | 2 +-
clientgui/BOINCGUIApp.cpp | 3 -
clientgui/BOINCGUIApp.rc | 46 +-
clientgui/BOINCTaskBar.cpp | 31 +-
clientgui/BOINCTaskBar.h | 4 +-
clientgui/DlgAdvPreferences.cpp | 2 +-
clientgui/DlgEventLog.cpp | 5 +-
clientgui/SkinManager.cpp | 164 ++++-
clientgui/SkinManager.h | 71 +-
clientgui/res/boinc.ico | Bin 0 -> 445726 bytes
clientgui/res/boinc.xpm | 114 +++-
clientgui/res/boinc32.xpm | 725 ++++++---------------
clientgui/res/boincdisconnect.ico | Bin 0 -> 445726 bytes
clientgui/res/boincdisconnect.xpm | 129 +++-
clientgui/res/boincdisconnect32.xpm | 253 +++++++
clientgui/res/boincmgr.16x16.png | Bin 815 -> 0 bytes
clientgui/res/boincmgr.32x32.png | Bin 2395 -> 0 bytes
clientgui/res/boincmgr.48x48.png | Bin 5570 -> 0 bytes
clientgui/res/boincsnooze.ico | Bin 0 -> 445726 bytes
clientgui/res/boincsnooze.xpm | 101 ++-
clientgui/res/boincsnooze32.xpm | 203 ++++++
.../res/skins/default/graphic/project_image.xpm | 465 ++++++-------
...014 BOINC Program Logo Design - Jacob Klein.pdn | Bin 0 -> 369966 bytes
.../icons/Design Template/Design Notes.txt | 81 +++
.../icons/Design Template/Other Ideas.pdn | Bin 0 -> 269090 bytes
...pha Transparency - Disconnected - 128 x 128.png | Bin 0 -> 9687 bytes
...Alpha Transparency - Disconnected - 16 x 16.png | Bin 0 -> 828 bytes
...Alpha Transparency - Disconnected - 20 x 20.png | Bin 0 -> 1122 bytes
...Alpha Transparency - Disconnected - 24 x 24.png | Bin 0 -> 1392 bytes
...pha Transparency - Disconnected - 256 x 256.png | Bin 0 -> 23830 bytes
...Alpha Transparency - Disconnected - 32 x 32.png | Bin 0 -> 1909 bytes
...Alpha Transparency - Disconnected - 40 x 40.png | Bin 0 -> 2469 bytes
...Alpha Transparency - Disconnected - 48 x 48.png | Bin 0 -> 3060 bytes
...Alpha Transparency - Disconnected - 64 x 64.png | Bin 0 -> 4226 bytes
...Alpha Transparency - Disconnected - 80 x 80.png | Bin 0 -> 5530 bytes
...Alpha Transparency - Disconnected - 96 x 96.png | Bin 0 -> 6739 bytes
...n - Alpha Transparency - Normal - 128 x 128.png | Bin 0 -> 9924 bytes
...con - Alpha Transparency - Normal - 16 x 16.png | Bin 0 -> 827 bytes
...con - Alpha Transparency - Normal - 20 x 20.png | Bin 0 -> 1107 bytes
...con - Alpha Transparency - Normal - 24 x 24.png | Bin 0 -> 1383 bytes
...n - Alpha Transparency - Normal - 256 x 256.png | Bin 0 -> 25047 bytes
...con - Alpha Transparency - Normal - 32 x 32.png | Bin 0 -> 1901 bytes
...con - Alpha Transparency - Normal - 40 x 40.png | Bin 0 -> 2445 bytes
...con - Alpha Transparency - Normal - 48 x 48.png | Bin 0 -> 3048 bytes
...con - Alpha Transparency - Normal - 64 x 64.png | Bin 0 -> 4231 bytes
...con - Alpha Transparency - Normal - 80 x 80.png | Bin 0 -> 5576 bytes
...con - Alpha Transparency - Normal - 96 x 96.png | Bin 0 -> 6820 bytes
... Alpha Transparency - Suspended - 128 x 128.png | Bin 0 -> 8643 bytes
... - Alpha Transparency - Suspended - 16 x 16.png | Bin 0 -> 755 bytes
... - Alpha Transparency - Suspended - 20 x 20.png | Bin 0 -> 1064 bytes
... - Alpha Transparency - Suspended - 24 x 24.png | Bin 0 -> 1322 bytes
... Alpha Transparency - Suspended - 256 x 256.png | Bin 0 -> 21173 bytes
... - Alpha Transparency - Suspended - 32 x 32.png | Bin 0 -> 1784 bytes
... - Alpha Transparency - Suspended - 40 x 40.png | Bin 0 -> 2258 bytes
... - Alpha Transparency - Suspended - 48 x 48.png | Bin 0 -> 2799 bytes
... - Alpha Transparency - Suspended - 64 x 64.png | Bin 0 -> 3847 bytes
... - Alpha Transparency - Suspended - 80 x 80.png | Bin 0 -> 5060 bytes
... - Alpha Transparency - Suspended - 96 x 96.png | Bin 0 -> 6091 bytes
...sparency (For XPM) - Disconnected - 16 x 16.png | Bin 0 -> 563 bytes
...sparency (For XPM) - Disconnected - 32 x 32.png | Bin 0 -> 1230 bytes
...sparency (For XPM) - Disconnected - 40 x 40.png | Bin 0 -> 1540 bytes
...x Transparency (For XPM) - Normal - 16 x 16.png | Bin 0 -> 517 bytes
...x Transparency (For XPM) - Normal - 32 x 32.png | Bin 0 -> 1119 bytes
...x Transparency (For XPM) - Normal - 40 x 40.png | Bin 0 -> 1379 bytes
...ransparency (For XPM) - Suspended - 16 x 16.png | Bin 0 -> 496 bytes
...ransparency (For XPM) - Suspended - 32 x 32.png | Bin 0 -> 1060 bytes
...ransparency (For XPM) - Suspended - 40 x 40.png | Bin 0 -> 1407 bytes
...- White Background - Disconnected - 40 x 40.png | Bin 0 -> 2033 bytes
... Icon - White Background - Normal - 40 x 40.png | Bin 0 -> 1926 bytes
...on - White Background - Suspended - 40 x 40.png | Bin 0 -> 1814 bytes
.../Initial Mockup/BOINC Logo Flat Quartered.png | Bin 0 -> 25175 bytes
.../icons/Initial Mockup/BOINC Logo Flat.png | Bin 0 -> 25987 bytes
.../icons/References}/BOINCGUIApp.ico | Bin
.../icons/References/boinc_glossy2_512_F.tif | Bin 0 -> 288208 bytes
.../res/templates/icons/References/boinc_logo.png | Bin 0 -> 45314 bytes
.../icons/References}/boincdisconnect.xpm | 0
.../icons/References}/boincsnooze.xpm | 0
.../templates/icons/References/disconnect-icon.png | Bin 0 -> 17148 bytes
clientgui/res/wcgdisconnect.ico | Bin 0 -> 445726 bytes
clientgui/res/wcgsnooze.ico | Bin 0 -> 445726 bytes
clientgui/sg_BoincSimpleFrame.cpp | 9 +-
clientgui/sg_BoincSimpleFrame.h | 2 +-
clientgui/sg_DlgMessages.cpp | 5 +-
clientgui/sg_DlgPreferences.cpp | 5 +-
clientscr/boinc_ss.rc | 2 +-
clientscr/boinc_ss_opengl.rc | 2 +-
clientscr/res/boinc.ico | Bin 0 -> 445726 bytes
clientscr/res/icon.ico | Bin 284646 -> 0 bytes
clientscr/ss_app.cpp | 19 +
configure.ac | 2 +-
packages/generic/sea/boincmgr.16x16.png | Bin 815 -> 827 bytes
packages/generic/sea/boincmgr.32x32.png | Bin 2395 -> 1901 bytes
packages/generic/sea/boincmgr.48x48.png | Bin 5570 -> 3048 bytes
99 files changed, 1462 insertions(+), 996 deletions(-)
diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc
index d0a96ce..a7cb501 100644
--- a/client/win/boinc_cli.rc
+++ b/client/win/boinc_cli.rc
@@ -38,7 +38,7 @@ IDI_MAIN_ICON ICON "res\\ce.ico"
#elif defined(_WCG)
IDI_MAIN_ICON ICON "res\\wcg.ico"
#else
-IDI_MAIN_ICON ICON "res\\icon.ico"
+IDI_MAIN_ICON ICON "res\\boinc.ico"
#endif
/////////////////////////////////////////////////////////////////////////////
diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc
index 6c6521a..e7cd075 100644
--- a/client/win/boinc_cmd.rc
+++ b/client/win/boinc_cmd.rc
@@ -38,7 +38,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#elif defined(_WCG)
IDI_MAIN_ICON ICON "res\\wcg.ico"
#else
-IDI_MAIN_ICON ICON "res\\icon.ico"
+IDI_MAIN_ICON ICON "res\\boinc.ico"
#endif
/////////////////////////////////////////////////////////////////////////////
diff --git a/client/win/boinc_log.rc b/client/win/boinc_log.rc
index e46eda0..29b1cf2 100644
--- a/client/win/boinc_log.rc
+++ b/client/win/boinc_log.rc
@@ -36,7 +36,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#elif defined(_WCG)
IDI_MAIN_ICON ICON "res\\wcg.ico"
#else
-IDI_MAIN_ICON ICON "res\\icon.ico"
+IDI_MAIN_ICON ICON "res\\boinc.ico"
#endif
/////////////////////////////////////////////////////////////////////////////
diff --git a/client/win/res/boinc.ico b/client/win/res/boinc.ico
new file mode 100644
index 0000000..c535bce
Binary files /dev/null and b/client/win/res/boinc.ico differ
diff --git a/client/win/res/icon.ico b/client/win/res/icon.ico
deleted file mode 100644
index 2bc3437..0000000
Binary files a/client/win/res/icon.ico and /dev/null differ
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 629ec0e..19705b3 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -203,7 +203,7 @@ CAdvancedFrame::CAdvancedFrame() {
}
-CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxPoint position, wxSize size) :
+CAdvancedFrame::CAdvancedFrame(wxString title, wxIconBundle* icons, wxPoint position, wxSize size) :
CBOINCBaseFrame((wxFrame *)NULL, ID_ADVANCEDFRAME, title, position, size, wxDEFAULT_FRAME_STYLE)
{
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CAdvancedFrame - Function Begin"));
@@ -216,10 +216,7 @@ CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxP
m_strBaseTitle = title;
// Initialize Application
- wxIconBundle icons;
- icons.AddIcon(*icon);
- icons.AddIcon(*icon32);
- SetIcons(icons);
+ SetIcons(*icons);
// Create UI elements
wxCHECK_RET(CreateMenu(), _T("Failed to create menu bar."));
diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h
index 3f9659d..a300c76 100644
--- a/clientgui/AdvancedFrame.h
+++ b/clientgui/AdvancedFrame.h
@@ -54,7 +54,7 @@ class CAdvancedFrame : public CBOINCBaseFrame
public:
CAdvancedFrame();
- CAdvancedFrame( wxString title, wxIcon* icon, wxIcon* icon32, wxPoint position, wxSize size );
+ CAdvancedFrame( wxString title, wxIconBundle* icons, wxPoint position, wxSize size );
~CAdvancedFrame(void);
diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp
index 80ee460..2753679 100644
--- a/clientgui/BOINCGUIApp.cpp
+++ b/clientgui/BOINCGUIApp.cpp
@@ -439,7 +439,6 @@ bool CBOINCGUIApp::OnInit() {
wxASSERT(m_pMacSystemMenu);
#endif
-
// Startup the System Idle Detection code
IdleTrackerAttach();
@@ -1005,7 +1004,6 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
pNewFrame = new CAdvancedFrame(
m_pSkinManager->GetAdvanced()->GetApplicationName(),
m_pSkinManager->GetAdvanced()->GetApplicationIcon(),
- m_pSkinManager->GetAdvanced()->GetApplicationIcon32(),
wxPoint(iLeft, iTop),
wxSize(iWidth, iHeight)
);
@@ -1014,7 +1012,6 @@ bool CBOINCGUIApp::SetActiveGUI(int iGUISelection, bool bShowWindow) {
pNewFrame = new CSimpleFrame(
m_pSkinManager->GetAdvanced()->GetApplicationName(),
m_pSkinManager->GetAdvanced()->GetApplicationIcon(),
- m_pSkinManager->GetAdvanced()->GetApplicationIcon32(),
wxPoint(iLeft, iTop),
wxSize(iWidth, iHeight)
);
diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc
index f4b3919..044bfc4 100644
--- a/clientgui/BOINCGUIApp.rc
+++ b/clientgui/BOINCGUIApp.rc
@@ -23,28 +23,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
#endif //_WIN32
/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-#if defined(_GRIDREPUBLIC)
-APP_ICON ICON "res\\gridrepublic.ico"
-#elif defined(_PROGRESSTHRUPROCESSORS)
-APP_ICON ICON "res\\progress.ico"
-#elif defined(_CHARITYENGINE)
-APP_ICON ICON "res\\ce.ico"
-#elif defined(_WCG)
-APP_ICON ICON "res\\wcg.ico"
-#else
-APP_ICON ICON "res\\boincguiApp.ico"
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
#endif // Neutral resources
@@ -75,6 +53,30 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon
//
+#if defined(_GRIDREPUBLIC)
+boinc ICON "res\\gridrepublic.ico"
+boincdisconnect ICON "res\\boincdisconnect.ico"
+boincsnooze ICON "res\\boincsnooze.ico"
+#elif defined(_PROGRESSTHRUPROCESSORS)
+boinc ICON "res\\progress.ico"
+boincdisconnect ICON "res\\boincdisconnect.ico"
+boincsnooze ICON "res\\boincsnooze.ico"
+#elif defined(_CHARITYENGINE)
+boinc ICON "res\\ce.ico"
+boincdisconnect ICON "res\\boincdisconnect.ico"
+boincsnooze ICON "res\\boincsnooze.ico"
+#elif defined(_WCG)
+boinc ICON "res\\wcg.ico"
+boincdisconnect ICON "res\\wcgdisconnect.ico"
+boincsnooze ICON "res\\wcgsnooze.ico"
+#else
+boinc ICON "res\\boinc.ico"
+boincdisconnect ICON "res\\boincdisconnect.ico"
+boincsnooze ICON "res\\boincsnooze.ico"
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 0f2d52a..0d11543 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -82,16 +82,20 @@ BEGIN_EVENT_TABLE(CTaskBarIcon, wxTaskBarIconEx)
END_EVENT_TABLE()
-CTaskBarIcon::CTaskBarIcon(wxString title, wxIcon* icon, wxIcon* iconDisconnected, wxIcon* iconSnooze) :
+CTaskBarIcon::CTaskBarIcon(wxString title, wxIconBundle* icon, wxIconBundle* iconDisconnected, wxIconBundle* iconSnooze
+#ifdef __WXMAC__
+, wxTaskBarIconType iconType
+#endif
+) :
#ifdef __WXMAC__
wxTaskBarIcon(DOCK)
#else
wxTaskBarIconEx(wxT("BOINCManagerSystray"), 1)
#endif
{
- m_iconTaskBarNormal = *icon;
- m_iconTaskBarDisconnected = *iconDisconnected;
- m_iconTaskBarSnooze = *iconSnooze;
+ m_iconTaskBarNormal = icon->GetIcon(GetBestIconSize());
+ m_iconTaskBarDisconnected = iconDisconnected->GetIcon(GetBestIconSize());
+ m_iconTaskBarSnooze = iconSnooze->GetIcon(GetBestIconSize());
m_SnoozeGPUMenuItem = NULL;
m_bTaskbarInitiatedShutdown = false;
@@ -337,9 +341,9 @@ void CTaskBarIcon::OnReloadSkin(CTaskbarEvent& WXUNUSED(event)) {
wxASSERT(pSkinAdvanced);
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
- m_iconTaskBarNormal = *pSkinAdvanced->GetApplicationIcon();
- m_iconTaskBarDisconnected = *pSkinAdvanced->GetApplicationDisconnectedIcon();
- m_iconTaskBarSnooze = *pSkinAdvanced->GetApplicationSnoozeIcon();
+ m_iconTaskBarNormal = pSkinAdvanced->GetApplicationIcon()->GetIcon(GetBestIconSize());
+ m_iconTaskBarDisconnected = pSkinAdvanced->GetApplicationDisconnectedIcon()->GetIcon(GetBestIconSize());
+ m_iconTaskBarSnooze = pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(GetBestIconSize());
#ifdef __WXMAC__
// For unknown reasons, menus won't work if we call BuildMenu() here
@@ -359,6 +363,19 @@ void CTaskBarIcon::ResetTaskBar() {
}
+wxSize CTaskBarIcon::GetBestIconSize() {
+ wxSize size;
+
+#ifdef _WIN32
+ size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
+#else
+ size = wxSize(16, 16);
+#endif
+
+ return size;
+}
+
+
#ifdef __WXMAC__
// The mac version of WxWidgets will delete this menu when
diff --git a/clientgui/BOINCTaskBar.h b/clientgui/BOINCTaskBar.h
index df51214..2788a53 100644
--- a/clientgui/BOINCTaskBar.h
+++ b/clientgui/BOINCTaskBar.h
@@ -36,7 +36,7 @@ class CTaskbarEvent;
class CTaskBarIcon : public wxTaskBarIconEx {
public:
- CTaskBarIcon(wxString title, wxIcon* icon, wxIcon* iconDisconnected, wxIcon* iconSnooze);
+ CTaskBarIcon(wxString title, wxIconBundle* icon, wxIconBundle* iconDisconnected, wxIconBundle* iconSnooze);
~CTaskBarIcon();
void OnOpenWebsite(wxCommandEvent& event);
@@ -64,6 +64,8 @@ public:
wxMenu *BuildContextMenu();
void AdjustMenuItems(wxMenu* menu);
+ wxSize GetBestIconSize();
+
#ifdef __WXMAC__
private:
NMRecPtr m_pNotificationRequest;
diff --git a/clientgui/DlgAdvPreferences.cpp b/clientgui/DlgAdvPreferences.cpp
index 020084f..fde6f7b 100644
--- a/clientgui/DlgAdvPreferences.cpp
+++ b/clientgui/DlgAdvPreferences.cpp
@@ -84,7 +84,7 @@ CDlgAdvPreferences::CDlgAdvPreferences(wxWindow* parent) : CDlgAdvPreferencesBas
iImageIndex = pImageList->Add(wxBitmap(usage_xpm));
m_Notebook->SetPageImage(2,iImageIndex);
- iImageIndex = pImageList->Add(*pSkinAdvanced->GetApplicationSnoozeIcon());
+ iImageIndex = pImageList->Add(pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(wxSize(16,16)));
m_Notebook->SetPageImage(3,iImageIndex);
//setting warning bitmap
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index d60a03d..a06037c 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -221,10 +221,7 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
SetTitle(strCaption);
// Initialize Application Icon
- wxIconBundle icons;
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon());
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon32());
- SetIcons(icons);
+ SetIcons(*pSkinAdvanced->GetApplicationIcon());
CreateControls();
diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp
index b9716d3..b83f7a3 100644
--- a/clientgui/SkinManager.cpp
+++ b/clientgui/SkinManager.cpp
@@ -42,7 +42,9 @@
#include "res/boinc.xpm"
#include "res/boinc32.xpm"
#include "res/boincdisconnect.xpm"
+#include "res/boincdisconnect32.xpm"
#include "res/boincsnooze.xpm"
+#include "res/boincsnooze32.xpm"
#include "res/boinc_logo.xpm"
////@end XPM images
@@ -189,9 +191,9 @@ CSkinIcon::~CSkinIcon() {
void CSkinIcon::Clear() {
+ bInitialized = false;
m_strDesiredIcon.Clear();
m_strDesiredTransparencyMask.Clear();
- m_icoIcon = wxNullIcon;
}
@@ -221,40 +223,139 @@ int CSkinIcon::Parse(MIOFILE& in) {
}
-wxIcon* CSkinIcon::GetIcon() {
+int CSkinIcon::Parse32(MIOFILE& in) {
+ char buf[256];
+ std::string strBuffer;
+
+ while (in.fgets(buf, 256)) {
+ if (match_tag(buf, "</image>")) break;
+ else if (parse_str(buf, "<imagesrc>", strBuffer)) {
+ if (strBuffer.length()) {
+ m_strDesiredIcon32 = wxString(
+ wxGetApp().GetSkinManager()->ConstructSkinPath() +
+ wxString(strBuffer.c_str(), wxConvUTF8)
+ );
+ }
+ continue;
+ } else if (parse_str(buf, "<transparency_mask>", strBuffer)) {
+ if (strBuffer.length()) {
+ m_strDesiredTransparencyMask32 = wxString(strBuffer.c_str(), wxConvUTF8);
+ }
+ continue;
+ }
+ }
+
+ return BOINC_SUCCESS;
+}
+
+
+wxIconBundle* CSkinIcon::GetIcon() {
Validate();
return &m_icoIcon;
}
+#if defined(__WXMSW__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
+#elif defined(__WXMOTIF__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+#elif defined(__WXGTK20__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+#elif defined(__WXGTK__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+#elif defined(__WXX11__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+#elif defined(__WXDFB__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM
+#elif defined(__WXMAC__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE
+#elif defined(__WXCOCOA__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE
+#elif defined(__WXPM__)
+ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE
+#endif
+
+bool CSkinIcon::SetDefaults(wxString strComponentName, wxString strIcon) {
+ if (bInitialized) return true;
-bool CSkinIcon::SetDefaults(wxString strComponentName, const char** ppDefaultIcon) {
m_strComponentName = strComponentName;
- m_ppDefaultIcon = ppDefaultIcon;
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 16, 16));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 20, 20));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 24, 24));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 32, 32));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 40, 40));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 48, 48));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 64, 64));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 80, 80));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 96, 96));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 128, 128));
+ m_icoDefaultIcon.AddIcon(wxIcon(strIcon, wxICON_DEFAULT_TYPE, 256, 256));
+ bInitialized = true;
+
+ return true;
+}
+
+
+bool CSkinIcon::SetDefaults(wxString strComponentName, const char** m_ppIcon, const char** m_ppIcon32) {
+ if (bInitialized) return true;
+
+ m_strComponentName = strComponentName;
+ m_icoDefaultIcon.AddIcon(wxIcon(m_ppIcon));
+ m_icoDefaultIcon.AddIcon(wxIcon(m_ppIcon32));
+ bInitialized = true;
+
return true;
}
bool CSkinIcon::Validate() {
- if (!m_icoIcon.Ok()) {
- if (!m_strDesiredIcon.IsEmpty()) {
- // Configure bitmap object with optional transparency mask
- wxImage img = wxImage(m_strDesiredIcon, wxBITMAP_TYPE_ANY);
- wxBitmap bmp = wxBitmap(img);
- // If PNG file has alpha channel use it as mask & ignore <transparency_mask> tag
- if (!(m_strDesiredTransparencyMask.IsEmpty() || img.HasAlpha())) {
- bmp.SetMask(new wxMask(bmp, ParseColor(m_strDesiredTransparencyMask)));
- }
- // Now set the icon object using the newly created bitmap with optional transparency mask
- m_icoIcon.CopyFromBitmap(bmp);
+ wxIcon ico;
+ wxIcon ico32;
+ bool set_ico = false;
+ bool set_ico32 = false;
+
+ // Setup baseline
+ m_icoIcon = m_icoDefaultIcon;
+
+ if (!m_strDesiredIcon.IsEmpty()) {
+ // Configure bitmap object with optional transparency mask
+ wxImage img = wxImage(m_strDesiredIcon, wxBITMAP_TYPE_ANY);
+ wxBitmap bmp = wxBitmap(img);
+ // If PNG file has alpha channel use it as mask & ignore <transparency_mask> tag
+ if (!(m_strDesiredTransparencyMask.IsEmpty() || img.HasAlpha())) {
+ bmp.SetMask(new wxMask(bmp, ParseColor(m_strDesiredTransparencyMask)));
}
- if (!m_icoIcon.Ok()) {
+ // Now set the icon object using the newly created bitmap with optional transparency mask
+ set_ico = true;
+ ico.CopyFromBitmap(bmp);
+ }
+ if (!m_strDesiredIcon32.IsEmpty()) {
+ // Configure bitmap object with optional transparency mask
+ wxImage img32 = wxImage(m_strDesiredIcon32, wxBITMAP_TYPE_ANY);
+ wxBitmap bmp32 = wxBitmap(img32);
+ // If PNG file has alpha channel use it as mask & ignore <transparency_mask> tag
+ if (!(m_strDesiredTransparencyMask32.IsEmpty() || img32.HasAlpha())) {
+ bmp32.SetMask(new wxMask(bmp32, ParseColor(m_strDesiredTransparencyMask32)));
+ }
+ // Now set the icon object using the newly created bitmap with optional transparency mask
+ set_ico32 = true;
+ ico32.CopyFromBitmap(bmp32);
+ }
+
+ if (set_ico || set_ico32) {
+ if ((set_ico && !ico.IsOk()) || (set_ico32 && !ico32.IsOk())) {
if (show_error_msgs) {
fprintf(stderr, "Skin Manager: Failed to load '%s' icon. Using default.\n", (const char *)m_strComponentName.mb_str());
}
- m_icoIcon = wxIcon(m_ppDefaultIcon);
- wxASSERT(m_icoIcon.Ok());
+ } else {
+ if (ico.IsOk()) {
+ m_icoIcon.AddIcon(ico);
+ }
+ if (ico32.IsOk()) {
+ m_icoIcon.AddIcon(ico32);
+ }
}
}
+
return true;
}
@@ -374,7 +475,6 @@ void CSkinAdvanced::Clear() {
m_strApplicationName = wxEmptyString;
m_strApplicationShortName = wxEmptyString;
m_iconApplicationIcon.Clear();
- m_iconApplicationIcon32.Clear();
m_iconApplicationDisconnectedIcon.Clear();
m_iconApplicationSnoozeIcon.Clear();
m_bitmapApplicationLogo = wxNullBitmap;
@@ -404,7 +504,7 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
m_iconApplicationIcon.Parse(in);
continue;
} else if (match_tag(buf, "<application_icon32>")) {
- m_iconApplicationIcon32.Parse(in);
+ m_iconApplicationIcon.Parse32(in);
continue;
} else if (match_tag(buf, "<application_disconnected_icon>")) {
m_iconApplicationDisconnectedIcon.Parse(in);
@@ -448,7 +548,7 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
wxString CSkinAdvanced::GetApplicationName() {
wxString strApplicationName = m_strApplicationName;
#ifdef BOINC_PRERELEASE
- strApplicationName += wxT(" (Pre-release)");
+ strApplicationName += wxT(" (Pre-release)");
#endif
return strApplicationName;
}
@@ -459,20 +559,17 @@ wxString CSkinAdvanced::GetApplicationShortName() {
}
-wxIcon* CSkinAdvanced::GetApplicationIcon() {
+wxIconBundle* CSkinAdvanced::GetApplicationIcon() {
return m_iconApplicationIcon.GetIcon();
}
-wxIcon* CSkinAdvanced::GetApplicationIcon32() {
- return m_iconApplicationIcon32.GetIcon();
-}
-wxIcon* CSkinAdvanced::GetApplicationDisconnectedIcon() {
+wxIconBundle* CSkinAdvanced::GetApplicationDisconnectedIcon() {
return m_iconApplicationDisconnectedIcon.GetIcon();
}
-wxIcon* CSkinAdvanced::GetApplicationSnoozeIcon() {
+wxIconBundle* CSkinAdvanced::GetApplicationSnoozeIcon() {
return m_iconApplicationSnoozeIcon.GetIcon();
}
@@ -527,10 +624,15 @@ bool CSkinAdvanced::InitializeDelayedValidation() {
m_strApplicationShortName = wxT("BOINC");
wxASSERT(!m_strApplicationShortName.IsEmpty());
}
- m_iconApplicationIcon.SetDefaults(wxT("application"), (const char**)boinc_xpm);
- m_iconApplicationIcon32.SetDefaults(wxT("application"), (const char**)boinc32_xpm);
- m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), (const char**)boincdisconnect_xpm);
- m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), (const char**)boincsnooze_xpm);
+#ifdef _WIN32
+ m_iconApplicationIcon.SetDefaults(wxT("application"), wxT("boinc"));
+ m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), wxT("boincdisconnect"));
+ m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), wxT("boincsnooze"));
+#else
+ m_iconApplicationIcon.SetDefaults(wxT("application"), boinc_xpm, boinc32_xpm);
+ m_iconApplicationDisconnectedIcon.SetDefaults(wxT("application disconnected"), boincdisconnect_xpm, boincdisconnect32_xpm);
+ m_iconApplicationSnoozeIcon.SetDefaults(wxT("application snooze"), boincsnooze_xpm, boincsnooze32_xpm);
+#endif
if (!m_bitmapApplicationLogo.Ok()) {
if (show_error_msgs) {
fprintf(stderr, "Skin Manager: Failed to load application logo. Using default.\n");
diff --git a/clientgui/SkinManager.h b/clientgui/SkinManager.h
index eb1cd72..221496a 100644
--- a/clientgui/SkinManager.h
+++ b/clientgui/SkinManager.h
@@ -83,12 +83,19 @@ public:
void Clear();
int Parse(MIOFILE& in);
+ int Parse32(MIOFILE& in);
- wxIcon* GetIcon();
+ wxIconBundle* GetIcon();
bool SetDefaults(
wxString strComponentName,
- const char** ppDefaultIcon
+ wxString strIcon
+ );
+
+ bool SetDefaults(
+ wxString strComponentName,
+ const char** m_ppIcon,
+ const char** m_ppIcon32
);
bool Validate();
@@ -97,8 +104,12 @@ private:
wxString m_strComponentName;
wxString m_strDesiredIcon;
wxString m_strDesiredTransparencyMask;
- const char** m_ppDefaultIcon;
- wxIcon m_icoIcon;
+ wxIconBundle m_icoDefaultIcon;
+ wxString m_strDesiredIcon32;
+ wxString m_strDesiredTransparencyMask32;
+ wxIconBundle m_icoDefaultIcon32;
+ wxIconBundle m_icoIcon;
+ bool bInitialized;
};
@@ -158,35 +169,33 @@ public:
bool InitializeDelayedValidation();
- wxString GetApplicationName();
- wxString GetApplicationShortName();
- wxIcon* GetApplicationIcon();
- wxIcon* GetApplicationIcon32();
- wxIcon* GetApplicationDisconnectedIcon();
- wxIcon* GetApplicationSnoozeIcon();
- wxBitmap* GetApplicationLogo();
- wxString GetOrganizationName();
- wxString GetOrganizationWebsite();
- wxString GetOrganizationHelpUrl();
- int GetDefaultTab();
- wxString GetExitMessage();
- bool IsBranded();
+ wxString GetApplicationName();
+ wxString GetApplicationShortName();
+ wxIconBundle* GetApplicationIcon();
+ wxIconBundle* GetApplicationDisconnectedIcon();
+ wxIconBundle* GetApplicationSnoozeIcon();
+ wxBitmap* GetApplicationLogo();
+ wxString GetOrganizationName();
+ wxString GetOrganizationWebsite();
+ wxString GetOrganizationHelpUrl();
+ int GetDefaultTab();
+ wxString GetExitMessage();
+ bool IsBranded();
private:
- bool m_bIsBranded;
- wxString m_strApplicationName;
- wxString m_strApplicationShortName;
- CSkinIcon m_iconApplicationIcon;
- CSkinIcon m_iconApplicationIcon32;
- CSkinIcon m_iconApplicationDisconnectedIcon;
- CSkinIcon m_iconApplicationSnoozeIcon;
- wxBitmap m_bitmapApplicationLogo;
- wxString m_strOrganizationName;
- wxString m_strOrganizationWebsite;
- wxString m_strOrganizationHelpUrl;
- bool m_bDefaultTabSpecified;
- int m_iDefaultTab;
- wxString m_strExitMessage;
+ bool m_bIsBranded;
+ wxString m_strApplicationName;
+ wxString m_strApplicationShortName;
+ CSkinIcon m_iconApplicationIcon;
+ CSkinIcon m_iconApplicationDisconnectedIcon;
+ CSkinIcon m_iconApplicationSnoozeIcon;
+ wxBitmap m_bitmapApplicationLogo;
+ wxString m_strOrganizationName;
+ wxString m_strOrganizationWebsite;
+ wxString m_strOrganizationHelpUrl;
+ bool m_bDefaultTabSpecified;
+ int m_iDefaultTab;
+ wxString m_strExitMessage;
};
diff --git a/clientgui/res/boinc.ico b/clientgui/res/boinc.ico
new file mode 100644
index 0000000..c535bce
Binary files /dev/null and b/clientgui/res/boinc.ico differ
diff --git a/clientgui/res/boinc.xpm b/clientgui/res/boinc.xpm
index bf37e6d..5dc60be 100644
--- a/clientgui/res/boinc.xpm
+++ b/clientgui/res/boinc.xpm
@@ -1,35 +1,95 @@
/* XPM */
static const char *boinc_xpm[] = {
/* columns rows colors chars-per-pixel */
-"16 16 10 1",
-"@ c #F8BC1A",
-"+ c #293F64",
-". c None",
-"O c #ED9D00",
-"$ c #FFD93E",
-"% c #FFD824",
-"o c #203C66",
-"X c #174A78",
-" c #0E588A",
-"# c #FFDE49",
+"16 16 69 1",
+"1 c #355684",
+"c c #245081",
+"n c #244A7B",
+"F c #316293",
+"4 c #768DAC",
+"3 c #7B91AE",
+"A c #607A9E",
+"l c #FED035",
+"7 c #FED037",
+"u c #FED346",
+"i c #526F96",
+"f c #577398",
+"w c #FFC803",
+"C c #375885",
+"+ c #295C8E",
+"j c #788FAD",
+"X c #134F87",
+"L c #6A93B7",
+"g c #24497A",
+"9 c #768CAB",
+"J c #7495B5",
+"; c #315B8A",
+"# c #7993B2",
+"= c #7E97B4",
+"< c #183E72",
+". c #5784AD",
+" c None",
+"o c #86A2BE",
+"m c #164176",
+"s c #FECC24",
+"y c #FECC25",
+"$ c #637DA1",
+"* c #6881A3",
+"- c #285A8D",
+"t c #7289A9",
+"d c #FED244",
+"Z c #395A86",
+"q c #FFCD06",
+"h c #43628C",
+"N c #21568A",
+"0 c #FFCA04",
+"p c #193F73",
+"G c #5D89AF",
+"B c #15487D",
+"@ c #15487E",
+"v c #738AA9",
+"z c #738AAA",
+"H c #134E86",
+"% c #3F5F8A",
+"M c #3D6591",
+"S c #6081A5",
+"5 c #2C5686",
+"V c #5B779B",
+"a c #6F87A7",
+"2 c #365884",
+"6 c #3B5C88",
+"r c #40608A",
+"O c #618BB0",
+"x c #4A6891",
+": c #164075",
+"D c #14497F",
+"k c #FECE2F",
+"8 c #FED13D",
+"b c #3C5D88",
+"& c #41618B",
+", c #173E72",
+"K c #135088",
+"e c #214678",
+"> c #2B4E7E",
/* pixels */
-" ............ ",
-" XX..........XX ",
-".Xoo..oooo..ooX.",
-"..ooooooo..ooo..",
-"...ooo....ooo...",
-"....o..OO..++...",
-"..o...O@@O..oo..",
-"..oo.O@##@O.oo..",
-"..oo.O@$%@O.oo..",
-"..oo..O@@O...o..",
-"...++..OO..o....",
-"...ooo....+oo...",
-"..ooo..ooo+ooo..",
-".ooo..oooo..ooX.",
-" oo..........XX ",
-" ............ "
+" ",
+".X oXO",
+" +@# $%&* =@- ",
+" ;:>,<123 4:5 ",
+" 6,4 ,< ",
+" 78 9, ",
+" 1 0qqw er ",
+" ,t yqqqqu ip ",
+" ,a sqqqqd f< ",
+" g1 0qqw h ",
+" j, kl ",
+" ,< z,x ",
+" c: v%bp,nmM ",
+" NB VCZA SDF ",
+"GH JKL",
+" "
};
+
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2013 University of California
diff --git a/clientgui/res/boinc32.xpm b/clientgui/res/boinc32.xpm
index 6ed58be..2b001da 100644
--- a/clientgui/res/boinc32.xpm
+++ b/clientgui/res/boinc32.xpm
@@ -1,511 +1,214 @@
-/* XPM */
-static const char * boinc32_xpm[] = {
-"32 32 460 2",
-" c None",
-". c #597C9E",
-"+ c #174876",
-"@ c #3E6790",
-"# c #8BA1B8",
-"$ c #225C96",
-"% c #174674",
-"& c #375E88",
-"* c #90A2B7",
-"= c #123965",
-"- c #163D68",
-"; c #173D67",
-"> c #1A4875",
-", c #1B4674",
-"' c #194370",
-") c #2B527C",
-"! c #F9FDFF",
-"~ c #F5FAFF",
-"{ c #EAF0F9",
-"] c #DBE3EE",
-"^ c #C9D3E2",
-"/ c #C4CFDF",
-"( c #CAD5E5",
-"_ c #DBE4F3",
-": c #96A5B8",
-"< c #123461",
-"[ c #173862",
-"} c #17375F",
-"| c #24538B",
-"1 c #255C95",
-"2 c #1B4471",
-"3 c #1D4470",
-"4 c #1A416C",
-"5 c #234772",
-"6 c #A1B4CD",
-"7 c #FBFEFF",
-"8 c #F9F9FB",
-"9 c #8592A8",
-"0 c #48658D",
-"a c #31486E",
-"b c #203A64",
-"c c #193460",
-"d c #1A3560",
-"e c #233D66",
-"f c #2A436B",
-"g c #4A6184",
-"h c #E6EFFB",
-"i c #98A4B6",
-"j c #14315C",
-"k c #18355E",
-"l c #17335A",
-"m c #224E86",
-"n c #225993",
-"o c #1B416C",
-"p c #1E416C",
-"q c #1C3E69",
-"r c #203F6B",
-"s c #879CBB",
-"t c #D1DBE7",
-"u c #8A98AB",
-"v c #395B89",
-"w c #204270",
-"x c #0E305E",
-"y c #122E5B",
-"z c #14305D",
-"A c #15305D",
-"B c #142F56",
-"C c #ECF2F7",
-"D c #E8F2FE",
-"E c #E9F3FF",
-"F c #99A5B8",
-"G c #15315C",
-"H c #19325B",
-"I c #193056",
-"J c #164077",
-"K c #265991",
-"L c #1B3D69",
-"M c #1F3E69",
-"N c #1C3863",
-"O c #253F68",
-"P c #243F67",
-"Q c #152F5A",
-"R c #0F315F",
-"S c #17345B",
-"T c #1C3E6C",
-"U c #234573",
-"V c #224472",
-"W c #153765",
-"X c #203A57",
-"Y c #F6F9FA",
-"Z c #EFF9FF",
-"` c #E8F2FF",
-" . c #F6FCFF",
-".. c #99A6B7",
-"+. c #183460",
-"@. c #1B365F",
-"#. c #1A3157",
-"$. c #103569",
-"%. c #225087",
-"&. c #1F3962",
-"*. c #1A355D",
-"=. c #103260",
-"-. c #183A68",
-";. c #7592B9",
-">. c #FCFFFF",
-",. c #F6FBFE",
-"'. c #C7D9EE",
-"). c #E0EDFB",
-"!. c #F5FBFF",
-"~. c #F1F8FF",
-"{. c #F6F7F1",
-"]. c #9CA4AB",
-"^. c #173460",
-"/. c #1C3963",
-"(. c #1F3860",
-"_. c #0E366C",
-":. c #B5CBE5",
-"<. c #1A467D",
-"[. c #163460",
-"}. c #143664",
-"|. c #294B79",
-"1. c #6A8CBA",
-"2. c #1B3760",
-"3. c #18335F",
-"4. c #213C65",
-"5. c #163664",
-"6. c #A1B8D5",
-"7. c #EFF7FF",
-"8. c #C0D4EA",
-"9. c #174984",
-"0. c #315381",
-"a. c #BCD5F5",
-"b. c #436593",
-"c. c #1B3660",
-"d. c #19325C",
-"e. c #1B3862",
-"f. c #6B7F9F",
-"g. c #E8F1FE",
-"h. c #E9F4FF",
-"i. c #F3FAFF",
-"j. c #CFE0F2",
-"k. c #385A88",
-"l. c #FDECB3",
-"m. c #FDE193",
-"n. c #FCDA73",
-"o. c #FBD265",
-"p. c #FBCE54",
-"q. c #FCDA6E",
-"r. c #BFD8F8",
-"s. c #3A5C8A",
-"t. c #1F3C67",
-"u. c #1C3B67",
-"v. c #C0CDE0",
-"w. c #2A4268",
-"x. c #EBF2F8",
-"y. c #F8FCFF",
-"z. c #FEE9A9",
-"A. c #FFF9E5",
-"B. c #FFFEFB",
-"C. c #FFFBEF",
-"D. c #FFF5D0",
-"E. c #FEE99C",
-"F. c #FEDA68",
-"G. c #F8C43C",
-"H. c #83A5D3",
-"I. c #264571",
-"J. c #1C3A69",
-"K. c #1A3B6B",
-"L. c #677FA1",
-"M. c #DFEAFB",
-"N. c #112D54",
-"O. c #0C2852",
-"P. c #FEE38C",
-"Q. c #FFF2C7",
-"R. c #FFF9E3",
-"S. c #FFEFB7",
-"T. c #FEEA9D",
-"U. c #FEE484",
-"V. c #FDD659",
-"W. c #F8C238",
-"X. c #4F719F",
-"Y. c #2C558B",
-"Z. c #265085",
-"`. c #1E3F6C",
-" + c #B9CCE6",
-".+ c #0B2750",
-"++ c #0E2A52",
-"@+ c #1B3860",
-"#+ c #FDDF7F",
-"$+ c #FFEAA6",
-"%+ c #FFF2C5",
-"&+ c #FFF0BA",
-"*+ c #FFEDAB",
-"=+ c #FEECA7",
-"-+ c #FEEBA3",
-";+ c #FEE99B",
-">+ c #FEE588",
-",+ c #FDDF71",
-"'+ c #F9C12A",
-")+ c #F7C751",
-"!+ c #9EB7D7",
-"~+ c #48668B",
-"{+ c #2C4975",
-"]+ c #153360",
-"^+ c #C0CDDF",
-"/+ c #7992B7",
-"(+ c #0B2850",
-"_+ c #0F2B54",
-":+ c #314D72",
-"<+ c #C4D7EF",
-"[+ c #FBD25A",
-"}+ c #FEE58D",
-"|+ c #FEECA6",
-"1+ c #FEE78E",
-"2+ c #FEE589",
-"3+ c #FDDF7B",
-"4+ c #FCD55A",
-"5+ c #FBCC3E",
-"6+ c #FAC42B",
-"7+ c #F4B10E",
-"8+ c #F0B227",
-"9+ c #324764",
-"0+ c #2A4168",
-"a+ c #17325B",
-"b+ c #A1B0C6",
-"c+ c #7488A4",
-"d+ c #203E6A",
-"e+ c #597595",
-"f+ c #F8BF33",
-"g+ c #FDD75D",
-"h+ c #FDD759",
-"i+ c #FDCF44",
-"j+ c #FCCA36",
-"k+ c #FBC528",
-"l+ c #FBC01B",
-"m+ c #FABB12",
-"n+ c #F8B70D",
-"o+ c #F6B50A",
-"p+ c #F0AC06",
-"q+ c #EDA613",
-"r+ c #1A3050",
-"s+ c #0E254E",
-"t+ c #092149",
-"u+ c #93A2BC",
-"v+ c #7F90AA",
-"w+ c #486383",
-"x+ c #F6B923",
-"y+ c #F6B60F",
-"z+ c #F9BC13",
-"A+ c #F9BD14",
-"B+ c #F9BD16",
-"C+ c #F9BD17",
-"D+ c #F8BB14",
-"E+ c #F6B60E",
-"F+ c #F4B308",
-"G+ c #F4B207",
-"H+ c #EFAB06",
-"I+ c #F0A412",
-"J+ c #1B3352",
-"K+ c #10264F",
-"L+ c #071D46",
-"M+ c #95A7C5",
-"N+ c #7587A4",
-"O+ c #152C53",
-"P+ c #13294F",
-"Q+ c #143056",
-"R+ c #E59D00",
-"S+ c #EDA803",
-"T+ c #F4B50C",
-"U+ c #F5B60E",
-"V+ c #F5B40B",
-"W+ c #F4B208",
-"X+ c #F3B106",
-"Y+ c #F3B207",
-"Z+ c #F4B50E",
-"`+ c #F0AC0D",
-" @ c #F5AC26",
-".@ c #0D2342",
-"+@ c #0F254D",
-"@@ c #09224C",
-"#@ c #A6B9D5",
-"$@ c #132A50",
-"%@ c #062651",
-"&@ c #A3B2C1",
-"*@ c #FDFEFF",
-"=@ c #EBBC4D",
-"-@ c #F0B008",
-";@ c #F2AF05",
-">@ c #F3B30B",
-",@ c #F3B510",
-"'@ c #F7C027",
-")@ c #F7C332",
-"!@ c #F4AE16",
-"~@ c #F7C361",
-"{@ c #163658",
-"]@ c #0D2148",
-"^@ c #0D2A58",
-"/@ c #C2D2E9",
-"(@ c #A8B6CE",
-"_@ c #1C355E",
-":@ c #13294E",
-"<@ c #0B2853",
-"[@ c #294363",
-"}@ c #E4A00A",
-"|@ c #EBA707",
-"1@ c #F3B310",
-"2@ c #F7BE22",
-"3@ c #F6BB1E",
-"4@ c #FAC430",
-"5@ c #FCCB3E",
-"6@ c #FBD25B",
-"7@ c #F8B52D",
-"8@ c #0B356D",
-"9@ c #16386B",
-"0@ c #F0F7FE",
-"a@ c #3C5D8C",
-"b@ c #0E254C",
-"c@ c #09264E",
-"d@ c #AEBDCD",
-"e@ c #E7A309",
-"f@ c #F5BB26",
-"g@ c #FAC438",
-"h@ c #FCD256",
-"i@ c #FCD763",
-"j@ c #FAD150",
-"k@ c #F8BA37",
-"l@ c #F1F9FF",
-"m@ c #FDFFFF",
-"n@ c #6C90C0",
-"o@ c #AEC1DB",
-"p@ c #102C59",
-"q@ c #19365B",
-"r@ c #EFBA3A",
-"s@ c #F8C455",
-"t@ c #5072A0",
-"u@ c #9BB4D7",
-"v@ c #EAF4FF",
-"w@ c #EEF6FD",
-"x@ c #0E2A57",
-"y@ c #294669",
-"z@ c #7A9CCA",
-"A@ c #14305C",
-"B@ c #184278",
-"C@ c #A9C1DE",
-"D@ c #C8D3E1",
-"E@ c #173058",
-"F@ c #0B2857",
-"G@ c #334D63",
-"H@ c #FEFEFF",
-"I@ c #698BB9",
-"J@ c #122F5C",
-"K@ c #16315E",
-"L@ c #18335D",
-"M@ c #174279",
-"N@ c #B7CCE5",
-"O@ c #4A6283",
-"P@ c #132A51",
-"Q@ c #122A52",
-"R@ c #123B6F",
-"S@ c #A3B9D4",
-"T@ c #FAFEFF",
-"U@ c #E3EDF8",
-"V@ c #D2DFEE",
-"W@ c #F5FAFA",
-"X@ c #F2F8FE",
-"Y@ c #DDE5E4",
-"Z@ c #81A3D1",
-"`@ c #335583",
-" # c #0B2758",
-".# c #142C56",
-"+# c #183057",
-"@# c #1B345B",
-"## c #19335C",
-"$# c #18457C",
-"%# c #607794",
-"&# c #142F57",
-"*# c #10366A",
-"=# c #A3BCDC",
-"-# c #F2FBFF",
-";# c #F2FAFF",
-"># c #16355D",
-",# c #2A4665",
-"'# c #3F5871",
-")# c #465F78",
-"!# c #3E5874",
-"~# c #214371",
-"{# c #092B59",
-"]# c #0D2755",
-"^# c #162C52",
-"/# c #112A53",
-"(# c #0F2952",
-"_# c #172E54",
-":# c #1A3158",
-"<# c #19325A",
-"[# c #1A4378",
-"}# c #67809D",
-"|# c #0C325E",
-"1# c #143767",
-"2# c #F0F9FF",
-"3# c #0B254E",
-"4# c #102851",
-"5# c #112851",
-"6# c #14294E",
-"7# c #102953",
-"8# c #0D3165",
-"9# c #5376A5",
-"0# c #6C83A5",
-"a# c #0B2147",
-"b# c #13284C",
-"c# c #162B51",
-"d# c #193159",
-"e# c #113B6F",
-"f# c #607E9E",
-"g# c #0D3665",
-"h# c #193A67",
-"i# c #DFE9F8",
-"j# c #4B6E9F",
-"k# c #193D74",
-"l# c #0E2D5D",
-"m# c #0C2652",
-"n# c #0C254F",
-"o# c #0C2651",
-"p# c #103367",
-"q# c #1B4783",
-"r# c #4974AB",
-"s# c #ADC4E2",
-"t# c #081D44",
-"u# c #112548",
-"v# c #152D53",
-"w# c #1B4271",
-"x# c #5C7FA0",
-"y# c #0D3B6A",
-"z# c #163E6A",
-"A# c #204675",
-"B# c #D1E0F5",
-"C# c #ABC2E3",
-"D# c #8CA9D2",
-"E# c #7C9CCA",
-"F# c #7C9ECD",
-"G# c #8EAEDA",
-"H# c #ADC7EB",
-"I# c #D2E2F8",
-"J# c #122A4F",
-"K# c #17355D",
-"L# c #1A3C66",
-"M# c #487097",
-"N# c #104272",
-"O# c #16426E",
-"P# c #153C67",
-"Q# c #27548C",
-"R# c #1D4173",
-"S# c #143158",
-"T# c #163962",
-"U# c #183F6A",
-"V# c #1C416D",
-"W# c #275A94",
-"X# c #15426F",
-"Y# c #224D83",
-"Z# c #13365F",
-"`# c #2A5283",
-" . + ",
-" @ + @ # + + ",
-"$ + + % & * = - ; + ",
-" $ > , ' ) ! ~ { ] ^ / ( _ : < [ } | ",
-" 1 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m ",
-" n o p q r s t u v w x y z z A z B C D E F G H I J ",
-" K L M N O P Q R R S T U V W X Y Z ` ...+. at .#.$. ",
-" %.N &.*.=.R -.;.>.,.>.>.'.).!.~.{.].^./.(._. ",
-" :.<.[.}.R |.>.>.>.>.>.>.>.>.>.>.1.2.3.4.5.6. ",
-" 7.8.9.x 0.>.>.>.>.>.>.>.>.>.>.>.a.b.c.d.e.f. ",
-" g.h.i.j.k.>.>.>.>.l.m.n.o.p.q.>.>.>.r.s.c t.u.v. ",
-" w.x. .y.>.>.>.>.z.A.B.C.D.E.F.G.>.>.>.H.I.J.K.L. ",
-" M.N.O.>.y.>.>.>.P.Q.R.R.D.S.T.U.V.W.>.>.>.X.Y.Z.`. ",
-" +.+++ at +).>.>.#+$+%+&+*+=+-+;+>+,+'+)+>.>.!+~+{+]+^+ ",
-" /+(+_+:+<+>.>.[+}+|+1+2+}+3+4+5+6+7+8+>.>.>.9+0+a+b+ ",
-" c+[.d+e+>.>.>.f+g+h+i+j+k+l+m+n+o+p+q+>.>.>.r+s+t+u+ ",
-" v+d+d+w+>.>.>.x+y+z+A+B+C+D+E+F+G+H+I+>.>.>.J+K+L+M+ ",
-" N+O+P+Q+>.>.>.R+S+T+U+E+V+W+X+Y+Z+`+ @>.>.<+. at +@@@#@ ",
-" /+$@P+%@&@*@>.=@R+- at X+;@X+>@,@'@)@!@~@>.>.).{@]@^@/@ ",
-" (@_@:@<@[@*@>.>.}@|@1 at 2@3 at 4@5@,+6 at 7@>.>.>.y.>.8 at 9@ ",
-" 0 at a@b at c@c at d@>.>.>.e at f@g at h@i@,+j at k@>.>.>.>.y.l at m@n@ ",
-" o at p@c at c@q@>.>.>.>.r@,@,@,@, at s@>.>.>.>.t at u@i.v@ ",
-" w at a@c at c@x at y@>.>.>.>.>.>.>.>.>.>.>.>.z at A@B at C@~. ",
-" D at E@c at c@F at G@>.>.>.>.>.>.H at H@H@>.I at J@K at L@M at N@ ",
-" O at P@P at Q@R at S@T at T@>.U at V@W at X@Y at Z@`@ #.#+#@###$# ",
-" %#&#&#P@*#=#-#;#m@>#,#'#)#!#~#{#]#^#/#(#_#:#<#[# ",
-" }#|#|## 2#D 3#4#c at c@c at c@5#6#7#8#9#0#a#b#c#d#e# ",
-" f#g#g#|#h# i#j#k#l#m#n#o#c at p#q#r#s# t#u#v#@+w# ",
-" x#y#z#g#A# B#C#D#E#F#G#H#I# x at J#K#L#2 ",
-"M#N#O#P#Q# R#S#T#U#V#",
-" W#X#W# Y#Z#S# ",
-" W# `# "};
-// This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2013 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 *boinc32_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 159 2",
+"c. c #7B9AB9",
+"& c #134D85",
+"8. c #FFCF3F",
+"g. c #567EA6",
+"^ c #6C85A6",
+"f. c #2E5281",
+"u. c #8599B5",
+"C. c #638DB3",
+"( c #4C6A92",
+"4 c #5B769B",
+". c #14548C",
+"Z. c #19588F",
+"{ c #1D4375",
+"H. c #86A6C2",
+"+ c #86A3BF",
+", c #144B83",
+"f c #7791AF",
+"F c #163F74",
+"1 c #14487D",
+"=. c #FEC104",
+"w. c #6D86A6",
+"$ c #12518A",
+"d c #778EAC",
+"$. c #FECD36",
+"t. c #5C7DA2",
+"@. c #FECD38",
+"R c #43638D",
+"Y c #FED350",
+"J c #48678F",
+"/ c #486791",
+"7. c #FED969",
+") c #FED96A",
+"C c #577399",
+"A c #5C779C",
+"F. c #15558D",
+"M. c #698FB3",
+"4. c #FEDC78",
+"! c #FFC802",
+"H c #194074",
+"-. c #234879",
+"_ c #FFC501",
+"q c #15497F",
+"X c #13528B",
+"S. c #7194B5",
+"d. c #7D93B0",
+"k c #15467C",
+"8 c #8297B3",
+"% c #134F87",
+"D. c #134F88",
+"N c #154378",
+"g c #154379",
+"w c #517CA5",
+": c #658CB0",
+"9 c #809AB7",
+"7 c #5D789C",
+"b c #627C9F",
+"i. c #6780A2",
+"l. c #1F4577",
+"D c #6C84A5",
+"v c #294D7D",
+"G c #607FA3",
+"P c #183E72",
+"p c #8398B3",
+"2 c #6383A7",
+" c None",
+"B. c #144D85",
+"q. c #5E7CA0",
+"p. c #164176",
+"h. c #144A80",
+"r c #144A81",
+"* c #144A82",
+"h c #577EA5",
+"s c #163E72",
+"6. c #1B4274",
+"X. c #163E73",
+"r. c #1B4275",
+"0 c #14477D",
+"a c #254A7A",
+"Z c #7289A9",
+"B c #5C7FA4",
+"5. c #2A4E7E",
+":. c #2F5280",
+"b. c #395A86",
+"9. c #FECF41",
+"o. c #FED866",
+"j c #849FBB",
+">. c #FED55D",
+"*. c #FFCA03",
+"` c #FFCA04",
+"G. c #1A588E",
+"V. c #5F83A9",
+"O. c #FFC702",
+";. c #41628C",
+"# c #5D89B0",
+",. c #FFC400",
+"v. c #537EA7",
+"J. c #13548D",
+"K c #647EA0",
+" . c #647EA1",
+"t c #15487E",
+"k. c #738AA9",
+"V c #264B7B",
+"y c #15457B",
+"> c #134E85",
+"O c #134E86",
+"} c #3A5B87",
+"M c #154276",
+"c c #3F5F8A",
+"z c #154277",
+"%. c #FFD355",
+"0. c #1A4073",
+"3 c #8096B2",
+"; c #4F7EA8",
+"s. c #597DA3",
+"1. c #315482",
+"A. c #144F86",
+"m. c #144C83",
+"6 c #4A6890",
+"- c #144C84",
+"5 c #4A6891",
+"W c #FEC202",
+"3. c #FEC203",
+"m c #164074",
+"x c #164075",
+"~ c #FEC206",
+"< c #144980",
+"| c #FEC207",
+"x. c #3E638E",
+"I c #204577",
+".. c #25497A",
+"N. c #5A87AE",
+"i c #527399",
+"e c #7595B6",
+"T c #FED453",
+"2. c #FED760",
+"+. c #FFCC05",
+"#. c #FED457",
+"' c #FFCC06",
+"&. c #FED762",
+"U c #FEDD7A",
+"E c #FEDA71",
+"<. c #FEDD7C",
+"] c #FFC903",
+"L c #6680A3",
+"n c #7088A8",
+"z. c #758CAA",
+"j. c #849BB7",
+"y. c #758CAB",
+"S c #7A90AE",
+"Q c #FFC601",
+"a. c #174478",
+"= c #7392B3",
+"[ c #FFC300",
+"e. c #557197",
+"n. c #4E739C",
+"@ c #135088",
+"o c #135089",
+"u c #154479",
+"l c #15447A",
+/* pixels */
+" ",
+" . X ",
+" . o O + O @ X ",
+"# $ % & * = * - O @ ; ",
+" : > , < 1 2 3 4 5 6 7 8 9 0 q * - w ",
+" e r t y u i p a s s s s s s s s d f g y 0 q h ",
+" j k l z x c v s s s s s s s s s b n m M N y B ",
+" z x s s s s s s V C Z Z A S D s s F M G ",
+" H s s s s J K s s s s L ",
+" H s P P s s s ",
+" I U Y T s s s R ",
+" E W Q ! ! Q ~ ^ s s s ",
+" / ( ) _ ` ' ' ' ' ] [ { s s b ",
+" s s } [ ` ' ' ' ' ' ' ] | .s s .. ",
+" X.s s o.O.' ' ' ' ' ' ' +._ s s s ",
+" s s s @.] ' ' ' ' ' ' ' ' O.#. s s s ",
+" s s s $.] ' ' ' ' ' ' ' ' O.%. s s s ",
+" X.s s &.O.' ' ' ' ' ' ' +._ s s s ",
+" X.s s 8 [ ` ' ' ' ' ' ' *.=. V s -. ",
+" ;.s s :. >._ ` ' ' ' ' ` ,.<. 1.7 ",
+" s s s 2.[ O.] ] Q 3.4. ",
+" 5.s s 6. 7.8.9.E V ",
+" s s s I 0.s I ",
+" q.X.s s s w. e.s s s s r. ",
+" t.z x s s y. u.D 3 3 i.1.s s s s s X.p.a. ",
+" s.k u M m d. i.s s s s s s s s s -.f.p.z l k ",
+" g.h.t y u j. k.s s s s s s s s l.z. x.y k t r c. ",
+" v.& , < 1 n 5 } b.( Z n.q r m.O M. ",
+"N.o O B.* V.- O % $ C.",
+" Z.o A. S.D.$ F. ",
+" G. H.J. ",
+" "
+};
+
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 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/>.
diff --git a/clientgui/res/boincdisconnect.ico b/clientgui/res/boincdisconnect.ico
new file mode 100644
index 0000000..b42be92
Binary files /dev/null and b/clientgui/res/boincdisconnect.ico differ
diff --git a/clientgui/res/boincdisconnect.xpm b/clientgui/res/boincdisconnect.xpm
index 3d440ba..fdaabc0 100644
--- a/clientgui/res/boincdisconnect.xpm
+++ b/clientgui/res/boincdisconnect.xpm
@@ -1,36 +1,109 @@
/* XPM */
static const char *boincdisconnect_xpm[] = {
/* columns rows colors chars-per-pixel */
-"16 16 11 1",
-"@ c #F8BC1A",
-"+ c #293F64",
-". c None",
-"O c #ED9D00",
-"$ c #FFD93E",
-"& c #FF0000",
-"% c #FFD824",
-"o c #203C66",
-"X c #174A78",
-" c #0E588A",
-"# c #FFDE49",
+"16 16 83 1",
+"1 c #355684",
+"C c #245081",
+"4 c #768DAC",
+"3 c #7B91AE",
+"h c #6F4B4B",
+"v c #DC0000",
+"! c #494E61",
+"x c #FED035",
+"7 c #FED037",
+"u c #FED346",
+"F c #7F2020",
+"i c #526F96",
+"S c #2D0F1D",
+"w c #FFC803",
+"B c #FA0000",
+"K c #375885",
+"+ c #295C8E",
+"l c #788FAD",
+"X c #134F87",
+"I c #BF0000",
+"g c #24497A",
+"V c #642929",
+"9 c #768CAB",
+"n c #F40000",
+"; c #315B8A",
+"# c #7993B2",
+"= c #7E97B4",
+"< c #183E72",
+". c #5784AD",
+" c None",
+"o c #86A2BE",
+"s c #FECC24",
+"y c #FECC25",
+"$ c #637DA1",
+"* c #6881A3",
+"- c #285A8D",
+"t c #7289A9",
+"d c #FED244",
+"/ c #613C3C",
+"L c #395A86",
+"k c #39131C",
+"q c #FFCD06",
+"G c #21568A",
+"j c #541E21",
+"0 c #FFCA04",
+"U c #5E2627",
+"p c #193F73",
+"Y c #5D89AF",
+"b c #FF0000",
+"W c #EC0000",
+"R c #612A2A",
+"H c #15487D",
+"( c #6B707D",
+"@ c #15487E",
+"Z c #738AA9",
+"T c #134E86",
+"% c #3F5F8A",
+"D c #EA0000",
+"P c #453242",
+"c c #642828",
+"5 c #2C5686",
+"J c #5B779B",
+"N c #C20000",
+"a c #6F87A7",
+"2 c #365884",
+"^ c #542C2C",
+"6 c #3B5C88",
+"r c #40608A",
+"O c #618BB0",
+": c #164075",
+"z c #FECE2F",
+"m c #910E0E",
+"8 c #FED13D",
+"Q c #790408",
+"f c #526D90",
+"E c #CF0000",
+"A c #3C5D88",
+"& c #41618B",
+"~ c #715454",
+"M c #7B5F62",
+", c #173E72",
+"e c #214678",
+"> c #2B4E7E",
/* pixels */
-" ............ ",
-" XX..........XX ",
-".Xoo..oooo..ooX.",
-"..ooooooo..ooo..",
-"...ooo....ooo...",
-"....o..OO..++...",
-"..o...O@@O..oo..",
-"..oo.O@##@......",
-"..oo.O@$%.&&&&..",
-"..oo..O at .&&&&&&.",
-"...++...&&&OO&&&",
-"...ooo..&&O$$O&&",
-"..ooo...&&O$$O&&",
-".ooo..o.&&&OO&&&",
-" oo......&&&&&&.",
-" ........&&&&.."
+" ",
+".X oXO",
+" +@# $%&* =@- ",
+" ;:>,<123 4:5 ",
+" 6,4 ,< ",
+" 78 9, ",
+" 1 0qqw er ",
+" ,t yqqqqu ip ",
+" ,a sqqqqd f< ",
+" g1 0qqw hjk ",
+" l, zx cvbnm ",
+" ,< MNbbbBV",
+" C: Z%ASDbbbbF",
+" GH JKLPIbbbBU",
+"YT REbWQ!",
+" ~^/( "
};
+
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2013 University of California
diff --git a/clientgui/res/boincdisconnect32.xpm b/clientgui/res/boincdisconnect32.xpm
new file mode 100644
index 0000000..d0a28d8
--- /dev/null
+++ b/clientgui/res/boincdisconnect32.xpm
@@ -0,0 +1,253 @@
+/* XPM */
+static const char *boincdisconnect32_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 198 2",
+"& c #134D85",
+"d. c #FFCF3F",
+"L. c #567EA6",
+" X c #B80000",
+"^ c #6C85A6",
+"V. c #8599B5",
+"[. c #638DB3",
+"( c #4C6A92",
+"4 c #5B769B",
+". c #14548C",
+"t. c #ED0000",
+"{. c #19588F",
+"{ c #1D4375",
+"~. c #281416",
+"+ c #86A3BF",
+", c #144B83",
+"i. c #391717",
+"f c #7791AF",
+"*X c #807777",
+"F c #163F74",
+"1 c #14487D",
+"k. c #321919",
+"=. c #FEC104",
+"R. c #D80000",
+"b. c #6D86A6",
+"r. c #720E0E",
+"d c #778EAC",
+"O c #124E86",
+"$. c #FECD36",
+"N. c #5C7DA2",
+"@. c #FECD38",
+".X c #6D0405",
+"R c #43638D",
+"Y c #FED350",
+"J c #48678F",
+"/ c #486791",
+"s. c #FED969",
+") c #FED96A",
+"C c #577399",
+"4. c #2B1212",
+"A c #5C779C",
+"OX c #15558D",
+"e. c #473939",
+"! c #FFC802",
+"H c #194074",
+"_ c #FFC501",
+"q c #15497F",
+"'. c #AE0000",
+"X c #13528B",
+"F. c #7D93B0",
+"k c #15467C",
+"8 c #8297B3",
+"% c #134F87",
+"c. c #726363",
+"N c #154378",
+"g c #154379",
+"w c #517CA5",
+"`. c #4B1515",
+"-. c #172E4D",
+": c #658CB0",
+"9 c #809AB7",
+"7 c #5D789C",
+"b c #627C9F",
+"C. c #6780A2",
+"j. c #E30000",
+"D c #6C84A5",
+"v c #294D7D",
+"Y. c #102D54",
+"G c #607FA3",
+"l. c #361515",
+"/. c #650407",
+"P c #183E72",
+":. c #224675",
+"p c #8398B3",
+"$X c #471515",
+"n. c #680B0B",
+"2 c #6383A7",
+"- c #144D84",
+" c None",
+"_. c #144D85",
+"v. c #5E7CA0",
+"oX c #0F4373",
+"Z. c #1F273D",
+"P. c #144A80",
+"r c #144A81",
+"T. c #500408",
+"* c #144A82",
+"h c #577EA5",
+"s c #163E72",
+"a. c #1B4274",
+"X. c #163E73",
+"0 c #14477D",
+"h. c #720D0D",
+"a c #254A7A",
+"(. c #404F63",
+"Z c #7289A9",
+"B c #5C7FA4",
+"p. c #2A4E7E",
+",. c #2F5280",
+"Q. c #395A86",
+"f. c #FECF41",
+"o. c #FED866",
+"j c #849FBB",
+"<. c #FED55D",
+"*. c #FFCA03",
+"` c #FFCA04",
+"g. c #837A7A",
+"+X c #1A588E",
+"O. c #FFC702",
+"6. c #8A0202",
+">. c #41628C",
+"# c #5D89B0",
+"1. c #FFC400",
+"W. c #537EA7",
+"y. c #FF0000",
+"M. c #3D2727",
+"-X c #13548D",
+"K c #647EA0",
+"2. c #F7D779",
+" . c #647EA1",
+"x. c #9B0202",
+"5. c #601111",
+"t c #15487E",
+"U. c #738AA9",
+"V c #264B7B",
+"$ c #13518A",
+"!. c #6E83A2",
+";. c #12325D",
+"y c #15457B",
+"=X c #809FBA",
+"> c #134E85",
+"} c #3A5B87",
+"M c #154276",
+"c c #3F5F8A",
+"z c #154277",
+"&X c #362020",
+"%. c #FFD355",
+"3 c #8096B2",
+"; c #4F7EA8",
+"8. c #3A0509",
+"^. c #D50000",
+"J. c #F90000",
+"D. c #597DA3",
+"%X c #2F1313",
+"9. c #23141B",
+"A. c #9C0000",
+"m. c #E60000",
+"}. c #144F86",
+"K. c #281515",
+"@X c #4B3737",
+"6 c #4A6890",
+"5 c #4A6891",
+"G. c #0E2340",
+"W c #FEC202",
+"q. c #FEC203",
+"m c #164074",
+"x c #164075",
+"E. c #4B3434",
+"~ c #FEC206",
+"< c #144980",
+"| c #FEC207",
+"|. c #391515",
+"I c #204577",
+".. c #25497A",
+"H. c #870001",
+"). c #5A87AE",
+"i c #527399",
+"e c #7595B6",
+"T c #FED453",
+"0. c #FED760",
+"+. c #FFCC05",
+"#. c #FED457",
+"' c #FFCC06",
+"3. c #837C7C",
+"&. c #FED762",
+"S. c #2B1313",
+"U c #FEDD7A",
+"E c #FEDA71",
+"] c #FFC903",
+"L c #6680A3",
+"n c #7088A8",
+"I. c #849BB7",
+"B. c #758CAB",
+"#X c #241212",
+"S c #7A90AE",
+"]. c #130F19",
+"Q c #FFC601",
+"u. c #BC0000",
+"XX c #130C15",
+"= c #7392B3",
+"[ c #FFC300",
+"w. c #F7D675",
+"@ c #135088",
+"o c #135089",
+"7. c #7A0808",
+"z. c #F10000",
+"u c #154479",
+"l c #15447A",
+/* pixels */
+" ",
+" . X ",
+" . o O + O @ X ",
+"# $ % & * = * - O @ ; ",
+" : > , < 1 2 3 4 5 6 7 8 9 0 q * - w ",
+" e r t y u i p a s s s s s s s s d f g y 0 q h ",
+" j k l z x c v s s s s s s s s s b n m M N y B ",
+" z x s s s s s s V C Z Z A S D s s F M G ",
+" H s s s s J K s s s s L ",
+" H s P P s s s ",
+" I U Y T s s s R ",
+" E W Q ! ! Q ~ ^ s s s ",
+" / ( ) _ ` ' ' ' ' ] [ { s s b ",
+" s s } [ ` ' ' ' ' ' ' ] | .s s .. ",
+" X.s s o.O.' ' ' ' ' ' ' +._ s s s ",
+" s s s @.] ' ' ' ' ' ' ' ' O.#. s s s ",
+" s s s $.] ' ' ' ' ' ' ' ' O.%. s s s ",
+" X.s s &.O.' ' ' ' ' ' ' +._ s s s ",
+" X.s s 8 [ ` ' ' ' ' ' ' *.=. -.;.:. ",
+" >.s s ,. <._ ` ' ' ' ' ` 1.2.3.4.5.6.7.8.9. ",
+" s s s 0.[ O.] ] Q q.w.e.r.t.y.y.y.y.u.i. ",
+" p.s s a. s.d.f.E g.h.y.y.y.y.y.y.y.j.k. ",
+" s s s I l.z.y.y.y.y.y.y.y.y.x.c. ",
+" v.X.s s s b. n.y.y.y.y.y.y.y.y.y.m.M. ",
+" N.z x s s B. V.D 3 3 C.Z.A.y.y.y.y.y.y.y.y.y.y.S. ",
+" D.k u M m F. C.s s s s s G.H.y.y.y.y.y.y.y.y.y.J.K. ",
+" L.P.t y u I. U.s s s s s s Y.T.y.y.y.y.y.y.y.y.y.R.E. ",
+" W.& , < 1 n 5 } Q.( !.~.^.y.y.y.y.y.y.y.y./.(. ",
+").o O _.* `.z.y.y.y.y.y.y.'.].O [.",
+" {.o }. |. XJ.y.y.m..XXXoXOX ",
+" +X @X#X$X%X&X*X=X-X ",
+" "
+};
+
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 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/>.
diff --git a/clientgui/res/boincmgr.16x16.png b/clientgui/res/boincmgr.16x16.png
deleted file mode 100644
index 82563d9..0000000
Binary files a/clientgui/res/boincmgr.16x16.png and /dev/null differ
diff --git a/clientgui/res/boincmgr.32x32.png b/clientgui/res/boincmgr.32x32.png
deleted file mode 100644
index 0d90fad..0000000
Binary files a/clientgui/res/boincmgr.32x32.png and /dev/null differ
diff --git a/clientgui/res/boincmgr.48x48.png b/clientgui/res/boincmgr.48x48.png
deleted file mode 100644
index 47ea00a..0000000
Binary files a/clientgui/res/boincmgr.48x48.png and /dev/null differ
diff --git a/clientgui/res/boincsnooze.ico b/clientgui/res/boincsnooze.ico
new file mode 100644
index 0000000..6df3c67
Binary files /dev/null and b/clientgui/res/boincsnooze.ico differ
diff --git a/clientgui/res/boincsnooze.xpm b/clientgui/res/boincsnooze.xpm
index 1e20578..4088aa7 100644
--- a/clientgui/res/boincsnooze.xpm
+++ b/clientgui/res/boincsnooze.xpm
@@ -1,32 +1,85 @@
/* XPM */
static const char *boincsnooze_xpm[] = {
/* columns rows colors chars-per-pixel */
-"16 16 7 1",
-"@ c #F8BC1A",
-"+ c #293F64",
-". c None",
-"O c #ED9D00",
-"o c #203C66",
-"X c #174A78",
-" c #0E588A",
+"16 16 59 1",
+"1 c #355684",
+"z c #245081",
+"4 c #768DAC",
+"3 c #7B91AE",
+"l c #FED035",
+"7 c #FED037",
+"u c #FED346",
+"i c #526F96",
+"d c #C3AD3C",
+"w c #FFC803",
+"m c #375885",
+"+ c #295C8E",
+"j c #788FAD",
+"X c #134F87",
+"f c #24497A",
+"9 c #768CAB",
+"; c #315B8A",
+"# c #7993B2",
+"= c #7E97B4",
+"< c #183E72",
+". c #5784AD",
+" c None",
+"o c #86A2BE",
+"s c #FECC24",
+"y c #FECC25",
+"V c #84813F",
+"$ c #637DA1",
+"* c #6881A3",
+"- c #285A8D",
+"t c #7289A9",
+"M c #395A86",
+"g c #34537C",
+"q c #FFCD06",
+"v c #21568A",
+"0 c #FFCA04",
+"p c #193F73",
+"N c #5D89AF",
+"b c #15487D",
+"@ c #15487E",
+"x c #738AA9",
+"C c #305382",
+"B c #134E86",
+"% c #3F5F8A",
+"h c #6A714B",
+"5 c #2C5686",
+"n c #5B779B",
+"a c #6F87A7",
+"2 c #365884",
+"6 c #3B5C88",
+"r c #40608A",
+"O c #618BB0",
+": c #164075",
+"k c #FECE2F",
+"8 c #FED13D",
+"c c #3C5D88",
+"& c #41618B",
+", c #173E72",
+"e c #214678",
+"> c #2B4E7E",
/* pixels */
-" ............ ",
-" XX..........XX ",
-".Xoo..oooo..ooX.",
-"..ooooooo..ooo..",
-"...ooo....ooo...",
-"....o..OO..++...",
-"..o...O@@O..oo..",
-"..oo.O at .........",
-"..oo.O at .ooooooo.",
-"..oo..O.ooooooo.",
-"...++...oo at o@oo.",
-"...ooo..oo at o@oo.",
-"..ooo...oo at o@oo.",
-".ooo..o.oo at o@oo.",
-" oo.....ooooooo.",
-" ......ooooooo."
+" ",
+".X oXO",
+" +@# $%&* =@- ",
+" ;:>,<123 4:5 ",
+" 6,4 ,< ",
+" 78 9, ",
+" 1 0qqw er ",
+" ,t yqqqqu ip ",
+" ,a sqqqd>>>>> ",
+" f1 0qqg,h,h,>",
+" j, kl>,q,q,>",
+" ,< >,q,q,>",
+" z: x%c>,q,q,>",
+" vb nmM>,q,q,>",
+"NB >,V,V,C",
+" >>>>> "
};
+
// This file is part of BOINC.
// http://boinc.berkeley.edu
// Copyright (C) 2013 University of California
diff --git a/clientgui/res/boincsnooze32.xpm b/clientgui/res/boincsnooze32.xpm
new file mode 100644
index 0000000..e3a86e8
--- /dev/null
+++ b/clientgui/res/boincsnooze32.xpm
@@ -0,0 +1,203 @@
+/* XPM */
+static const char *boincsnooze32_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 148 2",
+"& c #134D85",
+"w. c #FFCF3F",
+"f. c #567EA6",
+"^ c #6C85A6",
+"N. c #335683",
+"i. c #8599B5",
+"( c #4C6A92",
+"4 c #5B769B",
+". c #14548C",
+"n. c #19588F",
+"{ c #1D4375",
+"+ c #86A3BF",
+"x. c #CFAF1C",
+", c #144B83",
+"f c #7791AF",
+"F c #163F74",
+"1 c #14487D",
+"t. c #6D86A6",
+"d c #778EAC",
+"=. c #FECD36",
+"y. c #5C7DA2",
+"*. c #3E5F89",
+"@. c #FECD38",
+"R c #43638D",
+"Y c #FED350",
+"/ c #486791",
+"q. c #FED969",
+") c #FED96A",
+"C c #577399",
+"A c #5C779C",
+"! c #FFC802",
+"H c #194074",
+":. c #1E4476",
+"%. c #375883",
+"_ c #FFC501",
+"q c #15497F",
+"X c #13528B",
+"d. c #7D93B0",
+"k c #15467C",
+"8 c #8297B3",
+"% c #134F87",
+"N c #154378",
+"g c #154379",
+"-. c #718284",
+"w c #517CA5",
+": c #658CB0",
+"9 c #809AB7",
+"7 c #5D789C",
+"b c #627C9F",
+"p. c #6780A2",
+"D c #6C84A5",
+".. c #24497A",
+"v c #294D7D",
+"G c #607FA3",
+"P c #183E72",
+"p c #8398B3",
+"2 c #6383A7",
+"- c #144D84",
+" c None",
+"v. c #144D85",
+"r. c #5E7CA0",
+"7. c #A7972E",
+"g. c #144A80",
+"r c #144A81",
+"z. c #84813F",
+"* c #144A82",
+"h c #577EA5",
+"#. c #F7CE26",
+"s c #163E72",
+"0. c #1B4274",
+"X. c #163E73",
+"0 c #14477D",
+"a c #254A7A",
+"Z c #7289A9",
+"B c #5C7FA4",
+"9. c #2A4E7E",
+"1. c #2F5280",
+"l. c #395A86",
+"e. c #FECF41",
+"8. c #E1BB13",
+"J c #48668F",
+"o. c #FED866",
+"j c #849FBB",
+"2. c #FED55D",
+"` c #FFCA04",
+"M. c #1A588E",
+"O. c #FFC702",
+"<. c #41628C",
+"# c #5D89B0",
+"k. c #537EA7",
+"K c #647EA0",
+" . c #647EA1",
+"t c #15487E",
+"j. c #738AA9",
+"V c #264B7B",
+"$ c #13518A",
+"&. c #305381",
+"y c #15457B",
+"> c #134E85",
+"O c #134E86",
+"} c #3A5B87",
+"M c #154276",
+"c c #3F5F8A",
+"z c #154277",
+">. c #1A4070",
+"3 c #8096B2",
+"; c #4F7EA8",
+"s. c #597DA3",
+"a. c #315482",
+"m. c #144F86",
+"b. c #40608B",
+"$. c #818873",
+"6 c #4A6890",
+"5 c #4A6891",
+"W c #FEC202",
+"6. c #FEC203",
+"m c #164074",
+"x c #164075",
+"~ c #FEC206",
+"< c #144980",
+"| c #FEC207",
+",. c #25466B",
+"I c #204577",
+"c. c #5A87AE",
+"i c #527399",
+"e c #7595B6",
+"T c #FED453",
+"5. c #FED760",
+"+. c #FFCC05",
+"' c #FFCC06",
+";. c #FED762",
+"3. c #918938",
+"U c #FEDD7A",
+"E c #FEDA71",
+"] c #FFC903",
+"L c #6680A3",
+"n c #7088A8",
+"h. c #849BB7",
+"u. c #758CAB",
+"S c #7A90AE",
+"Q c #FFC601",
+"= c #7392B3",
+"4. c #DAB616",
+"[ c #FFC300",
+"@ c #135088",
+"o c #135089",
+"u c #154479",
+"l c #15447A",
+/* pixels */
+" ",
+" . X ",
+" . o O + O @ X ",
+"# $ % & * = * - O @ ; ",
+" : > , < 1 2 3 4 5 6 7 8 9 0 q * - w ",
+" e r t y u i p a s s s s s s s s d f g y 0 q h ",
+" j k l z x c v s s s s s s s s s b n m M N y B ",
+" z x s s s s s s V C Z Z A S D s s F M G ",
+" H s s s s J K s s s s L ",
+" H s P P s s s ",
+" I U Y T s s s R ",
+" E W Q ! ! Q ~ ^ s s s ",
+" / ( ) _ ` ' ' ' ' ] [ { s s b ",
+" s s } [ ` ' ' ' ' ' ' ] | .s s .. ",
+" X.s s o.O.' ' ' ' ' ' ' +._ s s s ",
+" s s s @.] ' ' ' ' ' ' ' #.$.%.&.&.&.&.&.&.&.*. ",
+" s s s =.] ' ' ' ' ' ' ' -.s s s s s s s s s s s ",
+" X.s s ;.O.' ' ' ' ' ' ' :.s s s s s s s s s s s J ",
+" X.s s 8 [ ` ' ' ' ' ' ' s s s >.,.s s s >.,.s s c ",
+" <.s s 1. 2._ ` ' ' ' ' ` s s s 3.4.s s s 3.4.s s c ",
+" s s s 5.[ O.] ] Q 6.s s s 7.8.s s s 7.8.s s c ",
+" 9.s s 0. q.w.e.E s s s 7.8.s s s 7.8.s s c ",
+" s s s I s s s 7.8.s s s 7.8.s s c ",
+" r.X.s s s t. s s s 7.8.s s s 7.8.s s c ",
+" y.z x s s u. i.D 3 3 p.a.s s s 7.8.s s s 7.8.s s c ",
+" s.k u M m d. p.s s s s s s s s s 7.8.s s s 7.8.s s c ",
+" f.g.t y u h. j.s s s s s s s s s s 7.8.s s s 7.8.s s c ",
+" k.& , < 1 n 5 } l.( Z s s s z.x.s s s z.x.s s c ",
+"c.o O v.* s s s s s s s s s s s s b.",
+" n.o m. } s s s s s s s s s s s ",
+" M. ..s s s s s s s s s N. ",
+" "
+};
+
+// This file is part of BOINC.
+// http://boinc.berkeley.edu
+// Copyright (C) 2013 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/>.
diff --git a/clientgui/res/skins/default/graphic/project_image.xpm b/clientgui/res/skins/default/graphic/project_image.xpm
index ddb129d..54cc6cd 100644
--- a/clientgui/res/skins/default/graphic/project_image.xpm
+++ b/clientgui/res/skins/default/graphic/project_image.xpm
@@ -1,7 +1,192 @@
/* XPM */
+static const char *project_image_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"40 40 139 2",
+") c #FCF2D4",
+" c #FCFEFC",
+"K c #44628C",
+"u. c #4C76A4",
+"j. c #DCE6EC",
+"f. c #2C5E8C",
+"u c #94AECC",
+"P c #244A7C",
+"2 c #2C5E94",
+"T c #BCCEDC",
+"G c #6C82A4",
+"d. c #547EA4",
+"( c #4C6A94",
+"5 c #9CB6CC",
+"j c #2C527C",
+"5. c #94A2BC",
+"; c #346694",
+"b c #748AAC",
+"- c #144E84",
+"F c #547294",
+"o. c #FCCA04",
+"4 c #A4BED4",
+"E c #345A84",
+"q c #9CAAC4",
+"> c #3C6E9C",
+"9. c #345A8C",
+"V c #144274",
+"} c #5C7A9C",
+"z c #14427C",
+"X c #648EB4",
+"$. c #A4B2C4",
+"] c #FCCA24",
+"q. c #3C628C",
+"=. c #849AB4",
+"' c #FCBE04",
+"4. c #CCD2DC",
+"a c #1C4A7C",
+"_ c #FCD65C",
+"H c #6482A4",
+"C c #CCD2E4",
+"c c #ACBACC",
+"v c #F4F2F4",
+"e. c #446A94",
+"g. c #4C7EAC",
+"e c #8CA2BC",
+"&. c #FCEEC4",
+"{ c #FCFAEC",
+"h c #D4DAE4",
+"# c #2C669C",
+"f c #1C3E74",
+"^ c #FCFAF4",
+"0 c #B4C2D4",
+"h. c #5486AC",
+"Q c #FCFAFC",
+"t. c #4C729C",
+"%. c #94AAC4",
+"= c #346E9C",
+"U c #244674",
+". c #DCE2EC",
+"< c #2C5A8C",
+"Z c #24467C",
+"k c #9CB2C4",
+"9 c #E4EAEC",
+"D c #2C4E7C",
+"@ c #E4EAF4",
+"B c #C4D2DC",
+"6 c #144A7C",
+"0. c #7C9ABC",
+"3 c #144A84",
+"J c #546E94",
+"A c #A4BACC",
+"X. c #FCC604",
+"& c #ECF2F4",
+", c #A4BAD4",
+">. c #345684",
+"S c #CCDAE4",
+"` c #FCC614",
+"d c #143E74",
+"w. c #1C528C",
+"6. c #FCC61C",
+"W c #5C769C",
+"a. c #F4FAFC",
+"% c #44729C",
+"-. c #FCD24C",
+"@. c #FCDE74",
+"l. c #8CAAC4",
+"g c #3C5E8C",
+"m c #1C4674",
+" . c #FCDE7C",
+"~ c #8496B4",
+"x c #1C467C",
+";. c #FCDE84",
+"+. c #FCEAAC",
+"p. c #B4CADC",
+"3. c #647EA4",
+"/ c #44668C",
+"1. c #FCF6DC",
+"7. c #FCF6E4",
+"M c #244E7C",
+"w c #8C9EBC",
+"8. c #6C86A4",
+"r. c #749ABC",
+",. c #B4BECC",
+"R c #B4BED4",
+"s. c #5482AC",
+"! c #94A6BC",
+"y. c #9CBAD4",
+"y c #2C5684",
+"* c #346A9C",
+"Y c #748EAC",
+"I c #DCDEEC",
+"t c #BCC6D4",
+"#. c #FCCE04",
+"+ c #5C8AAC",
+"$ c #14528C",
+"r c #9CAEC4",
+": c #E4E6EC",
+"L c #C4CEDC",
+"p c #14467C",
+"N c #A4B6CC",
+"k. c #447AA4",
+".. c #FCC204",
+"O c #ECEEF4",
+"2. c #CCD6DC",
+"O. c #FCC20C",
+"8 c #CCD6E4",
+"l c #1C4E84",
+":. c #FCCE3C",
+"*. c #FCC214",
+"| c #F4F6F4",
+"i c #ACBED4",
+"s c #3C5A84",
+"o c #F4F6FC",
+"<. c #D4DEE4",
+"[ c #FCDA74",
+"7 c #245684",
+"n c #1C4274",
+"1 c #D4DEEC",
+"i. c #24568C",
+/* pixels */
+" ",
+" . X o O + @ ",
+" @ # $ % & O * $ * O ",
+"O = $ $ - ; @ : ; - $ $ > & ",
+", $ $ - - - < 1 : 2 3 - - $ $ 4 ",
+" 5 $ - 3 3 6 7 8 9 0 q w e r t O 1 y 6 3 3 - - u ",
+" i $ 6 3 p p a t @ w s d f d f d f d f g q h j p p 3 6 - k ",
+" 0 l 6 p p z x c v b n d d d f d d f d f d m t 8 M z p p p 3 N ",
+" B M p z n V d M f d f f d d f d d f d n 0 C Z d V z p x A ",
+" S j V d f d f d f d d f D F G H J K t L P d d f V m i ",
+" I y d d f d d d U Y h T U d f d d n R ",
+" : E f d f d W 9 Q J d d d d f ! ",
+" O K d d ~ ^ Q G f d f d / ",
+" O ( b ) _ ` ' ' ] [ { } f d f d c ",
+" O C | ^ ...X.X.o.o.X.X.O.+. v j d f d s ",
+" q m R @...o.o.#.#.#.#.o.X...+. $.d d f d C ",
+" J d f %. &...o.#.#.#.o.#.o.#.o.X.*.{ Q D d d f =. ",
+" x f d f @ -.X.o.#.o.#.#.#.#.#.#.o.X.;. G d f d J ",
+" O d d f d h ..X.#.#.#.#.o.#.o.#.#.o.X.:. q d f d >. ",
+" h f d f d : ) ..o.#.#.o.#.#.#.#.#.#.#.X.` ,.f d d U ",
+" <.d d f d : 1...o.#.o.#.#.` #.#.` #.#.X.*. ,.d f d U ",
+" 9 f d d f 2. ^ ..X.#.#.#.#.#.#.#.#.#.o.X.:. $.d d f >. ",
+" U d f d r -.X.o.#.` #.#.#.#.#.#.o...;. 0 f d d F ",
+" J d d f F &...X.#.#.#.#.#.` #.o.X.` { 3.d f =. ",
+" %.d f d f <. ...o.o.#.#.#.#.o.X...+. ~ d 4. ",
+" O n d f d F ...X.X.o.X.X.X.*.+. o Q 0 ",
+" b d d f d 5. ) _ 6...O.6.[ 7. 3.F Q ",
+" O P d f d f r Q G f d ( o ",
+" G d d f d d ~ . ( d d f d K O ",
+" =.V f d d f >.. Q 4.8.n d f d f d d 9.: ",
+" =.p V d d f E : $./ W 3.G J P d f d f d d d f V V y I ",
+" 0.p z V n V s 9 r f d d f d d f d f d d f U V V V p p 7 8 ",
+" 0.3 6 p p V q.O $.f d f d d f d d f d f m ~ | =.n p z p a w.L ",
+" 0.- 3 a p p e.& Q =.>.f d d f d f d f g e O r a p 6 3 3 $ 0 ",
+" r.- - - 3 6 t.v : 0 q w w q t 9 0 l 3 3 - - $ 5 ",
+"y.$ $ - - 3 u.o B i.- - - $ $ p.",
+"a.s.$ $ - d.o 1 f.$ $ $ s.Q ",
+" a.g.$ h.Q j.* $ k.a. ",
+" | l.Q O X & ",
+" "
+};
+
// This file is part of BOINC.
// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// Copyright (C) 2014 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
@@ -15,281 +200,3 @@
//
// You should have received a copy of the GNU Lesser General Public License
// along with BOINC. If not, see <http://www.gnu.org/licenses/>.
-/* columns rows colors chars-per-pixel */
-static const char *project_image_xpm[] = {
-"40 40 233 2",
-"#X c #F7D991",
-"H. c #AAB8CC",
-"z. c #FABF1E",
-"I c #536E94",
-"3. c #FFF0BA",
-"XX c #CDD7E6",
-"Q c #8A918B",
-"s c #153560",
-"a c #6C7F9A",
-",X c #476995",
-"2. c #24416C",
-"%X c #F5EEDF",
-"M. c #294571",
-"h c #3B6493",
-"7X c #C3C0C6",
-"=X c #D0DEF0",
-"C. c #F3B20A",
-":. c #F8E6AC",
-"$. c #BCC5D4",
-"U. c #F5CA77",
-"gX c #164271",
-" . c #EEEDE7",
-"$ c #EEF0F1",
-"~ c #5979A4",
-".X c #C9CBC2",
-"C c #DDE1E3",
-"o. c #FBEDC2",
-"2 c #81909F",
-"r c #194676",
-".. c #FBF6E5",
-"; c #F6F8F8",
-"{ c #C2D6EE",
-"o c #FBFCFB",
-"d c #194373",
-"d. c #A4A9A6",
-"K c #9AAAC2",
-"N c #143C6A",
-"l. c #F9C32C",
-"F. c #A4ACB2",
-"0X c #07214E",
-"' c #1B345D",
-"J. c #021A46",
-"R c #7A7A61",
-"^ c #DBE4F2",
-"f c #667C9F",
-"+ c #EAEDED",
-"8 c #D6D7D7",
-"jX c #F4F5F2",
-"3 c #E5E6E5",
-"i. c #FCD354",
-";. c #FCD65E",
-"O c #1136CC",
-"6. c #FCD04B",
-"uX c #7F90AB",
-"* c #F4F5F6",
-"`. c #E5E9F4",
-"W. c #7F8A99",
-"qX c #001D4F",
-"h. c #738898",
-"q c #66738C",
-"T c #3C4748",
-"5 c #1F517F",
-"0. c #305785",
-"lX c #355B87",
-"N. c #55677B",
-"]. c #C5CED9",
-") c #D4D1BE",
-"6 c #537699",
-"c. c #EDA900",
-"g. c #8297B2",
-"O. c #FCE5A3",
-"! c #B1B5BD",
-"zX c #647389",
-"[. c #EDCD7F",
-": c #FCFDFA",
-"8. c #F2F5FB",
-"4. c #FFECA3",
-"b c #8C9CB4",
-" c #FCFDFD",
-"@X c #F7DB99",
-"r. c #FFECA9",
-"I. c #F5BA1C",
-"v c #3A537A",
-"1. c #B4BFD2",
-"t c #426488",
-"^. c #F7BD41",
-"5X c #8F9793",
-"[ c #E1E9F4",
-"}. c #FAC133",
-"_ c #FAFAF3",
-"rX c #CDD0D7",
-"L c #71829C",
-"% c #F0F2F2",
-"u. c #FDDD73",
-"u c #F5F9FE",
-"{. c #F0B322",
-"9 c #607C9B",
-"= c #F5F6F8",
-" X c #F5E4BD",
-"T. c #0B2652",
-"Y. c #ADB8C3",
-"D. c #F2B646",
-". c #FAFAFC",
-"oX c #BCCDE6",
-"K. c #1F334E",
-"m c #F5F6FC",
-"x c #425B7D",
-"G. c #0B234B",
-"G c #152B4E",
-"&X c #E9E2C2",
-"_. c #133D78",
-"| c #7E7F69",
-"7 c #C1C5C8",
-"(. c #F3F9FF",
-"V. c #F3B419",
-"X. c #FDF5DA",
-",. c #40586F",
-"iX c #4F6D95",
-"a. c #F3C967",
-"q. c #5E7385",
-";X c #C9C4A7",
-"+X c #40556E",
-"e c #144778",
-"|. c #F8C75A",
-"n. c #132B53",
-"j. c #FBCB49",
-"B c #637DA3",
-"R. c #C4CFE0",
-"L. c #BFC5CC",
-"s. c #F6FDFF",
-"} c #34598A",
-"# c #ECEFF0",
-"l c #ECF2FC",
-"] c #2A4B7B",
-"> c #F1F3F4",
-"kX c #6B88A8",
-"z c #7787A1",
-"#. c #203D68",
-", c #DDDDDF",
-"eX c #D3D2D5",
-"f. c #34507B",
-"<X c #486081",
-"c c #344D74",
-"xX c #546286",
-"A. c #F4B206",
-"~. c #F9C53C",
-"S c #8496AE",
-"P c #14325C",
-"Q. c #EFD594",
-"W c #9DA19B",
-"E c #989A90",
-"p c #E5E8F2",
-"*X c #5A645F",
-"F c #28426A",
-"p. c #F7BC20",
-"w. c #E3E8E6",
-"m. c #738AAA",
-"k c #D4DCEA",
-"B. c #D9DDE2",
-"hX c #E3EBF9",
-"OX c #879AB6",
-"& c #F2F4F4",
-"j c #44638B",
-">. c #C3C4B5",
-"<. c #244B7B",
-"Z c #4C719A",
-"3X c #6C7D8E",
-"g c #D2D9E1",
-"sX c #D2D6DC",
-"1X c #0B2853",
-"X c #FAFCFC",
-"-. c #FDE289",
-"E. c #0B2245",
-"Z. c #F8BA11",
-"b. c #A8B0B5",
-"dX c #243957",
-"2X c #DFEBF7",
-"H c #10264B",
-"tX c #4F7296",
-"4X c #798381",
-"6X c #656D6B",
-"aX c #92ACCF",
-"1 c #C6CBD0",
-"=. c #FDF4D3",
-"4 c #798CA4",
-"w c #43709B",
-"A c #1D3B67",
-"V c #E4E6EB",
-"fX c #3E668E",
-"@. c #5E6964",
-"yX c #113661",
-"pX c #3B5989",
-"). c #728EB3",
-"+. c #D3D4C9",
-"-X c #F1F2E8",
-"wX c #424E76",
-"*. c #FBF1CD",
-"/ c #395F91",
-"5. c #FEE076",
-"7. c #F6EAC6",
-"@ c #ECEEEF",
-"S. c #F1AA01",
-"y. c #FEE690",
-"n c #F1F5FC",
-"!. c #E7A202",
-"t. c #FEE99C",
-"0 c #19416D",
-"M c #112D59",
-"$X c #F6DEA7",
-"&. c #A4B3CB",
-"( c #20334D",
-":X c #576263",
-"< c #A4B0C3",
-"` c #84866F",
-"D c #576B87",
-"y c #CCD3DD",
-"%. c #DBE2ED",
-"U c #EAEEF1",
-"k. c #FCCB37",
-"e. c #F9F7EB",
-"8X c #506D8D",
-">X c #0F2D59",
-"i c #EAEEF6",
-"- c #F9FAFA",
-"P. c #EAB230",
-"/. c #F4EAD5",
-"Y c #193562",
-"J c #233A5A",
-"x. c #F7B80E",
-"9X c #3C5780",
-"9. c #7D8887",
-"'. c #283B5A",
-"v. c #EFB641",
-/* pixels */
-" . X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X . ",
-"o O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O o ",
-" O + @ # $ % % % % % % % % % % % % % % % % % % % % % % % % % % % % $ $ @ + O ",
-". O @ % % & & * = = - - - - - - - - - - - - - - - - - - - - - = = * * % % # O . ",
-" O # % * * = ; - - - - - - - - - - - - - - - - - - - - - - - - - = * * & # O ",
-"- O # * * - . X - - - - - - o o o - - - ; * % O - ",
-" O % * - - : - - * > O ",
-" O > * - - : , < 1 1 2 3 o - ; > O ",
-"- O > ; - 4 5 6 7 . . . . . . . o 8 9 0 q - - > O o ",
-" O > - - o w e r t y . . . . u i p i u . . 3 a s d f o ; * O o ",
-" O & = - g h d 0 j k l y z x c v x b n . m a M N B V o - * O ",
-"- O & - . C Z 0 A v S D F M G G H J K l l L M P I , . - & O o ",
-" O & = o U Z P Y M G T R E W Q ! n V L P Y ~ # ; * O ",
-" O & - o m ^ / M ( R ) = _ _ - u # ` ' Y ] [ . - o . * O o ",
-"- O & ; - . u { } | . ..X.o.O.o.u +. at .#.#.$. . - * O ",
-" O & ; o %.&.l g V _ *.X._ =.-.;.:.X >.,.<.I m . . - * O o ",
-" O & - . 1.2.b u u o.o.X.=.3.4.5.6.7.8.9.0.<.V . - * O ",
-"- O & ; o . K <.q.w.e.-.r.4.t.y.u.i.p.a.s.d.v f.$.. . - * O o ",
-" O & u . n g.h h.3 X.j.;.6.k.l.z.x.c.v.u b.G n.< . . : - * O ",
-" O 8._ : m m.M.N.B.X.V.C.Z.Z.x.A.C.S.D.X F.H G.H.. . - * O o ",
-"- O % ; . . m 4 J.K.L._ P.c.A.A.A.C.I.V.U.s.Y.G T.R.. - * O ",
-" O * - . < G.E.W. Q.!.C.I.l.~.~.^./.(.l )._.`.. . . * O o ",
-" O & ; o %.F G.'.]. [.{.}.j.j.|. Xs..XXXl oXm - * O ",
-"- O & ; o . . OXn.T.+Xy . 7. at X#X$X%XX &X*X} =X . . - * O o ",
-" O & . - . $.' n.T.4 (.l _ ; o -X;X:XM >X,X`. : - * O ",
-" O & ; o ^ <Xn.1X~ 2Xk 3X4X5XQ 6XJ T.n.n.P I V . - * O o ",
-". O & ; . 7X8X>XM m.i ^ 9XJ.0XG.G.qX1X] m.'.T.M wXeX - * O ",
-" O 8.; o rXtXyXyXuXm X ^ ).iXf.] pX~ aX[ X sXdXn.Y x sX . - * O o ",
-"o O % - . fXN gXf & . X X l hXhXhXu . X 7XM.P N x jX* O ",
-"X O * ; o v e kX% . . . . . . . : $.lXA zX = * O o ",
-" O & ; . ! I g X X K xXeX = * O ",
-"- O & - . * * O o ",
-" O % = - . * * O ",
-" O > * ; o * > O o ",
-"- O % * ; . * > O . ",
-" O $ * = ; - * % O ",
-" O $ & jX* - ; - - - o . . . . . o . . . . . . > * * = = jX* = * # O o ",
-"- O + $ % jX% * * * ; * * = = * ; * = * = = = = = * * = ; = * * * * > % $ @ O ",
-" O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ",
-" X X X X "
-};
diff --git a/clientgui/res/templates/icons/Design Template/2014 BOINC Program Logo Design - Jacob Klein.pdn b/clientgui/res/templates/icons/Design Template/2014 BOINC Program Logo Design - Jacob Klein.pdn
new file mode 100644
index 0000000..2a3131c
Binary files /dev/null and b/clientgui/res/templates/icons/Design Template/2014 BOINC Program Logo Design - Jacob Klein.pdn differ
diff --git a/clientgui/res/templates/icons/Design Template/Design Notes.txt b/clientgui/res/templates/icons/Design Template/Design Notes.txt
new file mode 100644
index 0000000..07a4975
--- /dev/null
+++ b/clientgui/res/templates/icons/Design Template/Design Notes.txt
@@ -0,0 +1,81 @@
+Paint.NET
+
+=============================================================================
+Disconnected Icon:
+Shape, Ellipse, Filled Shape with outline, Pure Red with Black outline
+
+Icon Size -> Circle Dimensions and Brush Width
+256 -> 96 BW 4
+128 -> 48 BW 2.1
+96 -> 36 BW 1.6
+80 -> 30 BW 1.4
+64 -> 24 BW 1.3
+48 -> 18 BW 1
+40 -> 15 BW 1, Black 240 alpha
+32 -> 12 BW 1, Black 225 alpha
+24 -> 9 BW 1, Black 210 alpha
+20 -> 7.5 BW 1, Black 195 alpha
+16 -> 6 BW 1, Black 180 alpha
+
+=============================================================================
+Suspended Icon:
+
+Container:
+Shape, Rounded Rectangle, Filled Shape with outline
+Color: Without saturation: 1E3C64 and FFFFFF; With saturation: 173E72 and FFFFFF
+Icon Size: 256 x 256
+Shape Size: Blue: 78 x 105, BW 25
+Shape Size: White: 81 x 107, BW 25
+... For smaller icon sizes, scale shape down
+... 48 x 48 and smaller, might need custom editing
+
+Pause Lines:
+Shape, Line, Rounded-Solid-Rounded
+Color: FFCC33 if not adding saturation; FFCD06 if adding saturation
+256 -> BW 10
+128 -> BW 5
+96 -> BW 3.75
+80 -> BW 3.125
+64 -> BW 2.5
+48 -> BW 2
+40 -> BW 1.6
+32 -> BW 1.5
+24 -> BW 1.1
+20 -> BW 1.1
+16 -> BW 1
+
+=============================================================================
+Icon Sizes:
+
+Reference: http://msdn.microsoft.com/en-us/library/windows/desktop/aa511280.aspx
+
+Custom sizing options (from Control Panel\Appearance and Personalization\Display):
+100%
+125%
+150%
+200%
+250%
+300%
+400%
+500%
+
+Sizes to include:
+16 (app size 1; classic mode size 1)
+20 (16x16 @ 125%)
+24 (classic mode size 2; 16x16 @ 150%)
+32 (app size 2; classic mode size 3)
+40 (Alt+Tab overlay; 16x16 @ 250%; 32x32 @ 125%)
+48 (app size 3; classic mode size 4)
+64 (classic mode size 5; 16x16 @ 400%; 32x32 @ 200%)
+80 (16x16 @ 500%; 32x32 @ 250%)
+96 (additional size; 32x32 @ 300%)
+128 (additional size; 32x32 @ 400%)
+256 (app size 4; maximum size)
+
+Needed XPM sizes (with NO transparency!):
+16x16
+32x32
+40x40 (for Simple View Default Project icon)
+...Note: Rom says he DOES want "Disconnected" and "Suspended" versions.
+...Ended up using 128 transparency lock, on images that excluded white bordering.
+...And, for the 40x40, created a white-background version
diff --git a/clientgui/res/templates/icons/Design Template/Other Ideas.pdn b/clientgui/res/templates/icons/Design Template/Other Ideas.pdn
new file mode 100644
index 0000000..143959f
Binary files /dev/null and b/clientgui/res/templates/icons/Design Template/Other Ideas.pdn differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 128 x 128.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 128 x 128.png
new file mode 100644
index 0000000..0bda982
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 128 x 128.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 16 x 16.png
new file mode 100644
index 0000000..e165cf8
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 20 x 20.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 20 x 20.png
new file mode 100644
index 0000000..a84f672
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 20 x 20.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 24 x 24.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 24 x 24.png
new file mode 100644
index 0000000..fcb06e5
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 24 x 24.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 256 x 256.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 256 x 256.png
new file mode 100644
index 0000000..82f1469
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 256 x 256.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 32 x 32.png
new file mode 100644
index 0000000..2c365f6
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 40 x 40.png
new file mode 100644
index 0000000..bcda96a
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 48 x 48.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 48 x 48.png
new file mode 100644
index 0000000..7f39021
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 48 x 48.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 64 x 64.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 64 x 64.png
new file mode 100644
index 0000000..2b61be7
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 64 x 64.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 80 x 80.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 80 x 80.png
new file mode 100644
index 0000000..06838d4
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 80 x 80.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 96 x 96.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 96 x 96.png
new file mode 100644
index 0000000..413a665
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Disconnected/BOINC Icon - Alpha Transparency - Disconnected - 96 x 96.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 128 x 128.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 128 x 128.png
new file mode 100644
index 0000000..d23bf2c
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 128 x 128.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 16 x 16.png
new file mode 100644
index 0000000..e8a9bac
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 20 x 20.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 20 x 20.png
new file mode 100644
index 0000000..a863667
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 20 x 20.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 24 x 24.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 24 x 24.png
new file mode 100644
index 0000000..23acc9a
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 24 x 24.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 256 x 256.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 256 x 256.png
new file mode 100644
index 0000000..dc41482
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 256 x 256.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 32 x 32.png
new file mode 100644
index 0000000..bda8409
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 40 x 40.png
new file mode 100644
index 0000000..475335b
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 48 x 48.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 48 x 48.png
new file mode 100644
index 0000000..1718070
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 48 x 48.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 64 x 64.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 64 x 64.png
new file mode 100644
index 0000000..8c1c142
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 64 x 64.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 80 x 80.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 80 x 80.png
new file mode 100644
index 0000000..5aede6f
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 80 x 80.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 96 x 96.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 96 x 96.png
new file mode 100644
index 0000000..01909ab
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Normal/BOINC Icon - Alpha Transparency - Normal - 96 x 96.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 128 x 128.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 128 x 128.png
new file mode 100644
index 0000000..b8f1baf
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 128 x 128.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 16 x 16.png
new file mode 100644
index 0000000..6ef8bd3
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 20 x 20.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 20 x 20.png
new file mode 100644
index 0000000..debe079
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 20 x 20.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 24 x 24.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 24 x 24.png
new file mode 100644
index 0000000..044a9ba
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 24 x 24.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 256 x 256.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 256 x 256.png
new file mode 100644
index 0000000..42b05ee
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 256 x 256.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 32 x 32.png
new file mode 100644
index 0000000..67219ed
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 40 x 40.png
new file mode 100644
index 0000000..07cd700
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 48 x 48.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 48 x 48.png
new file mode 100644
index 0000000..b58a0c9
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 48 x 48.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 64 x 64.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 64 x 64.png
new file mode 100644
index 0000000..63f6714
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 64 x 64.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 80 x 80.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 80 x 80.png
new file mode 100644
index 0000000..4095074
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 80 x 80.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 96 x 96.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 96 x 96.png
new file mode 100644
index 0000000..d568c19
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Alpha Transparency - Suspended/BOINC Icon - Alpha Transparency - Suspended - 96 x 96.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 16 x 16.png
new file mode 100644
index 0000000..5807736
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 32 x 32.png
new file mode 100644
index 0000000..379054d
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 40 x 40.png
new file mode 100644
index 0000000..0ba3e5e
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Disconnected - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 16 x 16.png
new file mode 100644
index 0000000..c2268bd
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 32 x 32.png
new file mode 100644
index 0000000..be8dabf
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 40 x 40.png
new file mode 100644
index 0000000..b5d8eaf
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Normal - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 16 x 16.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 16 x 16.png
new file mode 100644
index 0000000..6f1e480
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 16 x 16.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 32 x 32.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 32 x 32.png
new file mode 100644
index 0000000..01a92bd
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 32 x 32.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 40 x 40.png
new file mode 100644
index 0000000..bea47c6
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - Index Transparency (For XPM)/BOINC Icon - Index Transparency (For XPM) - Suspended - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Disconnected - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Disconnected - 40 x 40.png
new file mode 100644
index 0000000..2e8c79d
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Disconnected - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Normal - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Normal - 40 x 40.png
new file mode 100644
index 0000000..346b6e9
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Normal - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Suspended - 40 x 40.png b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Suspended - 40 x 40.png
new file mode 100644
index 0000000..298fc8d
Binary files /dev/null and b/clientgui/res/templates/icons/Final Design v5/BOINC Icon - White Background/BOINC Icon - White Background - Suspended - 40 x 40.png differ
diff --git a/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat Quartered.png b/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat Quartered.png
new file mode 100644
index 0000000..28fe812
Binary files /dev/null and b/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat Quartered.png differ
diff --git a/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat.png b/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat.png
new file mode 100644
index 0000000..1a50199
Binary files /dev/null and b/clientgui/res/templates/icons/Initial Mockup/BOINC Logo Flat.png differ
diff --git a/clientgui/res/BOINCGUIApp.ico b/clientgui/res/templates/icons/References/BOINCGUIApp.ico
similarity index 100%
rename from clientgui/res/BOINCGUIApp.ico
rename to clientgui/res/templates/icons/References/BOINCGUIApp.ico
diff --git a/clientgui/res/templates/icons/References/boinc_glossy2_512_F.tif b/clientgui/res/templates/icons/References/boinc_glossy2_512_F.tif
new file mode 100644
index 0000000..ff4bd46
Binary files /dev/null and b/clientgui/res/templates/icons/References/boinc_glossy2_512_F.tif differ
diff --git a/clientgui/res/templates/icons/References/boinc_logo.png b/clientgui/res/templates/icons/References/boinc_logo.png
new file mode 100644
index 0000000..7b878f3
Binary files /dev/null and b/clientgui/res/templates/icons/References/boinc_logo.png differ
diff --git a/clientgui/res/boincdisconnect.xpm b/clientgui/res/templates/icons/References/boincdisconnect.xpm
similarity index 100%
copy from clientgui/res/boincdisconnect.xpm
copy to clientgui/res/templates/icons/References/boincdisconnect.xpm
diff --git a/clientgui/res/boincsnooze.xpm b/clientgui/res/templates/icons/References/boincsnooze.xpm
similarity index 100%
copy from clientgui/res/boincsnooze.xpm
copy to clientgui/res/templates/icons/References/boincsnooze.xpm
diff --git a/clientgui/res/templates/icons/References/disconnect-icon.png b/clientgui/res/templates/icons/References/disconnect-icon.png
new file mode 100644
index 0000000..e353994
Binary files /dev/null and b/clientgui/res/templates/icons/References/disconnect-icon.png differ
diff --git a/clientgui/res/wcgdisconnect.ico b/clientgui/res/wcgdisconnect.ico
new file mode 100644
index 0000000..b42be92
Binary files /dev/null and b/clientgui/res/wcgdisconnect.ico differ
diff --git a/clientgui/res/wcgsnooze.ico b/clientgui/res/wcgsnooze.ico
new file mode 100644
index 0000000..6df3c67
Binary files /dev/null and b/clientgui/res/wcgsnooze.ico differ
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index 7a8009a..8532c26 100644
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -85,17 +85,14 @@ CSimpleFrame::CSimpleFrame() {
}
-CSimpleFrame::CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxPoint position, wxSize size) :
+CSimpleFrame::CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position, wxSize size) :
CBOINCBaseFrame((wxFrame *)NULL, ID_SIMPLEFRAME, title, position, size,
wxMINIMIZE_BOX | wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX | wxCLIP_CHILDREN)
{
wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame:: - Overloaded Constructor Function Begin"));
// Initialize Application
- wxIconBundle icons;
- icons.AddIcon(*icon);
- icons.AddIcon(*icon32);
- SetIcons(icons);
+ SetIcons(*icons);
CSkinAdvanced* pSkinAdvanced = wxGetApp().GetSkinManager()->GetAdvanced();
wxString strMenuName;
@@ -544,7 +541,7 @@ void CSimpleFrame::OnReloadSkin(CFrameEvent& WXUNUSED(event)) {
m_pBackgroundPanel->ReskinInterface();
SetTitle(pSkinAdvanced->GetApplicationName());
- SetIcon(*pSkinAdvanced->GetApplicationIcon());
+ SetIcon(pSkinAdvanced->GetApplicationIcon()->GetIcon(wxDefaultSize));
wxLogTrace(wxT("Function Start/End"), wxT("CSimpleFrame::OnReloadSkin - Function End"));
}
diff --git a/clientgui/sg_BoincSimpleFrame.h b/clientgui/sg_BoincSimpleFrame.h
index aaf92be..074f56f 100644
--- a/clientgui/sg_BoincSimpleFrame.h
+++ b/clientgui/sg_BoincSimpleFrame.h
@@ -104,7 +104,7 @@ class CSimpleFrame : public CBOINCBaseFrame
public:
CSimpleFrame();
- CSimpleFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxPoint position, wxSize size);
+ CSimpleFrame(wxString title, wxIconBundle* icons, wxPoint position, wxSize size);
~CSimpleFrame();
diff --git a/clientgui/sg_DlgMessages.cpp b/clientgui/sg_DlgMessages.cpp
index a65984b..07d16d0 100644
--- a/clientgui/sg_DlgMessages.cpp
+++ b/clientgui/sg_DlgMessages.cpp
@@ -465,10 +465,7 @@ bool CDlgMessages::Create( wxWindow* parent, wxWindowID id, const wxString& capt
SetTitle(strCaption);
// Initialize Application Icon
- wxIconBundle icons;
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon());
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon32());
- SetIcons(icons);
+ SetIcons(*pSkinAdvanced->GetApplicationIcon());
Freeze();
diff --git a/clientgui/sg_DlgPreferences.cpp b/clientgui/sg_DlgPreferences.cpp
index 1a2660e..a5e2af2 100644
--- a/clientgui/sg_DlgPreferences.cpp
+++ b/clientgui/sg_DlgPreferences.cpp
@@ -950,10 +950,7 @@ bool CDlgPreferences::Create( wxWindow* parent, wxWindowID id, const wxString& c
SetTitle(strCaption);
// Initialize Application Icon
- wxIconBundle icons;
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon());
- icons.AddIcon(*pSkinAdvanced->GetApplicationIcon32());
- SetIcons(icons);
+ SetIcons(*pSkinAdvanced->GetApplicationIcon());
Freeze();
diff --git a/clientscr/boinc_ss.rc b/clientscr/boinc_ss.rc
index e5a5754..7e9bcfb 100644
--- a/clientscr/boinc_ss.rc
+++ b/clientscr/boinc_ss.rc
@@ -38,7 +38,7 @@ IDI_MAIN_ICON ICON "res\\ce.ico"
#elif defined(_WCG)
IDI_MAIN_ICON ICON "res\\wcg.ico"
#else
-IDI_MAIN_ICON ICON "res\\icon.ico"
+IDI_MAIN_ICON ICON "res\\boinc.ico"
#endif
/////////////////////////////////////////////////////////////////////////////
diff --git a/clientscr/boinc_ss_opengl.rc b/clientscr/boinc_ss_opengl.rc
index ba48e98..6e6df2c 100644
--- a/clientscr/boinc_ss_opengl.rc
+++ b/clientscr/boinc_ss_opengl.rc
@@ -36,7 +36,7 @@ IDI_MAIN_ICON ICON "res\\ce.ico"
#elif defined(_WCG)
IDI_MAIN_ICON ICON "res\\wcg.ico"
#else
-IDI_MAIN_ICON ICON "res\\icon.ico"
+IDI_MAIN_ICON ICON "res\\boinc.ico"
#endif
/////////////////////////////////////////////////////////////////////////////
diff --git a/clientscr/res/boinc.ico b/clientscr/res/boinc.ico
new file mode 100644
index 0000000..c535bce
Binary files /dev/null and b/clientscr/res/boinc.ico differ
diff --git a/clientscr/res/icon.ico b/clientscr/res/icon.ico
deleted file mode 100644
index 2bc3437..0000000
Binary files a/clientscr/res/icon.ico and /dev/null differ
diff --git a/clientscr/ss_app.cpp b/clientscr/ss_app.cpp
index f14b267..2dde307 100644
--- a/clientscr/ss_app.cpp
+++ b/clientscr/ss_app.cpp
@@ -21,6 +21,7 @@
#ifdef _WIN32
#include "boinc_win.h"
+#include "win_util.h"
#else
#include <cmath>
#endif
@@ -486,6 +487,24 @@ int main(int argc, char** argv) {
retry_connect = true;
}
}
+
+#ifdef _WIN32
+ chdir_to_data_dir();
+#endif
+
+ // Initialize the BOINC Diagnostics Framework
+ int dwDiagnosticsFlags =
+#ifdef _DEBUG
+ BOINC_DIAG_HEAPCHECKENABLED |
+ BOINC_DIAG_MEMORYLEAKCHECKENABLED |
+#endif
+ BOINC_DIAG_DUMPCALLSTACKENABLED |
+ BOINC_DIAG_REDIRECTSTDERR |
+ BOINC_DIAG_REDIRECTSTDOUT |
+ BOINC_DIAG_TRACETOSTDOUT;
+
+ diagnostics_init(dwDiagnosticsFlags, "stdoutscrgfx", "stderrscrgfx");
+
#ifdef _WIN32
WinsockInitialize();
#endif
diff --git a/configure.ac b/configure.ac
index 44f6d79..971ea8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ dnl not sure exactly what the minimum version is (but 2.13 wont work)
AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
-AC_INIT(BOINC, 7.2.43)
+AC_INIT(BOINC, 7.2.44)
AC_CONFIG_MACRO_DIR([m4])
LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
AC_SUBST([LIBBOINC_VERSION])
diff --git a/packages/generic/sea/boincmgr.16x16.png b/packages/generic/sea/boincmgr.16x16.png
index 82563d9..e8a9bac 100644
Binary files a/packages/generic/sea/boincmgr.16x16.png and b/packages/generic/sea/boincmgr.16x16.png differ
diff --git a/packages/generic/sea/boincmgr.32x32.png b/packages/generic/sea/boincmgr.32x32.png
index 0d90fad..bda8409 100644
Binary files a/packages/generic/sea/boincmgr.32x32.png and b/packages/generic/sea/boincmgr.32x32.png differ
diff --git a/packages/generic/sea/boincmgr.48x48.png b/packages/generic/sea/boincmgr.48x48.png
index 47ea00a..1718070 100644
Binary files a/packages/generic/sea/boincmgr.48x48.png and b/packages/generic/sea/boincmgr.48x48.png differ
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-boinc/boinc.git
More information about the pkg-boinc-commits
mailing list