- MGR: Have the SkinManager parse the correct spelling

of 'organization'.
    - MGR: Add a new tab status to the Simple GUI for when
        the client has been instructed to delay starting
        applications via the <delay_start> option in cc_config.xml
        (From Kevin Reed)

    clientgui/
        sg_ImageButton.cpp, .h
        sg_ViewTabPage.cpp
        SkinManager.cpp

svn path=/trunk/boinc/; revision=16280

checkin_notes

@@ -8612,3 +8612,16 @@ Rom    22 Oct 2008
     win_build/installerv2/
         BOINC.ism
         BOINCx64.ism
+
+Rom    23 Oct 2008
+    - MGR: Have the SkinManager parse the correct spelling
+        of 'organization'.
+    - MGR: Add a new tab status to the Simple GUI for when
+        the client has been instructed to delay starting
+        applications via the <delay_start> option in cc_config.xml
+        (From Kevin Reed)
+
+    clientgui/
+        sg_ImageButton.cpp, .h
+        sg_ViewTabPage.cpp
+        SkinManager.cpp

clientgui/SkinManager.cpp

@@ -888,13 +888,13 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
                 m_bitmapApplicationLogo = wxBitmap(wxImage(str.c_str(), wxBITMAP_TYPE_ANY));
             }
             continue;
-        } else if (parse_str(buf, "<organizaton_name>", strBuffer)) {
+        } else if (parse_str(buf, "<organization_name>", strBuffer)) {
             m_strOrganizationName = wxString(strBuffer.c_str(), wxConvUTF8);
             continue;
-        } else if (parse_str(buf, "<organizaton_website>", strBuffer)) {
+        } else if (parse_str(buf, "<organization_website>", strBuffer)) {
             m_strOrganizationWebsite = wxString(strBuffer.c_str(), wxConvUTF8);
             continue;
-        } else if (parse_str(buf, "<organizaton_help_url>", strBuffer)) {
+        } else if (parse_str(buf, "<organization_help_url>", strBuffer)) {
             m_strOrganizationHelpUrl = wxString(strBuffer.c_str(), wxConvUTF8);
             continue;
         } else if (parse_int(buf, "<open_tab>", m_iDefaultTab)) {

clientgui/sg_ImageButton.cpp

@@ -100,6 +100,8 @@ wxString CImageButton::GetStatusText() {
 		return wxString(_("Paused: Benchmarks running"));
 	} else if ( status == TAB_STATUS_PAUSED )  {
 		return wxString(_("Paused"));
+	} else if ( status == TAB_STATUS_INITIAL_DELAY )  {
+		return wxString(_("Paused: Application start delayed"));
 	} else {
 		return wxEmptyString;
 	}

clientgui/sg_ImageButton.h

@@ -30,6 +30,7 @@
 #define TAB_STATUS_PAUSED_TIME_OF_DAY 6
 #define TAB_STATUS_PAUSED_BENCHMARKS 7
 #define TAB_STATUS_PAUSED 8
+#define TAB_STATUS_INITIAL_DELAY 9
 
 class CImageButton : public wxPanel 
 { 

clientgui/sg_ViewTabPage.cpp

@@ -178,6 +178,8 @@ int CViewTabPage::ComputeState() {
 			status = TAB_STATUS_PAUSED_TIME_OF_DAY;
 		} else if ( ccStatus.task_suspend_reason & SUSPEND_REASON_BENCHMARKS ) {
 			status = TAB_STATUS_PAUSED_BENCHMARKS;
+		} else if ( ccStatus.task_suspend_reason & SUSPEND_REASON_INITIAL_DELAY ) {
+			status = TAB_STATUS_INITIAL_DELAY;
 		}
 	}
 	return status;
@@ -581,8 +583,15 @@ void MyCanvas::LoadSlideShow() {
 			wxImage img = image->ConvertToImage();
 			img.Rescale((int) (image->GetWidth()*ratio), (int) (image->GetHeight()*ratio));
 			image = new wxBitmap(img);
-		} 
-		il = new ImageLoader(this, true);
+		}
+		if ( xRatio == yRatio ) {
+			// If it perfectly fills the window, don't center
+			// Centering causes a bug (at least on windows) where if the taskbar
+			// is at the top of the page, the images are offset
+			il = new ImageLoader(this, false);
+		} else {
+			il = new ImageLoader(this, true);
+		}
 		il->LoadImage(*image);
 		if ( ratio < 1.0 ) {
 			delete image;