Updated changelog + more installer updates.

2011-08-27 16:24:03 +02:00 · 2011-08-27 16:24:03 +02:00 · 24a8dcafa5
commit 24a8dcafa5
parent 1dc6a81916
3 changed files with 28 additions and 18 deletions
--- a/doc/Changelog.html
+++ b/doc/Changelog.html
@ -17,10 +17,10 @@ a:visited { color: #0000EE; }
 <h3>LameXP - Version History</h3><br>

 <a name="4.02"></a>Changes between v4.02 and v4.03:<br><ul>
-<li>Added an option to rename the output files (based on an user-defined pattern)
+<li>Added an option to rename the output files (based on an user-defined naming pattern)
 <li>Added an option to enforce Stereo Downmix for Multi-Channel sources
 <li>Added "built-in" WMA decoder (see <a href="http://forum.doom9.org/showthread.php?t=140273">this</a> thread for details) and removed all remnants of "old" decoder
-<li>Added optional support for the FHG AAC Encoder (see the <a href="FAQ.html#71a113b0" target="_blank">FAQ doc</a> for install instructions!)
+<li>Added optional support for the FHG AAC Encoder included with Winamp 5.62 (see <a href="FAQ.html#71a113b0" target="_blank">FAQ doc</a> for details)
 <li>Added a menu for bookmarking "favorite" output folders to the "output folder" tab
 <li>Updated Qt runtime libraries to v4.8.0 Beta-1 (2011-07-19), compiled with MSVC 10.0
 <li>Updated MediaInfo to v0.7.48 (2011-08-17), compiled with MSVC 10.0
@ -29,7 +29,9 @@ a:visited { color: #0000EE; }
 <li>Fixed Cue Sheet import for tracks with certain characters in the title
 <li>Workaround for malicious "anti-virus" programs that prevent innocent applications from functioning
 <li>Enabled "Aero Glass" theme in installer and web-update program (Vista and Windows 7 only)
-<li>Restored Windows 2000 support with Visual Studio 2010 (this is experimental!)
+<li>Restored Windows 2000 support with Visual Studio 2010 builds (this is experimental!)
+<li>The "Open File(s)" and "Open Folder" dialogs will now remember the most recent directory
+<li>Miscellaneous bugfixes
 </ul><br>

 <a name="4.02"></a>Changes between v4.01 and v4.02:<br><ul>
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@ -180,6 +180,7 @@ VIAddVersionKey "Website" "${MyWebSite}"
 ;--------------------------------

 ;Installer
+!define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckForPreRelease
 !define MUI_WELCOMEPAGE_TITLE_3LINES
 !define MUI_FINISHPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
@ -286,25 +287,25 @@ Function .onInit
 	${OrIf} ${UAC_IsAdmin}
 		${If} ${IsWin2000}
 		${AndIf} ${AtMostServicePack} 3
-			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 4 for Windows 2000!"
+			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 4 for Windows 2000 is highly recommended!"
 			MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 4 for Windows 2000 now?" IDNO +2
 			ExecShell "open" "http://www.microsoft.com/download/en/details.aspx?id=4127"
 		${EndIf}
 		${If} ${IsWinXP}
 		${AndIf} ${AtMostServicePack} 2
-			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 3 for Windows XP!"
+			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 3 for Windows XP is highly recommended!"
 			MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 3 for Windows XP now?" IDNO +2
 			ExecShell "open" "http://technet.microsoft.com/en-us/windows/bb794714"
 		${EndIf}
 		${If} ${IsWinVista}
 		${AndIf} ${AtMostServicePack} 1
-			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 2 for Windows Vista!"
+			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 2 for Windows Vista is highly recommended!"
 			MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 2 for Windows Vista now?" IDNO +2
 			ExecShell "open" "http://technet.microsoft.com/en-us/windows/dd262148"
 		${EndIf}
 		${If} ${IsWin7}
 		${AndIf} ${AtMostServicePack} 0
-			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "This application requires the Service Pack 1 for Windows 7!"
+			MessageBox MB_TOPMOST|MB_ICONEXCLAMATION "Setup has detected that your system is missing important updates:$\nThe Service Pack 1 for Windows 7 is highly recommended!"
 			MessageBox MB_TOPMOST|MB_ICONQUESTION|MB_YESNO "Do you want to download Service Pack 1 for Windows 7 now?" IDNO +2
 			ExecShell "open" "http://technet.microsoft.com/en-us/windows/gg635126"
 		${EndIf}
@ -355,14 +356,6 @@ Function MyUacInit
 		Quit
 	${EndSwitch}
 	
-	!ifdef LAMEXP_IS_PRERELEASE
-		!insertmacro GetCommandlineParameter "Update" "?" $R0
-		StrCmp $R0 "?" 0 SkipPrereleaseWarning
-		MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2
-		Abort
-		SkipPrereleaseWarning:
-	!endif
-	
 	Aero::Apply
 FunctionEnd

@ -628,6 +621,21 @@ Function CheckForUpdate
 FunctionEnd


+;--------------------------------
+;Check For Pre-Release
+;--------------------------------
+
+Function CheckForPreRelease
+	!ifdef LAMEXP_IS_PRERELEASE
+		!insertmacro GetCommandlineParameter "Update" "?" $R0
+		StrCmp $R0 "?" 0 SkipPrereleaseWarning
+		MessageBox MB_TOPMOST|MB_ICONEXCLAMATION|MB_OKCANCEL "$(LAMEXP_LANG_PRERELEASE_WARNING)" /SD IDOK IDOK +2
+		Quit
+		SkipPrereleaseWarning:
+	!endif
+FunctionEnd
+
+
 ;--------------------------------
 ;Locked List
 ;--------------------------------
--- a/src/Config.h
+++ b/src/Config.h
@ -28,9 +28,9 @@
 #define VER_LAMEXP_MAJOR					4
 #define VER_LAMEXP_MINOR_HI					0
 #define VER_LAMEXP_MINOR_LO					3
-#define VER_LAMEXP_TYPE						Alpha
-#define VER_LAMEXP_PATCH					15
-#define VER_LAMEXP_BUILD					674
+#define VER_LAMEXP_TYPE						Beta
+#define VER_LAMEXP_PATCH					1
+#define VER_LAMEXP_BUILD					676

 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions