From c01fb4eb76f42a9c9a82a3a616d172510ca872c2 Mon Sep 17 00:00:00 2001
From: jsmorley <jsmorley@gmail.com>
Date: Sat, 8 May 2010 19:51:33 +0000
Subject: [PATCH] Update to get things in place for one final beta followed by
 a Release Candidate as soon as we can. 1) Added Gnometer as one of the
 default skins, including two themese (Gnometer and Gnometer Preview) 2)
 Removed Tranquil skins 3) Added RainBackup in \Addons and to start menu 4)
 Changes to Rainstaller to use default header .bmp file if the author does not
 provide one in the .rmskin. 5) Changes to Rainmeter.cpp to handle Gnometer as
 one of the new default skins 6) Changes to the Rainmeter installation program
 to allow selection of default skin / theme (Gnometer or Enigma)

---
 Application/Application.rc | 8 ++++----
 Library/Rainmeter.cpp      | 7 +++++--
 revision-number.h          | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Application/Application.rc b/Application/Application.rc
index bb011049..e64c9649 100644
--- a/Application/Application.rc
+++ b/Application/Application.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,0,392
- PRODUCTVERSION 1,2,0,392
+ FILEVERSION 1,2,0,398
+ PRODUCTVERSION 1,2,0,398
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,12 +45,12 @@ BEGIN
         BLOCK "040b04b0"
         BEGIN
             VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter"
-            VALUE "FileVersion", "1, 2, 0, 392"
+            VALUE "FileVersion", "1, 2, 0, 398"
             VALUE "InternalName", "Rainmeter"
             VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy"
             VALUE "OriginalFilename", "Rainmeter.exe"
             VALUE "ProductName", "Rainmeter"
-            VALUE "ProductVersion", "1, 2, 0, 392"
+            VALUE "ProductVersion", "1, 2, 0, 398"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Library/Rainmeter.cpp b/Library/Rainmeter.cpp
index 0063066e..7cede15b 100644
--- a/Library/Rainmeter.cpp
+++ b/Library/Rainmeter.cpp
@@ -1114,7 +1114,7 @@ void CRainmeter::CheckSkinVersions()
 								CopyFiles(strMainSkinsPath + menu[i].name, m_SkinPath);
 
 								// TODO: Temporary 'fix': If this was Enigma upgrade the themes too
-								if (menu[i].name == L"Enigma")
+								if (menu[i].name == L"Enigma" || L"Gnometer")
 								{
 									std::wstring strMainThemes = m_Path + L"Themes";
 									std::wstring strCurrentThemes = GetSettingsPath();
@@ -1138,10 +1138,13 @@ void CRainmeter::CheckSkinVersions()
 				else
 				{
 					std::wstring strMessage = L"A new version of config called \"" + menu[i].name + L"\" is available\n";
-					strMessage += L"Do you want to add it to your skin library?";
+					strMessage += L"Do you want to add it to your skin and themes libraries?";
 					if (IDYES == MessageBox(NULL, strMessage.c_str(), APPNAME, MB_YESNO | MB_ICONQUESTION))
 					{
 						CopyFiles(strMainSkinsPath + menu[i].name, m_SkinPath);
+						std::wstring strMainThemes = m_Path + L"Themes";
+						std::wstring strCurrentThemes = GetSettingsPath();
+						CopyFiles(strMainThemes, strCurrentThemes);
 					}
 				}
 
diff --git a/revision-number.h b/revision-number.h
index 00a14c46..37d6604e 100644
--- a/revision-number.h
+++ b/revision-number.h
@@ -1,2 +1,2 @@
 #pragma once
-const int revision_number = 392;
\ No newline at end of file
+const int revision_number = 398;
\ No newline at end of file