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

Changes for Charity Engine Desktop 

svn path=/trunk/boinc/; revision=23964
This commit is contained in:
Charlie Fenton 2011-08-09 00:38:30 +00:00
parent 7b9e20ee78
commit af8d165400
13 changed files with 72 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
checkin_notes
View File

@ -4731,3 +4731,35 @@ David 7 Aug 2011
client/
rr_sim.cpp
client_types.h
Charlie 8 Aug 2011
- Changes for Charity Engine Desktop.
clientgui/
mac/
CE_ss_logo.tiff (new)
res/
CE_Install.icns (new)
CharityEngine.icns (new)
CE_Uninstall.icns (new)
MacCEPkgIcon.zip (new)
skins/
Charity Engine/ (new)
graphics/ (new)
(many new files)
skin.xml (new)
clientscr/
mac_saver_module.cpp
res/
CE_ss_logo.png (new)
CE_ss_logo.jpg (new)
ss_app.cpp
mac_installer/
CE-Branding (new)
CE-ReadMe.rtf (new)
CharityEngine/ (new)
acct_mgr_url.xml (new)
GR-ReadMe.rtf
make_CharityEngine.sh (new)
PostInstall.cpp
PTP-ReadMe.rtf

BIN
clientgui/mac/CE_ss_logo.tiff Normal file
View File

Binary file not shown.

BIN
clientgui/res/CE_Install.icns Normal file
View File

Binary file not shown.

BIN
clientgui/res/CE_Uninstall.icns Normal file
View File

Binary file not shown.

BIN
clientgui/res/CharityEngine.icns Normal file
View File

Binary file not shown.

BIN
clientgui/res/MacCEPkgIcon.zip Normal file
View File

Binary file not shown.

7
clientscr/mac_saver_module.cpp
View File

@ -319,10 +319,13 @@ OSStatus CScreensaver::initBOINCApp() {
brandId = GetBrandID();
switch(brandId) {
case 1:
m_BrandText = "GridRepublic";
m_BrandText = "GridRepublic Desktop";
break;
case 2:
m_BrandText = "Progress Thru Processors";
m_BrandText = "Progress Thru Processors Desktop";
break;
case 3:
m_BrandText = "Charity Engine Desktop";
break;
default:
m_BrandText = "BOINC";

BIN
clientscr/res/CE_ss_logo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
clientscr/res/CE_ss_logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB

13
clientscr/ss_app.cpp
View File

@ -74,9 +74,12 @@ CC_STATUS cc_status;
#define BOINC_BRAND_ID 0
#define GRIDREPUBLIC_BRAND_ID 1
#define PROGRESSTHRUPROCESSORS_BRAND_ID 2
#define CHARITYENGINE_BRAND_ID 3
#ifdef _GRIDREPUBLIC
static long iBrandId = GRIDREPUBLIC_BRAND_ID;
#elif defined(_CHARITYENGINE)
static long iBrandId = CHARITYENGINE_BRAND_ID;
#else
static long iBrandId = BOINC_BRAND_ID; // Default value for BOINC
#endif
@ -234,6 +237,8 @@ void show_disconnected() {
float x=.3, y=.3;
if (iBrandId == GRIDREPUBLIC_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "GridRepublic is not running.");
} else if (iBrandId == CHARITYENGINE_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "Charity Engine is not running.");
} else {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "BOINC is not running.");
}
@ -243,12 +248,16 @@ void show_no_projects() {
float x=.2, y=.3;
if (iBrandId == GRIDREPUBLIC_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "GridRepublic is not attached to any projects.");
} else if (iBrandId == CHARITYENGINE_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "Charity Engine is not attached to any projects.");
} else {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "BOINC is not attached to any projects.");
}
y = .25;
if (iBrandId == GRIDREPUBLIC_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "Attach to projects using the GridRepublic Desktop.");
} else if (iBrandId == CHARITYENGINE_BRAND_ID) {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "Attach to projects using the Charity Engine Desktop.");
} else {
txf_render_string(.1, x, y, 0, ALERT_SIZE, white, 0, "Attach to projects using the BOINC Manager.");
}
@ -302,6 +311,8 @@ void show_jobs(unsigned int index, double alpha) {
case SUSPEND_REASON_INITIAL_DELAY:
if (iBrandId == GRIDREPUBLIC_BRAND_ID) {
p = "Computing suspended while GridRepublic is starting up"; break;
} else if (iBrandId == CHARITYENGINE_BRAND_ID) {
p = "Computing suspended while Charity Engine is starting up"; break;
} else {
p = "Computing suspended while BOINC is starting up"; break;
}
@ -457,6 +468,8 @@ void app_graphics_init() {
#else
if (iBrandId == GRIDREPUBLIC_BRAND_ID) {
logo.load_image_file("gridrepublic_ss_logo.jpg");
} else if (iBrandId == CHARITYENGINE_BRAND_ID) {
logo.load_image_file("CE_ss_logo.jpg");
} else {
logo.load_image_file("boinc_logo_black.jpg");
}

8
mac_installer/GR-ReadMe.rtf
View File

@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;\red2\green87\blue173;}
\margl1440\margr1440\vieww9000\viewh9000\viewkind0
@ -19,11 +19,11 @@
\
\b Dual GPU Macbook Pros:
\b0 Some newer Macbook Pros have dual graphics processors, one that is more powerful and another that is more energy-efficient, and they switch between them automatically. This can cause your screensaver to flash on and off frequently, and can prevent BOINC from detecting the more powerful GPU which is needed to process some applications. You can force selection either {\field{\*\fldinst{HYPERLINK "http://support.apple.com/kb/HT4110"}}{\fldrslt \cf2 permanently}} or temporarily using a {\field{\*\fldinst{HYPERLINK "http://codykrieger.com/gfxCardStatus/"}}{\fldrslt \cf2 third-party utility}}. But be aware that forcing the use of the NVIDIA GPU may cause faster battery drain; this of course is not an issue when running on AC power.\
\b0 Some newer Macbook Pros have dual graphics processors, one that is more powerful and another that is more energy-efficient, and they switch between them automatically. This can cause your screensaver to flash on and off frequently, and can prevent GridRepublic Desktop from detecting the more powerful GPU which is needed to process some applications. You can force selection either {\field{\*\fldinst{HYPERLINK "http://support.apple.com/kb/HT4110"}}{\fldrslt \cf2 permanently}} or temporarily using a {\field{\*\fldinst{HYPERLINK "http://codykrieger.com/gfxCardStatus/"}}{\fldrslt \cf2 third-party utility}}. But be aware that forcing the use of the NVIDIA GPU may cause faster battery drain; this of course is not an issue when running on AC power.\
\
If you are upgrading from a version earlier than 6.8.0, you may see a message "Failed to convert file GridRepublic Desktop Preferences to Unicode." This is due to our addition of full Unicode support to the GridRepublic Desktop. If you get this message, you may need to readjust your column widths and other GridRepublic Desktop view options, but no other problems will result. When you quit GridRepublic Desktop, these settings will be saved in the new Unicode format.\
\
Due to new restrictions imposed by OS 10.6 Snow Leopard, there has been a change in GridRepublic Desktop's security implementation. Non-administrative users can no longer run GridRepublic Desktop unless they are added to group boinc_master. As of GridRepublic Desktop 6.10.5, the GridRepublic Desktop installer asks whether or not you wish to allow this.\
Due to new restrictions imposed by OS 10.6 Snow Leopard, there has been a change in GridRepublic Desktop's security implementation. Non-administrative users can no longer run GridRepublic Desktop unless they are added to group boinc_master. As of GridRepublic Desktop 6.8.29, the GridRepublic Desktop installer asks whether or not you wish to allow this.\
\
For more options, please see the BOINC Macintosh administrator tools at:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
@ -157,7 +157,7 @@ You can move (
\pard\pardeftab720\ql\qnatural
\cf0 To completely remove (
\b uninstall
\b0 ) BOINC from your Macintosh, run the
\b0 ) GridRepublic Desktop from your Macintosh, run the
\b Uninstall GridRepublic
\b0 application which is included with the installer.\
}

20
mac_installer/PTP-ReadMe.rtf
View File

@ -1,4 +1,4 @@
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf350
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;\red2\green87\blue173;}
\margl1440\margr1440\vieww9000\viewh9000\viewkind0
@ -19,11 +19,11 @@
\
\b Dual GPU Macbook Pros:
\b0 Some newer Macbook Pros have dual graphics processors, one that is more powerful and another that is more energy-efficient, and they switch between them automatically. This can cause your screensaver to flash on and off frequently, and can prevent BOINC from detecting the more powerful GPU which is needed to process some applications. You can force selection either {\field{\*\fldinst{HYPERLINK "http://support.apple.com/kb/HT4110"}}{\fldrslt \cf2 permanently}} or temporarily using a {\field{\*\fldinst{HYPERLINK "http://codykrieger.com/gfxCardStatus/"}}{\fldrslt \cf2 third-party utility}}. But be aware that forcing the use of the NVIDIA GPU may cause faster battery drain; this of course is not an issue when running on AC power.\
\b0 Some newer Macbook Pros have dual graphics processors, one that is more powerful and another that is more energy-efficient, and they switch between them automatically. This can cause your screensaver to flash on and off frequently, and can prevent ProgressThruProcessors Desktop from detecting the more powerful GPU which is needed to process some applications. You can force selection either {\field{\*\fldinst{HYPERLINK "http://support.apple.com/kb/HT4110"}}{\fldrslt \cf2 permanently}} or temporarily using a {\field{\*\fldinst{HYPERLINK "http://codykrieger.com/gfxCardStatus/"}}{\fldrslt \cf2 third-party utility}}. But be aware that forcing the use of the NVIDIA GPU may cause faster battery drain; this of course is not an issue when running on AC power.\
\
If you are upgrading from a version earlier than 6.8.0, you may see a message "Failed to convert file ProgressThruProcessors Desktop Preferences to Unicode." This is due to our addition of full Unicode support to the ProgressThruProcessors Desktop. If you get this message, you may need to readjust your column widths and other ProgressThruProcessors Desktop view options, but no other problems will result. When you quit ProgressThruProcessors Desktop, these settings will be saved in the new Unicode format.\
\
Due to new restrictions imposed by OS 10.6 Snow Leopard, there has been a change in ProgressThruProcessors Desktop's security implementation. Non-administrative users can no longer run ProgressThruProcessors Desktop unless they are added to group boinc_master. As of BOINC 6.10.5, the ProgressThruProcessors Desktop installer asks whether or not you wish to allow this.\
Due to new restrictions imposed by OS 10.6 Snow Leopard, there has been a change in ProgressThruProcessors Desktop's security implementation. Non-administrative users can no longer run ProgressThruProcessors Desktop unless they are added to group boinc_master. As of ProgressThruProcessors Desktop 6.8.29, the ProgressThruProcessors Desktop installer asks whether or not you wish to allow this.\
\
For more options, please see the BOINC Macintosh administrator tools at:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
@ -44,7 +44,7 @@ This is a
\b \cf0 Upgrade warning: You may lose unreported results
\b0 if you are running on an
\b Intel Mac
\b0 and upgrading from a version of GridRepublic or BOINC earlier than 5.3.21 on an Intel Mac, or if you are transferring Progress Thru Processors or BOINC Data from a PowerPC Mac to an Intel Mac, or from an Intel Mac to a PowerPC Mac. To prevent this, open GridRepublic Desktop's window, select the
\b0 and upgrading from a version of ProgressThruProcessors Desktop or BOINC earlier than 5.3.21 on an Intel Mac, or if you are transferring Progress Thru Processors or BOINC Data from a PowerPC Mac to an Intel Mac, or from an Intel Mac to a PowerPC Mac. To prevent this, open ProgressThruProcessors Desktop's window, select the
\i Projects
\i0 tab, select each project and press the
\i Update
@ -65,9 +65,9 @@ Note: on some versions of the Mac OS, you may not be able to exit the Progress T
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\b0 \cf0 Version 5.5.4 of GridRepublic Desktop or BOINC for the Macintosh features new, stricter security measures. This additional security helps protect your computer data from potential theft or accidental or malicious damage by limiting Progress Thru Processors projects' access to your system and data. \
\b0 \cf0 Version 5.5.4 of ProgressThruProcessors Desktop or BOINC for the Macintosh features new, stricter security measures. This additional security helps protect your computer data from potential theft or accidental or malicious damage by limiting Progress Thru Processors projects' access to your system and data. \
\
If you experience problems with this software, you can re-install a version of GridRepublic Desktop or BOINC prior to 5.5.4; this will automatically revert ownership and permissions to the earlier implementation.\
If you experience problems with this software, you can re-install a version of ProgressThruProcessors Desktop or BOINC prior to 5.5.4; this will automatically revert ownership and permissions to the earlier implementation.\
\
Once we have tested this security implementation on the Mac, we plan to extend it to other computer platforms, including Linux and Windows.\
\
@ -129,10 +129,8 @@ The installer now sets Progress Thru Processors Desktop as a Login item for
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
\b \cf0 Troubleshooting tip:
\b0 If you are upgrading from a version of GridRepublic Desktop or BOINC prior to 5.5.4 and the installer refuses to let you install, trash the file
\b /Library/Receipts/
\b0 Progress Thru Processors
\b .pkg
\b0 If you are upgrading from a version of ProgressThruProcessors Desktop or BOINC prior to 5.5.4 and the installer refuses to let you install, trash the file
\b /Library/Receipts/Progress Thru Processors.pkg
\b0 or
\b /Library/Receipts/BOINC.pkg
\b0 and try again.\
@ -159,7 +157,7 @@ You can move (
\pard\pardeftab720\ql\qnatural
\cf0 To completely remove (
\b uninstall
\b0 ) BOINC from your Macintosh, run the
\b0 ) ProgressThruProcessors Desktop from your Macintosh, run the
\b Uninstall Progress Thru Processors
\b0 application which is included with the installer.\
}

10
mac_installer/PostInstall.cpp
View File

@ -108,7 +108,7 @@ void strip_cr(char *buf);
extern int check_security(char *bundlePath, char *dataPath, int use_sandbox, int isManager);
#define NUMBRANDS 3
#define NUMBRANDS 4
/* globals */
static Boolean gCommandLineInstall = false;
@ -183,6 +183,13 @@ int main(int argc, char *argv[])
saverNameEscaped[2] = "Progress\\ Thru\\ Processors";
receiptNameEscaped[2] = "/Library/Receipts/Progress\\ Thru\\ Processors\\ Installer.pkg";
appName[3] = "/Applications/Charity Engine Desktop.app";
appNameEscaped[3] = "/Applications/Charity\\ Engine\\ Desktop.app";
brandName[3] = "Charity Engine";
saverName[3] = "Charity Engine";
saverNameEscaped[3] = "Charity\\ Engine";
receiptNameEscaped[3] = "/Library/Receipts/Charity\\ Engine\\ Installer.pkg";
::GetCurrentProcess (&ourProcess);
puts("Starting PostInstall app\n");
@ -752,6 +759,7 @@ Boolean SetLoginItem(long brandID, Boolean deleteLogInItem)
// if (strcmp(p, "BOINCMANAGER.APP") == 0)
// if (strcmp(p, "GRIDREPUBLIC DESKTOP.APP") == 0)
// if (strcmp(p, "PROGRESS THRU PROCESSORS DESKTOP.APP") == 0)
// if (strcmp(p, "CHARITY ENGINE.APP") == 0)
if (strcmp(p, s) == 0) {
Success = RemoveLoginItemAtIndex(kCurrentUser, Counter-1);
}