From 212c6ee144f3c76b08a09d7020064ef03985d324 Mon Sep 17 00:00:00 2001 From: nikkho Date: Sun, 14 Aug 2016 06:27:19 +0000 Subject: [PATCH] Embarcadero themes have conflicts with Windows 10 Anniversay update, so we get back to default Windows one in 10 or later (RejZoR, TPS) git-svn-id: svn://svn.code.sf.net/p/nikkhokkho/code/trunk@540 ddd8a7e7-04a1-4c0d-ae79-48073a28b335 --- FileOptimizer/Changelog.txt | 2 +- FileOptimizer/FileOptimizer.cbproj | 4 ++-- FileOptimizer/FileOptimizer.stat | 10 +++++----- FileOptimizer/Source/clsUtil.cpp | 1 + FileOptimizer/Source/cppMain.cpp | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/FileOptimizer/Changelog.txt b/FileOptimizer/Changelog.txt index 4bcfbaa..db0ab3b 100644 --- a/FileOptimizer/Changelog.txt +++ b/FileOptimizer/Changelog.txt @@ -165,7 +165,7 @@ X.XX - YYYY/MM/DD - Enhanced update checker. - Implemented a Statistics section that can be checked inside the Information window. - Improved single instance detection, because it did not work properly on Vista and later (Special). -- Switched back to Windows theme if Windows 10 theme has been selected, because it causes issues with TaskDialogs in Windows 10 Anniversary (RejZoR). +- Embarcadero themes have conflicts with Windows 10 Anniversay update, so we get back to default Windows one in 10 or later (RejZoR, TPS). - Made abort optimization message more clearer (Louis Horvath). - Fixed main window position not properly restored on launch (hairycactus). - Simplified ECT multithreading, because it already knows the number of threads to use. diff --git a/FileOptimizer/FileOptimizer.cbproj b/FileOptimizer/FileOptimizer.cbproj index 5aea5cd..450b1e4 100644 --- a/FileOptimizer/FileOptimizer.cbproj +++ b/FileOptimizer/FileOptimizer.cbproj @@ -6,8 +6,8 @@ Application FileOptimizer.cpp True - Release - Win64 + Debug + Win32 3 diff --git a/FileOptimizer/FileOptimizer.stat b/FileOptimizer/FileOptimizer.stat index 5301d6a..2faa512 100644 --- a/FileOptimizer/FileOptimizer.stat +++ b/FileOptimizer/FileOptimizer.stat @@ -1,10 +1,10 @@ [Stats] -EditorSecs=24402 -DesignerSecs=1384 +EditorSecs=24666 +DesignerSecs=1411 InspectorSecs=1402 -CompileSecs=8056197 -OtherSecs=7681 +CompileSecs=8104593 +OtherSecs=7672 StartTime=07/04/2015 13:17:38 RealKeys=0 EffectiveKeys=0 -DebugSecs=12810 +DebugSecs=13166 diff --git a/FileOptimizer/Source/clsUtil.cpp b/FileOptimizer/Source/clsUtil.cpp index a08a4f6..e1d7b1c 100644 --- a/FileOptimizer/Source/clsUtil.cpp +++ b/FileOptimizer/Source/clsUtil.cpp @@ -1018,6 +1018,7 @@ unsigned int __fastcall clsUtil::GetWindowsVersion(void) iWindowsVersion = (LOBYTE(LOWORD(iWindowsVersion))) * 100 + (HIBYTE(LOWORD(iWindowsVersion))); } } + //500: Windows 2000; 501: Windows XP; 502: Windows XP x64/Windows 2003; 600: Windows Vista/2008; 601: Windows 7/Windows 2008 R2; 602: Windows 8/Windows 2012; 603: Windows 8.1; 1000: Windows 10 return(iWindowsVersion); } diff --git a/FileOptimizer/Source/cppMain.cpp b/FileOptimizer/Source/cppMain.cpp index 7971bd8..f163b0b 100644 --- a/FileOptimizer/Source/cppMain.cpp +++ b/FileOptimizer/Source/cppMain.cpp @@ -87,8 +87,8 @@ void __fastcall TfrmMain::FormCreate(TObject *Sender) _tcscpy(gudtOptions.acTheme, GetOption(_T("Options"), _T("Theme"), _T("Windows"))); } - //Switch back to Windows theme if Windows 10 theme has been selected, because it causes issues with TaskDialogs in Windows 10 Anniversary - if (_tcscmp(gudtOptions.acTheme, _T("Windows10")) == 0) + //Embarcadero themes have conflicts with Windows 10 Anniversay update, so we get back to default Windows one. + if (clsUtil::GetWindowsVersion() >= 1000) { _tcscpy(gudtOptions.acTheme, _T("Windows")); }