From d34cc69d457e3b49bfdc2cc2e334d8e41c03cc30 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 25 Sep 2009 17:39:50 +0000 Subject: [PATCH] - user web: remove "enforced by version X+" for X < 6.0 - screensaver: added some comments svn path=/trunk/boinc/; revision=19167 --- checkin_notes | 10 ++++++++++ clientscr/screensaver.cpp | 9 ++++++--- clientscr/ss_app.cpp | 10 +++------- html/inc/prefs.inc | 18 ++++++------------ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/checkin_notes b/checkin_notes index 1950abc686..6706b71dc1 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8107,3 +8107,13 @@ David 25 Sept 2009 lib/ coproc.cpp + +David 25 Sept 2009 + - user web: remove "enforced by version X+" for X < 6.0 + - screensaver: added some comments + + clientscr/ + screensaver.cpp + ss_app.cpp + html/inc/ + prefs.inc diff --git a/clientscr/screensaver.cpp b/clientscr/screensaver.cpp index cd177fef70..f6c9c2ab39 100644 --- a/clientscr/screensaver.cpp +++ b/clientscr/screensaver.cpp @@ -15,9 +15,12 @@ // You should have received a copy of the GNU Lesser General Public License // along with BOINC. If not, see . +// Screensaver coordinator. +// Alternates between a "default screensaver" +// and application graphics for running jobs. +// Periods are configurable via config file "ss_config.xml". +// See http://boinc.berkeley.edu/trac/wiki/ScreensaverEnhancements -// System Includes -// #ifdef _WIN32 #include "boinc_win.h" #endif @@ -35,7 +38,7 @@ #include "common_defs.h" #include "filesys.h" #include "error_numbers.h" -#include "gui_rpc_client.h" // The order of included headers is critical here. Do not move this! +#include "gui_rpc_client.h" #include "str_util.h" #include "str_replace.h" #include "screensaver.h" diff --git a/clientscr/ss_app.cpp b/clientscr/ss_app.cpp index a3c1997c63..9ce37feaa7 100644 --- a/clientscr/ss_app.cpp +++ b/clientscr/ss_app.cpp @@ -15,13 +15,9 @@ // You should have received a copy of the GNU Lesser General Public License // along with BOINC. If not, see . -// Example graphics application, paired with uc2.C -// This demonstrates: -// - using shared memory to communicate with the worker app -// - reading XML preferences by which users can customize graphics -// (in this case, select colors) -// - handle mouse input (in this case, to zoom and rotate) -// - draw text and 3D objects using OpenGL +// Default screensaver. +// Shows the BOINC logo and a rotating display of +// attached projects and jobs in progress #ifdef _WIN32 #include "boinc_win.h" diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc index b98e4752d8..2cf92a91f3 100644 --- a/html/inc/prefs.inc +++ b/html/inc/prefs.inc @@ -75,8 +75,7 @@ define("RUN_GPU_IF_USER_ACTIVE_DESC", define("IDLE_TIME_TO_RUN_DESC", "'In use' means mouse/keyboard activity in last"); define("SUSPEND_IF_NO_RECENT_INPUT_DESC", "Suspend work if no mouse/keyboard activity in last -
(Needed to enter low-power mode on some computers) -
Enforced by version 5.10.14+" +
(Needed to enter low-power mode on some computers)" ); define("START_END_DESC", "Do work only between the hours of"); define("START_END_DESC2", "
(no restriction if equal)"); @@ -100,17 +99,15 @@ define("WORK_BUF_MIN_DAYS_DESC", " ); define("WORK_BUF_ADDITIONAL_DAYS_DESC", - "Maintain enough work for an additional -
Enforced by version 5.10+ - " + "Maintain enough work for an additional" ); define("MAX_NCPUS_PCT_DESC", "On multiprocessors, use at most
Enforced by version 6.1+"); define("MAX_NCPUS_PCT_DESC2", "% of the processors"); -define("MAX_CPUS_DESC", "On multiprocessors, use at most
Enforced by version 5.10 and earlier"); +define("MAX_CPUS_DESC", "On multiprocessors, use at most"); define("MAX_CPUS_DESC2", "processors"); define("USE_AT_MOST", "Use at most"); -define("USE_AT_MOST2", "Use at most
(Can be used to reduce CPU heat)
Enforced by version 5.6+"); -define("USE_AT_MOST3", "Use at most
Enforced by version 5.8+"); +define("USE_AT_MOST2", "Use at most
(Can be used to reduce CPU heat)"); +define("USE_AT_MOST3", "Use at most"); define("CPU_USAGE_LIMIT_DESC2", "percent of CPU time"); define("DISK_INTERVAL_DESC", "Write to disk at most every"); define("DISK_LIMIT_DESC", "Disk and memory usage"); @@ -124,10 +121,7 @@ define("RAM_MAX_USED_IDLE_PCT_DESC2", "% of memory when computer is not in use") define("NETWORK_LIMIT_DESC", "Network usage"); define("MAX_BYTES_SEC_DOWN_DESC", "Maximum download rate:"); define("MAX_BYTES_SEC_UP_DESC", "Maximum upload rate:"); -define("NET_START_END_DESC", - "Use network only between the hours of -
Enforced by version 4.46+" -); +define("NET_START_END_DESC", "Use network only between the hours of"); define("DONT_VERIFY_IMAGES_DESC", "Skip image file verification?
Check this ONLY if your Internet provider