diff --git a/checkin_notes b/checkin_notes index dcc6f5aa89..04330632d2 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5387,3 +5387,42 @@ David 11 June 2009 Makefile.am tools/ Makefile.am + +Rom 11 June 2009 + PTP: Introduce 'Progress Thru Processors' to the Windows build + environment. Use GridRepublic skin until the new one is available. + + client/win/ + boinc_cli.rc + boinc_cmd.rc + client/win/res/ + progress.ico (Added) + clientctrl/ + boincsvcctrl.rc + clientgui/ + BOINCGUIApp.rc + clientgui/res/ + progress.ico (Added) + clientgui/skins/Progress Thru Processors + + clientlib/win/ + boinc_dll.rc + clientscr/ + boinc_ss.rc + clientscr/res/ + boinc.jpg (Deleted) + clientscr/res/ + progress.bmp (Added) + progress.ico (Added) + Scricon3.ico (Deleted) + clienttray/ + boinc_tray.rc + win_build/ + Progress.sln + ptp_boinc_cli.vcproj + ptp_boinc_dll.vcproj + ptp_boinc_ss.vcproj + ptp_boinccmd.vcproj + ptp_boincmgr.vcproj + ptp_boincsvcctrl.vcproj + ptp_boinctray.vcproj diff --git a/client/win/boinc_cli.rc b/client/win/boinc_cli.rc index e81c7fc836..56ff6e804e 100644 --- a/client/win/boinc_cli.rc +++ b/client/win/boinc_cli.rc @@ -29,8 +29,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -#ifdef _GRIDREPUBLIC +#if defined(_GRIDREPUBLIC) +#elif defined(_PROGRESSTHRUPROCESSORS) +IDI_MAIN_ICON ICON "res\\progress.ico" #elif defined(_WCG) IDI_MAIN_ICON ICON "res\\wcg.ico" #else @@ -115,7 +117,42 @@ BEGIN VALUE "FileDescription", "BOINC client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_cli" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinc.exe" + VALUE "ProductName", "BOINC core client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "BOINC client" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinc_cli" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.exe" VALUE "ProductName", "BOINC core client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -150,7 +187,7 @@ BEGIN VALUE "FileDescription", "BOINC client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_cli" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.exe" VALUE "ProductName", "BOINC core client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -185,7 +222,7 @@ BEGIN VALUE "FileDescription", "BOINC client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_cli" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" diff --git a/client/win/boinc_cmd.rc b/client/win/boinc_cmd.rc index a99ab1ce39..eccb45a1b6 100644 --- a/client/win/boinc_cmd.rc +++ b/client/win/boinc_cmd.rc @@ -31,14 +31,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // remains consistent on all systems. #if defined(_GRIDREPUBLIC) +#elif defined(_PROGRESSTHRUPROCESSORS) + #elif defined(_WCG) - IDI_MAIN_ICON ICON "res\\wcg.ico" - #else - IDI_MAIN_ICON ICON "res\\icon.ico" - #endif ///////////////////////////////////////////////////////////////////////////// @@ -118,7 +116,42 @@ BEGIN VALUE "FileDescription", "BOINC Command Line Client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinccmd" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinccmd.exe" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "BOINC Command Line Client" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinccmd" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinccmd.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -153,7 +186,7 @@ BEGIN VALUE "FileDescription", "BOINC Command Line Client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinccmd" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinccmd.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -188,7 +221,7 @@ BEGIN VALUE "FileDescription", "BOINC Command Line Client" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinccmd" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinccmd.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" diff --git a/client/win/res/progress.ico b/client/win/res/progress.ico new file mode 100644 index 0000000000..337a3ec9b7 Binary files /dev/null and b/client/win/res/progress.ico differ diff --git a/clientctrl/boincsvcctrl.rc b/clientctrl/boincsvcctrl.rc index 8c80bbe9f1..73fd5b1ee9 100644 --- a/clientctrl/boincsvcctrl.rc +++ b/clientctrl/boincsvcctrl.rc @@ -100,7 +100,42 @@ BEGIN VALUE "FileDescription", "BOINC service controller" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincsvcctrl" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boincsvcctrl.exe" + VALUE "ProductName", "BOINC core client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "BOINC service controller" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boincsvcctrl" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boincsvcctrl.exe" VALUE "ProductName", "BOINC core client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -135,7 +170,7 @@ BEGIN VALUE "FileDescription", "BOINC service controller" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincsvcctrl" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boincsvcctrl.exe" VALUE "ProductName", "BOINC core client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -170,7 +205,7 @@ BEGIN VALUE "FileDescription", "BOINC service controller" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincsvcctrl" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boincsvcctrl.exe" VALUE "ProductName", "BOINC core client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" diff --git a/clientgui/BOINCGUIApp.rc b/clientgui/BOINCGUIApp.rc index 87b794635d..6f3d047a3e 100644 --- a/clientgui/BOINCGUIApp.rc +++ b/clientgui/BOINCGUIApp.rc @@ -30,17 +30,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // 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(_WCG) - APP_ICON ICON "res\\wcg.ico" - #else - APP_ICON ICON "res\\boincguiApp.ico" - #endif ///////////////////////////////////////////////////////////////////////////// @@ -136,7 +132,7 @@ BEGIN VALUE "FileDescription", "GridRepublic for Windows" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincmgr" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "gridrepublic.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -148,8 +144,42 @@ BEGIN END END -#elif defined(_WCG) +#elif defined(_PROGRESSTHRUPROCESSORS) +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "Progress Thru Processors for Windows" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boincmgr" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "progressthruprocessors.exe" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_WCG) VS_VERSION_INFO VERSIONINFO FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 @@ -172,7 +202,7 @@ BEGIN VALUE "FileDescription", "World Community Grid for Windows" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincmgr" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "worldcommunitygrid.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -207,7 +237,7 @@ BEGIN VALUE "FileDescription", "BOINC Manager for Windows" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boincmgr" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boincmgr.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" diff --git a/clientgui/res/progress.ico b/clientgui/res/progress.ico new file mode 100644 index 0000000000..337a3ec9b7 Binary files /dev/null and b/clientgui/res/progress.ico differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/Thumbs.db b/clientgui/skins/Progress Thru Processors/graphic/Thumbs.db new file mode 100644 index 0000000000..ae96746841 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/Thumbs.db differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/arwLeft.png b/clientgui/skins/Progress Thru Processors/graphic/arwLeft.png new file mode 100644 index 0000000000..2360706b9e Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/arwLeft.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/arwLeftClick.png b/clientgui/skins/Progress Thru Processors/graphic/arwLeftClick.png new file mode 100644 index 0000000000..2360706b9e Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/arwLeftClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/arwRight.png b/clientgui/skins/Progress Thru Processors/graphic/arwRight.png new file mode 100644 index 0000000000..b4ad7d67eb Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/arwRight.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/arwRightClick.png b/clientgui/skins/Progress Thru Processors/graphic/arwRightClick.png new file mode 100644 index 0000000000..b4ad7d67eb Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/arwRightClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnAddProject.png b/clientgui/skins/Progress Thru Processors/graphic/btnAddProject.png new file mode 100644 index 0000000000..5af7be5c0a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnAddProject.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnAddProjectClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnAddProjectClick.png new file mode 100644 index 0000000000..5af7be5c0a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnAddProjectClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnAdvancedView.png b/clientgui/skins/Progress Thru Processors/graphic/btnAdvancedView.png new file mode 100644 index 0000000000..f11ecd647a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnAdvancedView.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCancel.png b/clientgui/skins/Progress Thru Processors/graphic/btnCancel.png new file mode 100644 index 0000000000..f477595de0 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCancel.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCancelClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnCancelClick.png new file mode 100644 index 0000000000..f477595de0 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCancelClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnChange.png b/clientgui/skins/Progress Thru Processors/graphic/btnChange.png new file mode 100644 index 0000000000..6e9cff2a9a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnChange.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnChangeClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnChangeClick.png new file mode 100644 index 0000000000..6e9cff2a9a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnChangeClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnClear.png b/clientgui/skins/Progress Thru Processors/graphic/btnClear.png new file mode 100644 index 0000000000..0a233d6ff8 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnClear.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnClearClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnClearClick.png new file mode 100644 index 0000000000..0a233d6ff8 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnClearClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnClose.png b/clientgui/skins/Progress Thru Processors/graphic/btnClose.png new file mode 100644 index 0000000000..79f97fdb57 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnClose.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCloseClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnCloseClick.png new file mode 100644 index 0000000000..79f97fdb57 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCloseClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCopy.png b/clientgui/skins/Progress Thru Processors/graphic/btnCopy.png new file mode 100644 index 0000000000..7c212eefa5 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCopy.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCopyAll.png b/clientgui/skins/Progress Thru Processors/graphic/btnCopyAll.png new file mode 100644 index 0000000000..b1e4cdde5a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCopyAll.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCopyAllClicked.png b/clientgui/skins/Progress Thru Processors/graphic/btnCopyAllClicked.png new file mode 100644 index 0000000000..b1e4cdde5a Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCopyAllClicked.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnCopyClicked.png b/clientgui/skins/Progress Thru Processors/graphic/btnCopyClicked.png new file mode 100644 index 0000000000..7c212eefa5 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnCopyClicked.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnHelp.png b/clientgui/skins/Progress Thru Processors/graphic/btnHelp.png new file mode 100644 index 0000000000..63e1ac4264 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnHelp.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnHelpClicked.png b/clientgui/skins/Progress Thru Processors/graphic/btnHelpClicked.png new file mode 100644 index 0000000000..63e1ac4264 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnHelpClicked.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnMessages.png b/clientgui/skins/Progress Thru Processors/graphic/btnMessages.png new file mode 100644 index 0000000000..c2c0510a14 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnMessages.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.gif b/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.gif new file mode 100644 index 0000000000..62ca27d2be Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.gif differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.png b/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.png new file mode 100644 index 0000000000..2666f2a3ba Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnMessagesOrange.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnPreferences.png b/clientgui/skins/Progress Thru Processors/graphic/btnPreferences.png new file mode 100644 index 0000000000..0a861c6c2d Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnPreferences.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnResume.gif b/clientgui/skins/Progress Thru Processors/graphic/btnResume.gif new file mode 100644 index 0000000000..b78b9b1bb5 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnResume.gif differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnResume.png b/clientgui/skins/Progress Thru Processors/graphic/btnResume.png new file mode 100644 index 0000000000..ccf5cbb7db Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnResume.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnSave.png b/clientgui/skins/Progress Thru Processors/graphic/btnSave.png new file mode 100644 index 0000000000..b443eaeeb7 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnSave.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnSaveClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnSaveClick.png new file mode 100644 index 0000000000..b443eaeeb7 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnSaveClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnSnooze.png b/clientgui/skins/Progress Thru Processors/graphic/btnSnooze.png new file mode 100644 index 0000000000..879e05f350 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnSnooze.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnSynchronize.png b/clientgui/skins/Progress Thru Processors/graphic/btnSynchronize.png new file mode 100644 index 0000000000..d20f86e4ff Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnSynchronize.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/btnSynchronizeClick.png b/clientgui/skins/Progress Thru Processors/graphic/btnSynchronizeClick.png new file mode 100644 index 0000000000..d20f86e4ff Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/btnSynchronizeClick.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/conn_ind.png b/clientgui/skins/Progress Thru Processors/graphic/conn_ind.png new file mode 100644 index 0000000000..41a26f2c64 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/conn_ind.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/default_stat_icon.png b/clientgui/skins/Progress Thru Processors/graphic/default_stat_icon.png new file mode 100644 index 0000000000..6cc97af580 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/default_stat_icon.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/dlgBackground.png b/clientgui/skins/Progress Thru Processors/graphic/dlgBackground.png new file mode 100644 index 0000000000..5c4b08aa3d Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/dlgBackground.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/error_image.png b/clientgui/skins/Progress Thru Processors/graphic/error_image.png new file mode 100644 index 0000000000..bff1d93894 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/error_image.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gauge_bg.png b/clientgui/skins/Progress Thru Processors/graphic/gauge_bg.png new file mode 100644 index 0000000000..18e563efc3 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gauge_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gauge_progress_indicator.png b/clientgui/skins/Progress Thru Processors/graphic/gauge_progress_indicator.png new file mode 100644 index 0000000000..8e41b4a6be Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gauge_progress_indicator.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_about.ico b/clientgui/skins/Progress Thru Processors/graphic/gr_about.ico new file mode 100644 index 0000000000..9fc0093efa Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_about.ico differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_background.png b/clientgui/skins/Progress Thru Processors/graphic/gr_background.png new file mode 100644 index 0000000000..6769ac2046 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_background.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_icon_play.png b/clientgui/skins/Progress Thru Processors/graphic/gr_icon_play.png new file mode 100644 index 0000000000..47fa61dd25 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_icon_play.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_pause.png b/clientgui/skins/Progress Thru Processors/graphic/gr_pause.png new file mode 100644 index 0000000000..fcde39ce2d Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_pause.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_play.png b/clientgui/skins/Progress Thru Processors/graphic/gr_play.png new file mode 100644 index 0000000000..7ceecb748f Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_play.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_stop.png b/clientgui/skins/Progress Thru Processors/graphic/gr_stop.png new file mode 100644 index 0000000000..ca2ea61ebe Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_stop.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/gr_wizard_bar.png b/clientgui/skins/Progress Thru Processors/graphic/gr_wizard_bar.png new file mode 100644 index 0000000000..8de971d95b Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/gr_wizard_bar.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/ico_workWU.png b/clientgui/skins/Progress Thru Processors/graphic/ico_workWU.png new file mode 100644 index 0000000000..9d490fd265 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/ico_workWU.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/ico_workWU_sus.png b/clientgui/skins/Progress Thru Processors/graphic/ico_workWU_sus.png new file mode 100644 index 0000000000..acf2ef2c23 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/ico_workWU_sus.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/proj_bg.png b/clientgui/skins/Progress Thru Processors/graphic/proj_bg.png new file mode 100644 index 0000000000..110f81e560 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/proj_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/project_image.png b/clientgui/skins/Progress Thru Processors/graphic/project_image.png new file mode 100644 index 0000000000..21b7e51fcc Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/project_image.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/simplegui_bg.png b/clientgui/skins/Progress Thru Processors/graphic/simplegui_bg.png new file mode 100644 index 0000000000..62853a3d81 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/simplegui_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/spacer.png b/clientgui/skins/Progress Thru Processors/graphic/spacer.png new file mode 100644 index 0000000000..5ce14ed5b2 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/spacer.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/state_ind_bg.png b/clientgui/skins/Progress Thru Processors/graphic/state_ind_bg.png new file mode 100644 index 0000000000..ae59c70f06 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/state_ind_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/tabArea_bg.png b/clientgui/skins/Progress Thru Processors/graphic/tabArea_bg.png new file mode 100644 index 0000000000..8012798907 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/tabArea_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/graphic/wu_bg.png b/clientgui/skins/Progress Thru Processors/graphic/wu_bg.png new file mode 100644 index 0000000000..c272c99494 Binary files /dev/null and b/clientgui/skins/Progress Thru Processors/graphic/wu_bg.png differ diff --git a/clientgui/skins/Progress Thru Processors/skin.xml b/clientgui/skins/Progress Thru Processors/skin.xml new file mode 100644 index 0000000000..0082355147 --- /dev/null +++ b/clientgui/skins/Progress Thru Processors/skin.xml @@ -0,0 +1,259 @@ + + + + + + + + + + graphic/simplegui_bg.png + 213:213:213 + + + + + graphic/spacer.png + + + 30:45:59 + + + graphic/state_ind_bg.png + + + + + graphic/conn_ind.png + + + + + graphic/error_image.png + + + + + graphic/ico_workWU.png + 116:126:134 + 116:126:134 + 200:200:200 + + + + + graphic/ico_workWU_sus.png + 53:57:60 + 0:0:0 + 116:126:134 + + + + + graphic/tabArea_bg.png + + + + + graphic/wu_bg.png + + + + + graphic/project_image.png + + + + + graphic/gr_background.png + + + + + graphic/gauge_bg.png + + + + + graphic/gauge_progress_indicator.png + + + + + graphic/proj_bg.png + + + + + graphic/default_stat_icon.png + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + graphic/btnMessages.png + + + + + graphic/btnMessagesOrange.gif + + + + + graphic/btnSnooze.png + + + + + graphic/btnResume.gif + + + + + graphic/btnPreferences.png + + + + + graphic/btnAdvancedView.png + + + + + graphic/dlgBackground.png + + + + + + + Progress Thru Processors Desktop + Progress Thru Processors + + + + graphic/gr_icon_play.png + 255:255:255 + + + + + + graphic/gr_stop.png + 255:255:255 + + + + + + graphic/gr_pause.png + 255:255:255 + + + + graphic/gr_about.ico + + Progress Thru Processors + + http://www.gridrepublic.org + http://www.gridrepublic.org/index.php?param=contact + + + 0 + This will shut down Progress Thru Processors and its tasks entirely + until Progress Thru Processors Desktop is run again. + + In most cases, it is better to avoid exiting the program. Instead + simply close the Progress Thru Processors Desktop Window. + + + + + + Progress Thru Processors Desktop - Attach to Project + + graphic/gr_wizard_bar.png + + + + Progress Thru Processors Desktop - Attach to Account Manager/Update Account Manager + + graphic/gr_wizard_bar.png + + + + + + \ No newline at end of file diff --git a/clientlib/win/boinc_dll.rc b/clientlib/win/boinc_dll.rc index 293613e9e4..52e81588a5 100644 --- a/clientlib/win/boinc_dll.rc +++ b/clientlib/win/boinc_dll.rc @@ -86,7 +86,42 @@ BEGIN VALUE "FileDescription", "GridRepublic Client Platform Library" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_dll" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinc.dll" + VALUE "ProductName", "BOINC Core Client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "Progress Thru Processors Client Platform Library" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinc_dll" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.dll" VALUE "ProductName", "BOINC Core Client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -121,7 +156,7 @@ BEGIN VALUE "FileDescription", "BOINC Client Platform Library" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_dll" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.dll" VALUE "ProductName", "BOINC Core Client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" diff --git a/clientscr/boinc_ss.rc b/clientscr/boinc_ss.rc index 1ed974f918..b9a00e961c 100644 --- a/clientscr/boinc_ss.rc +++ b/clientscr/boinc_ss.rc @@ -30,17 +30,13 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. #if defined(_GRIDREPUBLIC) - IDI_MAIN_ICON ICON "res\\gridrepublic.ico" - +#elif defined(_PROGRESSTHRUPROCESSORS) +IDI_MAIN_ICON ICON "res\\progress.ico" #elif defined(_WCG) - IDI_MAIN_ICON ICON "res\\wcg.ico" - #else - IDI_MAIN_ICON ICON "res\\icon.ico" - #endif ///////////////////////////////////////////////////////////////////////////// @@ -116,10 +112,45 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "GridRepublic" - VALUE "FileDescription", "BOINC Screensaver" + VALUE "FileDescription", "GridRepublic Screensaver" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_ss" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinc.scr" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "Progress Thru Processors Screensaver" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinc_ss" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.scr" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -151,10 +182,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "World Community Grid" - VALUE "FileDescription", "BOINC Screensaver" + VALUE "FileDescription", "World Community Grid Screensaver" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_ss" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.scr" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -189,7 +220,7 @@ BEGIN VALUE "FileDescription", "BOINC Screensaver" VALUE "FileVersion", BOINC_VERSION_STRING "\0" VALUE "InternalName", "boinc_ss" - VALUE "LegalCopyright", "© 2003-2008 University of California" + VALUE "LegalCopyright", "© 2003-2009 University of California" VALUE "OriginalFilename", "boinc.scr" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" @@ -229,17 +260,13 @@ END // #if defined(_GRIDREPUBLIC) - IDB_BOINCSPLAT BITMAP "res\\gridrepublic.bmp" - +#elif defined(_PROGRESSTHRUPROCESSORS) +IDB_BOINCSPLAT BITMAP "res\\progress.bmp" #elif defined(_WCG) - IDB_BOINCSPLAT BITMAP "res\\wcg.bmp" - #else - IDB_BOINCSPLAT BITMAP "res\\boinc.bmp" - #endif ///////////////////////////////////////////////////////////////////////////// @@ -264,14 +291,33 @@ BEGIN "GridRepublic system status:\n\n" IDS_ERR_BOINCSCREENSAVERLOADING "GridRepublic screensaver loading" - IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING - "Application found, graphics loading...\n\nPlease wait..." IDS_ERR_BOINCSHUTDOWNEVENT "Gridrepublic screensaver shutting down." IDS_ERR_DAEMONALLOWSNOGRAPHICS "Gridrepublic screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service." END +#elif defined(_PROGRESSTHRUPROCESSORS) + +STRINGTABLE +BEGIN + IDS_DESCRIPTION "Progress Thru Processors" + IDS_ERR_GENERIC "There was an unspecified problem\nwith the Progress Thru Processors screensaver." + IDS_ERR_BOINCNOTDETECTED + "Progress Thru Processors is not running.\n\nPlease launch Progress Thru Processors\nto display graphics." + IDS_ERR_BOINCSUSPENDED "Progress Thru Processors is currently suspended." + IDS_ERR_BOINCNOAPPSEXECUTING + "Progress Thru Processors is currently idle." + IDS_ERR_BOINCNOAPPSEXECUTINGNOPROJECTSDETECTED + "Progress Thru Processors is not attached\nto any projects.\nYou can attach to projects using\nthe Attach to project wizard\nin the tools menu." + IDS_ERR_BOINCNOGRAPHICSAPPSEXECUTING + "Progress Thru Processors system status:\n\n" + IDS_ERR_BOINCSCREENSAVERLOADING + "Progress Thru Processors screensaver loading" + IDS_ERR_DAEMONALLOWSNOGRAPHICS + "Progress Thru Processors screensaver cannot display graphics \nfrom older applications when configured to \nrun as a Windows service." +END + #elif defined(_WCG) STRINGTABLE @@ -289,8 +335,6 @@ BEGIN "World Community Grid system status:\n\n" IDS_ERR_BOINCSCREENSAVERLOADING "World Community Grid screensaver loading" - IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING - "Application found, graphics loading...\n\nPlease wait..." IDS_ERR_BOINCSHUTDOWNEVENT "World Community Grid\nscreensaver shutting down." IDS_ERR_DAEMONALLOWSNOGRAPHICS @@ -314,8 +358,6 @@ BEGIN "BOINC system status:\n\n" IDS_ERR_BOINCSCREENSAVERLOADING "BOINC screensaver loading" - IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING - "Application found, graphics loading...\n\nPlease wait..." IDS_ERR_BOINCSHUTDOWNEVENT "BOINC screensaver shutting down." IDS_ERR_DAEMONALLOWSNOGRAPHICS @@ -326,6 +368,8 @@ END STRINGTABLE BEGIN + IDS_ERR_BOINCAPPFOUNDGRAPHICSLOADING + "Application found, graphics loading...\n\nPlease wait..." IDS_ERR_OUTOFMEMORY "Not enough memory." IDS_ERR_NOPREVIEW "No preview available" END diff --git a/clientscr/res/Scricon3.ico b/clientscr/res/Scricon3.ico deleted file mode 100644 index 0d6cb32a28..0000000000 Binary files a/clientscr/res/Scricon3.ico and /dev/null differ diff --git a/clientscr/res/boinc.jpg b/clientscr/res/boinc.jpg deleted file mode 100644 index 556968a5f6..0000000000 Binary files a/clientscr/res/boinc.jpg and /dev/null differ diff --git a/clientscr/res/progress.bmp b/clientscr/res/progress.bmp new file mode 100644 index 0000000000..76720592d9 Binary files /dev/null and b/clientscr/res/progress.bmp differ diff --git a/clientscr/res/progress.ico b/clientscr/res/progress.ico new file mode 100644 index 0000000000..337a3ec9b7 Binary files /dev/null and b/clientscr/res/progress.ico differ diff --git a/clienttray/boinc_tray.rc b/clienttray/boinc_tray.rc index 8ab23e9525..627aba381d 100644 --- a/clienttray/boinc_tray.rc +++ b/clienttray/boinc_tray.rc @@ -28,6 +28,113 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL // Version // +#if defined(_GRIDREPUBLIC) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "GridRepublic" + VALUE "FileDescription", "GridRepublic System Tray for Windows" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinctray" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinctray.exe" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_PROGRESSTHRUPROCESSORS) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Progress Thru Processors" + VALUE "FileDescription", "Progress Thru Processors System Tray for Windows" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinctray" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinctray.exe" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#elif defined(_WCG) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "World Community Grid" + VALUE "FileDescription", "World Community Grid System Tray for Windows" + VALUE "FileVersion", BOINC_VERSION_STRING "\0" + VALUE "InternalName", "boinctray" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinctray.exe" + VALUE "ProductName", "BOINC client" + VALUE "ProductVersion", BOINC_VERSION_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#else + VS_VERSION_INFO VERSIONINFO FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,BOINC_RELEASE,0 @@ -48,9 +155,9 @@ BEGIN VALUE "CompanyName", "Space Sciences Laboratory" VALUE "FileDescription", "BOINC System Tray for Windows" VALUE "FileVersion", BOINC_VERSION_STRING "\0" - VALUE "InternalName", "boincmgr" - VALUE "LegalCopyright", "© 2003-2008 University of California" - VALUE "OriginalFilename", "boincmgr.exe" + VALUE "InternalName", "boinctray" + VALUE "LegalCopyright", "© 2003-2009 University of California" + VALUE "OriginalFilename", "boinctray.exe" VALUE "ProductName", "BOINC client" VALUE "ProductVersion", BOINC_VERSION_STRING "\0" END @@ -61,6 +168,7 @@ BEGIN END END +#endif #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/win_build/Progress.sln b/win_build/Progress.sln new file mode 100644 index 0000000000..fcf75728eb --- /dev/null +++ b/win_build/Progress.sln @@ -0,0 +1,145 @@ +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc", "ptp_boinc_cli.vcproj", "{C04F0FCC-BB5D-4627-8656-6173B28BD69E}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} + {B06280CB-82A4-46DE-8956-602643078BDF} = {B06280CB-82A4-46DE-8956-602643078BDF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_dll", "ptp_boinc_dll.vcproj", "{B06280CB-82A4-46DE-8956-602643078BDF}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinc_ss", "ptp_boinc_ss.vcproj", "{4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinccmd", "ptp_boinccmd.vcproj", "{8F37E1F3-3A68-4A1D-9579-A1210BDD055E}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} = {E8F6BD7E-461A-4733-B7D8-37B09A099ED8} + {C04F0FCC-BB5D-4627-8656-6173B28BD69E} = {C04F0FCC-BB5D-4627-8656-6173B28BD69E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincmgr", "ptp_boincmgr.vcproj", "{06113715-AC51-4E91-8B9D-C987CABE0920}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B06280CB-82A4-46DE-8956-602643078BDF} = {B06280CB-82A4-46DE-8956-602643078BDF} + {C04F0FCC-BB5D-4627-8656-6173B28BD69E} = {C04F0FCC-BB5D-4627-8656-6173B28BD69E} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libboinc", "libboinc.vcproj", "{E8F6BD7E-461A-4733-B7D8-37B09A099ED8}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boinctray", "ptp_boinctray.vcproj", "{4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B06280CB-82A4-46DE-8956-602643078BDF} = {B06280CB-82A4-46DE-8956-602643078BDF} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "boincsvcctrl", "ptp_boincsvcctrl.vcproj", "{9FC47E90-4E0D-4383-B446-A84314B00764}" + ProjectSection(WebsiteProperties) = preProject + Debug.AspNetCompiler.Debug = "True" + Release.AspNetCompiler.Debug = "False" + EndProjectSection + ProjectSection(ProjectDependencies) = postProject + {B06280CB-82A4-46DE-8956-602643078BDF} = {B06280CB-82A4-46DE-8956-602643078BDF} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.ActiveCfg = Debug|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|Win32.Build.0 = Debug|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.ActiveCfg = Debug|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Debug|x64.Build.0 = Debug|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|Win32.ActiveCfg = Release|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|Win32.Build.0 = Release|Win32 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.ActiveCfg = Release|x64 + {C04F0FCC-BB5D-4627-8656-6173B28BD69E}.Release|x64.Build.0 = Release|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|Win32.ActiveCfg = Debug|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|Win32.Build.0 = Debug|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|x64.ActiveCfg = Debug|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Debug|x64.Build.0 = Debug|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|Win32.ActiveCfg = Release|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|Win32.Build.0 = Release|Win32 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|x64.ActiveCfg = Release|x64 + {B06280CB-82A4-46DE-8956-602643078BDF}.Release|x64.Build.0 = Release|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Debug|x64.Build.0 = Debug|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|Win32.ActiveCfg = Release|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|Win32.Build.0 = Release|Win32 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.ActiveCfg = Release|x64 + {4A2C5963-6A8D-4CA1-A312-C3D749B2EA81}.Release|x64.Build.0 = Release|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.ActiveCfg = Debug|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|Win32.Build.0 = Debug|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.ActiveCfg = Debug|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Debug|x64.Build.0 = Debug|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|Win32.ActiveCfg = Release|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|Win32.Build.0 = Release|Win32 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.ActiveCfg = Release|x64 + {8F37E1F3-3A68-4A1D-9579-A1210BDD055E}.Release|x64.Build.0 = Release|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.ActiveCfg = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|Win32.Build.0 = Debug|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.ActiveCfg = Debug|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Debug|x64.Build.0 = Debug|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|Win32.ActiveCfg = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|Win32.Build.0 = Release|Win32 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.ActiveCfg = Release|x64 + {06113715-AC51-4E91-8B9D-C987CABE0920}.Release|x64.Build.0 = Release|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.ActiveCfg = Debug|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|Win32.Build.0 = Debug|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.ActiveCfg = Debug|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Debug|x64.Build.0 = Debug|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|Win32.ActiveCfg = Release|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|Win32.Build.0 = Release|Win32 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.ActiveCfg = Release|x64 + {E8F6BD7E-461A-4733-B7D8-37B09A099ED8}.Release|x64.Build.0 = Release|x64 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|Win32.Build.0 = Debug|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|x64.ActiveCfg = Debug|x64 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Debug|x64.Build.0 = Debug|x64 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|Win32.ActiveCfg = Release|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|Win32.Build.0 = Release|Win32 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|x64.ActiveCfg = Release|x64 + {4A2C5963-6A8D-4DA1-A312-C3D749B2EA81}.Release|x64.Build.0 = Release|x64 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.ActiveCfg = Debug|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|Win32.Build.0 = Debug|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|x64.ActiveCfg = Debug|x64 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Debug|x64.Build.0 = Debug|x64 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|Win32.ActiveCfg = Release|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|Win32.Build.0 = Release|Win32 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|x64.ActiveCfg = Release|x64 + {9FC47E90-4E0D-4383-B446-A84314B00764}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win_build/installerv2/redist/Seed/IsDialogBanner.bmp b/win_build/installerv2/redist/Seed/IsDialogBanner.bmp deleted file mode 100644 index e61652fa19..0000000000 Binary files a/win_build/installerv2/redist/Seed/IsDialogBanner.bmp and /dev/null differ diff --git a/win_build/installerv2/redist/Seed/IsDialogBitmap.bmp b/win_build/installerv2/redist/Seed/IsDialogBitmap.bmp deleted file mode 100644 index 3696f83e9e..0000000000 Binary files a/win_build/installerv2/redist/Seed/IsDialogBitmap.bmp and /dev/null differ diff --git a/win_build/installerv2/redist/Seed/splash.bmp b/win_build/installerv2/redist/Seed/splash.bmp deleted file mode 100644 index 1564362a43..0000000000 Binary files a/win_build/installerv2/redist/Seed/splash.bmp and /dev/null differ diff --git a/win_build/ptp_boinc_cli.vcproj b/win_build/ptp_boinc_cli.vcproj new file mode 100644 index 0000000000..1bde99370a --- /dev/null +++ b/win_build/ptp_boinc_cli.vcproj @@ -0,0 +1,900 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boinc_dll.vcproj b/win_build/ptp_boinc_dll.vcproj new file mode 100644 index 0000000000..308fbdd0b7 --- /dev/null +++ b/win_build/ptp_boinc_dll.vcproj @@ -0,0 +1,698 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boinc_ss.vcproj b/win_build/ptp_boinc_ss.vcproj new file mode 100644 index 0000000000..05a23f8107 --- /dev/null +++ b/win_build/ptp_boinc_ss.vcproj @@ -0,0 +1,763 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boinccmd.vcproj b/win_build/ptp_boinccmd.vcproj new file mode 100644 index 0000000000..38d467e426 --- /dev/null +++ b/win_build/ptp_boinccmd.vcproj @@ -0,0 +1,610 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boincmgr.vcproj b/win_build/ptp_boincmgr.vcproj new file mode 100644 index 0000000000..a9f6bea125 --- /dev/null +++ b/win_build/ptp_boincmgr.vcproj @@ -0,0 +1,1660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boincsvcctrl.vcproj b/win_build/ptp_boincsvcctrl.vcproj new file mode 100644 index 0000000000..f3f0500603 --- /dev/null +++ b/win_build/ptp_boincsvcctrl.vcproj @@ -0,0 +1,604 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/win_build/ptp_boinctray.vcproj b/win_build/ptp_boinctray.vcproj new file mode 100644 index 0000000000..1fd70d6cd0 --- /dev/null +++ b/win_build/ptp_boinctray.vcproj @@ -0,0 +1,598 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +