more space for translations in ui

fixed output paths

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@467 4f64403b-2f21-0410-a795-97e2b3489a10

3 files changed, 52 insertions, 41 deletions

diff --git a/updater/updater.rc b/updater/updater.rc
index e717217..54a77c7 100644
--- a/updater/updater.rc
+++ b/updater/updater.rc
@@ -99,8 +99,8 @@ BEGIN
     PUSHBUTTON      "Update and Exit",IDC_BTN_CHECKNORESTART,58,211,91,17

     CONTROL         "Show 'Update and Exit' menu item",IDC_CHK_UPDATEANDEXIT,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,136,127,10

-    CONTROL         "Slider1",IDC_SLID_VERREQ,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,14,83,100,12

-    LTEXT           "Static",IDC_ST_VERREQ,130,85,146,8

+    CONTROL         "Slider1",IDC_SLID_VERREQ,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,8,83,100,12

+    LTEXT           "Static",IDC_ST_VERREQ,111,85,180,8

     CONTROL         "Keep downloaded archives",IDC_CHK_SAVEZIPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,149,127,10

     CONTROL         "Only install DLLs automatically",IDC_CHK_DLLSONLY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,149,128,10

diff --git a/updater/updater_9.vcproj b/updater/updater_9.vcproj
index f4f5c6d..a74344a 100644
--- a/updater/updater_9.vcproj
+++ b/updater/updater_9.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>

 <VisualStudioProject

 	ProjectType="Visual C++"

-	Version="9,00"

+	Version="9.00"

 	Name="updater"

 	ProjectGUID="{4C1CE389-7129-45FC-83C2-E9C310AC0427}"

 	RootNamespace="updater"

@@ -20,9 +20,10 @@
 	<Configurations>

 		<Configuration

 			Name="Debug Unicode|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory=".\updater___Win32_Debug_Unicode"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

@@ -53,9 +54,12 @@
 				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UPDATER_EXPORTS;UNICODE"

 				BasicRuntimeChecks="3"

-				RuntimeLibrary="3"

+				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="common.h"

+				AssemblerListingLocation=".\updater___Win32_Debug_Unicode/"

+				ObjectFile=".\updater___Win32_Debug_Unicode/"

+				ProgramDataBaseFileName=".\updater___Win32_Debug_Unicode/"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -76,11 +80,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\updater___Win32_Debug_Unicode/updater.pdb"

 				GenerateMapFile="true"

 				MapExports="true"

 				RandomizedBaseAddress="1"

@@ -112,8 +116,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug Unicode|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

@@ -143,7 +147,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="zlib123;../../../include"

+				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;UPDATER_EXPORTS;UNICODE"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -173,7 +177,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				OutputFile="../../bin/Debug Unicode/plugins/updater.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

@@ -209,9 +212,10 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory=".\Debug"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -245,6 +249,9 @@
 				RuntimeLibrary="1"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="common.h"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -265,11 +272,11 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				IgnoreImportLibrary="true"

-				AdditionalOptions="/MACHINE:I386"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Debug/updater.pdb"

 				GenerateMapFile="true"

 				MapExports="true"

 				SubSystem="0"

@@ -302,8 +309,8 @@
 		</Configuration>

 		<Configuration

 			Name="Debug|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

@@ -363,7 +370,6 @@
 			<Tool

 				Name="VCLinkerTool"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				OutputFile="../../bin/debug/plugins/updater.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateDebugInformation="true"

@@ -400,13 +406,13 @@
 		</Configuration>

 		<Configuration

 			Name="Release Unicode|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory=".\updater___Win32_Release_Unicode"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="1"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -432,21 +438,24 @@
 				Name="VCCLCompilerTool"

 				Optimization="1"

 				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UPDATER_EXPORTS;UNICODE"

 				StringPooling="true"

-				RuntimeLibrary="2"

+				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

 				FloatingPointModel="2"

 				RuntimeTypeInfo="false"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="common.h"

+				AssemblerListingLocation=".\updater___Win32_Release_Unicode/"

+				ObjectFile=".\updater___Win32_Release_Unicode/"

+				ProgramDataBaseFileName=".\updater___Win32_Release_Unicode/"

+				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				DebugInformationFormat="3"

 				CompileAs="0"

 				DisableSpecificWarnings="4996"

 			/>

@@ -465,10 +474,13 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				LinkIncremental="1"

+				SuppressStartupBanner="true"

+				GenerateManifest="false"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\updater___Win32_Release_Unicode/updater.pdb"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				LinkTimeCodeGeneration="1"

 				BaseAddress="0x22000000"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

@@ -499,8 +511,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release Unicode|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

@@ -536,7 +548,6 @@
 				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;UPDATER_EXPORTS;UNICODE"

 				StringPooling="true"

-				ExceptionHandling="0"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

@@ -568,7 +579,6 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				OutputFile="../../bin/Release Unicode/plugins/updater.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

@@ -606,9 +616,10 @@
 		</Configuration>

 		<Configuration

 			Name="Release|Win32"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"

+			IntermediateDirectory=".\Release"

 			ConfigurationType="2"

+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

 			ATLMinimizesCRunTimeLibraryUsage="false"

 			CharacterSet="2"

@@ -637,12 +648,11 @@
 				Name="VCCLCompilerTool"

 				Optimization="1"

 				InlineFunctionExpansion="1"

+				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="2"

-				WholeProgramOptimization="true"

 				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATER_EXPORTS"

 				StringPooling="true"

-				ExceptionHandling="0"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

@@ -650,6 +660,9 @@
 				RuntimeTypeInfo="false"

 				UsePrecompiledHeader="2"

 				PrecompiledHeaderThrough="common.h"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

 				BrowseInformation="1"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

@@ -672,13 +685,13 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

+				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

 				GenerateDebugInformation="true"

+				ProgramDatabaseFile=".\Release/updater.pdb"

 				OptimizeReferences="2"

 				EnableCOMDATFolding="2"

-				OptimizeForWindows98="0"

-				LinkTimeCodeGeneration="1"

 				BaseAddress="0x22000000"

 				RandomizedBaseAddress="1"

 				DataExecutionPrevention="0"

@@ -709,8 +722,8 @@
 		</Configuration>

 		<Configuration

 			Name="Release|x64"

-			OutputDirectory="$(SolutionDir)$(ConfigurationName)64/Plugins"

-			IntermediateDirectory="$(SolutionDir)$(ConfigurationName)64/Obj/$(ProjectName)"

+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"

+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"

 			ConfigurationType="2"

 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"

 			UseOfMFC="0"

@@ -746,7 +759,6 @@
 				AdditionalIncludeDirectories="zlib123;../../include"

 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;UPDATER_EXPORTS"

 				StringPooling="true"

-				ExceptionHandling="0"

 				RuntimeLibrary="0"

 				BufferSecurityCheck="false"

 				EnableFunctionLevelLinking="true"

@@ -779,7 +791,6 @@
 				Name="VCLinkerTool"

 				IgnoreImportLibrary="true"

 				AdditionalDependencies="comctl32.lib ws2_32.lib"

-				OutputFile="../../bin/release/plugins/updater.dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

 				GenerateManifest="false"

diff --git a/updater/version.h b/updater/version.h
index 68db7e3..76baed8 100644
--- a/updater/version.h
+++ b/updater/version.h
@@ -5,7 +5,7 @@
 #define __MAJOR_VERSION				0

 #define __MINOR_VERSION				5

 #define __RELEASE_NUM				5

-#define __BUILD_NUM					0

+#define __BUILD_NUM					1

 

 #define __FILEVERSION_STRING        __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 #define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM