*** empty log message ***

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

checkin_notes

@@ -12100,9 +12100,15 @@ Charlie 3 Nov 2006
         not easily localized.  The project and application names are 
         still read from skins.xml and inserted in dialog text.
 
+        Note to Rom: I guarded al references to m_strExitMessage with "
+        #if 0" rather than removing them so you can easily restore them 
+        if you feel it is important to have it customizable for branding 
+        at the expense of easier localization.
+
     clientgui/
         AdvancedFrame.cpp, h
         BOINCBaseFrame.cpp, h
         BOINCGUIApp.cpp, h
         BOINCTaskBar.cpp
         sg_BoincSimpleGUI.cpp
+        SkinManager.cpp, .h

clientgui/SkinManager.cpp

@@ -799,7 +799,9 @@ void CSkinAdvanced::Clear() {
     m_strProjectName = wxEmptyString;
     m_bDefaultTabSpecified = false;
     m_iDefaultTab = 0;
+#if 0   // No longer used
     m_strExitMessage = wxEmptyString;
+#endif
 }
 
 
@@ -843,9 +845,11 @@ int CSkinAdvanced::Parse(MIOFILE& in) {
         } else if (parse_int(buf, "<open_tab>", m_iDefaultTab)) {
             m_bDefaultTabSpecified = true;
             continue;
+#if 0   // No longer used
         } else if (parse_str(buf, "<exit_message>", strBuffer)) {
             m_strExitMessage = wxString(strBuffer.c_str(), wxConvUTF8);
             continue;
+#endif
         }
     }
 
@@ -900,10 +904,11 @@ int CSkinAdvanced::GetDefaultTab() {
 }
 
 
+#if 0   // No longer used
 wxString CSkinAdvanced::GetExitMessage() { 
     return m_strExitMessage;
 }
-
+#endif
 
 bool CSkinAdvanced::IsBranded() { 
     return m_bIsBranded;
@@ -949,6 +954,7 @@ bool CSkinAdvanced::InitializeDelayedValidation() {
         m_bDefaultTabSpecified = true;
         m_iDefaultTab = 0;
     }
+#if 0   // No longer used
     if (m_strExitMessage.IsEmpty()) {
         fprintf(stderr, wxT("Skin Manager: Exit message was not defined. Using default.\n"));
         m_strExitMessage = 
@@ -957,6 +963,7 @@ bool CSkinAdvanced::InitializeDelayedValidation() {
               "without stopping the tasks.");
         wxASSERT(!m_strExitMessage.IsEmpty());
     }
+#endif
     return true;
 }
 

clientgui/SkinManager.h

@@ -308,7 +308,9 @@ private:
     wxString    m_strProjectName;
     bool        m_bDefaultTabSpecified;
     int         m_iDefaultTab;
+#if 0   // No longer used
     wxString    m_strExitMessage;
+#endif
 };