VSRip: minor change in program's dialog, replaced old icon

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2265 10f7b99b-c216-0410-bff0-8a66a9350fd8

3 files changed, 32 insertions, 29 deletions

diff --git a/src/apps/VSRip/VSRip.rc b/src/apps/VSRip/VSRip.rc
index 186509847..7cd708fe7 100644
--- a/src/apps/VSRip/VSRip.rc
+++ b/src/apps/VSRip/VSRip.rc
@@ -33,11 +33,10 @@ IDR_MAINFRAME           ICON                    "res\\VSRip.ico"
 // Dialog

 //

 

-IDD_VSRIP_DIALOG DIALOGEX 0, 0, 320, 201

+IDD_VSRIP_DIALOG DIALOGEX 0, 0, 320, 200

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_APPWINDOW

 CAPTION "VobSub Ripper Wizard"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

     PUSHBUTTON      "&Cancel",IDCANCEL,260,177,50,14

     PUSHBUTTON      "< &Back",IDC_BUTTON1,145,177,50,14

@@ -47,7 +46,7 @@ BEGIN
     CONTROL         "",IDC_FOOTERSEP,"Static",SS_ETCHEDHORZ,0,166,319,1

 END

 

-IDD_DIALOG_FILE DIALOGEX 0, 0, 307, 120

+IDD_DIALOG_FILE DIALOGEX 0, 0, 308, 120

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

@@ -58,7 +57,7 @@ BEGIN
     EDITTEXT        IDC_EDIT3,2,37,303,82,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL

 END

 

-IDD_DIALOG_PGC DIALOGEX 0, 0, 307, 120

+IDD_DIALOG_PGC DIALOGEX 0, 0, 308, 120

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

@@ -76,7 +75,7 @@ BEGIN
     CONTROL         "Forced subtitles only",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,248,83,59,18

 END

 

-IDD_DIALOG_INDEXING DIALOGEX 0, 0, 307, 120

+IDD_DIALOG_INDEXING DIALOGEX 0, 0, 308, 120

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

diff --git a/src/apps/VSRip/VSRip.vcproj b/src/apps/VSRip/VSRip.vcproj
index 176487792..d99c9aed1 100644
--- a/src/apps/VSRip/VSRip.vcproj
+++ b/src/apps/VSRip/VSRip.vcproj
@@ -99,14 +99,13 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Release|Win32"

+			Name="Debug|x64"

 			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"

 			UseOfMFC="1"

 			UseOfATL="0"

 			CharacterSet="1"

-			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -122,13 +121,15 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

+				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\atl;..\..\filters\BaseClasses;&quot;$(DXSDK_DIR)Include&quot;"

-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

-				RuntimeLibrary="0"

+				PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -136,7 +137,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_UNICODE;UNICODE;NDEBUG"

+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(IntDir)"

 			/>

@@ -145,12 +146,14 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="BaseClasses.lib DeCSS.lib delayimp.lib SubPic.lib Subtitles.lib Winmm.lib"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib SubPic.lib Subtitles.lib Winmm.lib"

+				LinkIncremental="2"

 				AdditionalLibraryDirectories="bin/lib/$(ConfigurationName)_$(PlatformName)"

-				DelayLoadDLLs="oleacc.dll"

+				DelayLoadDLLs=""

 				SubSystem="2"

-				LargeAddressAware="2"

-				TargetMachine="1"

+				RandomizedBaseAddress="1"

+				DataExecutionPrevention="0"

+				TargetMachine="17"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -176,13 +179,14 @@
 			/>

 		</Configuration>

 		<Configuration

-			Name="Debug|x64"

+			Name="Release|Win32"

 			OutputDirectory="$(SolutionDir)bin\$(ConfigurationName)_$(PlatformName)\"

 			ConfigurationType="1"

-			InheritedPropertySheets="..\..\common.vsprops;..\..\debug.vsprops"

+			InheritedPropertySheets="..\..\common.vsprops;..\..\release.vsprops"

 			UseOfMFC="1"

 			UseOfATL="0"

 			CharacterSet="1"

+			WholeProgramOptimization="1"

 			>

 			<Tool

 				Name="VCPreBuildEventTool"

@@ -198,15 +202,13 @@
 			/>

 			<Tool

 				Name="VCMIDLTool"

-				TargetEnvironment="3"

 			/>

 			<Tool

 				Name="VCCLCompilerTool"

 				AdditionalOptions="/MP"

 				AdditionalIncludeDirectories="..\..\..\include;..\..\..\include\atl;..\..\filters\BaseClasses;&quot;$(DXSDK_DIR)Include&quot;"

-				PreprocessorDefinitions="_WIN64;_DEBUG;_WINDOWS"

-				BasicRuntimeChecks="3"

-				RuntimeLibrary="1"

+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"

+				RuntimeLibrary="0"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -214,7 +216,7 @@
 			/>

 			<Tool

 				Name="VCResourceCompilerTool"

-				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"

+				PreprocessorDefinitions="_UNICODE;UNICODE;NDEBUG"

 				Culture="1033"

 				AdditionalIncludeDirectories="$(IntDir)"

 			/>

@@ -223,14 +225,12 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="BaseClasses.lib DeCSS.lib SubPic.lib Subtitles.lib Winmm.lib"

-				LinkIncremental="2"

+				AdditionalDependencies="BaseClasses.lib DeCSS.lib delayimp.lib SubPic.lib Subtitles.lib Winmm.lib"

 				AdditionalLibraryDirectories="bin/lib/$(ConfigurationName)_$(PlatformName)"

-				DelayLoadDLLs=""

+				DelayLoadDLLs="oleacc.dll"

 				SubSystem="2"

-				RandomizedBaseAddress="1"

-				DataExecutionPrevention="0"

-				TargetMachine="17"

+				LargeAddressAware="2"

+				TargetMachine="1"

 			/>

 			<Tool

 				Name="VCALinkTool"

@@ -416,6 +416,10 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

 			>

 			<File

+				RelativePath=".\res\VSRip.ico"

+				>

+			</File>

+			<File

 				RelativePath=".\VSRip.rc"

 				>

 			</File>

diff --git a/src/apps/VSRip/res/VSRip.ico b/src/apps/VSRip/res/VSRip.ico
index 8a84ca3d3..d56fbcdfd 100644
--- a/src/apps/VSRip/res/VSRip.ico
+++ b/src/apps/VSRip/res/VSRip.ico