WinGui:

- Fix for a scaling issue in the picture preview QT control
- Add a warning if users try to preview a MKV with QT.
- Misc updates to other files.

git-svn-id: svn://localhost/HandBrake/trunk@2653 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 3e90b71..824d970 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -18,7 +18,7 @@
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
     <OldToolsVersion>2.0</OldToolsVersion>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v3.0</TargetFrameworkVersion>\r
     <IsWebBootstrapper>false</IsWebBootstrapper>\r
     <SignManifests>false</SignManifests>\r
     <PublishUrl>publish\</PublishUrl>\r
@@ -94,7 +94,6 @@
     <Reference Include="PresentationCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=x86" />\r
     <Reference Include="PresentationFramework, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />\r
     <Reference Include="System" />\r
-    <Reference Include="System.Core" />\r
     <Reference Include="System.Data" />\r
     <Reference Include="System.Deployment" />\r
     <Reference Include="System.Design" />\r

diff --git a/win/C#/Installer/Installer.nsi b/win/C#/Installer/Installer.nsi
index f666e27..38d33fb 100644 (file)
--- a/win/C#/Installer/Installer.nsi
+++ b/win/C#/Installer/Installer.nsi
@@ -8,7 +8,7 @@
 \r
 ; HM NIS Edit Wizard helper defines\r
 !define PRODUCT_NAME "Handbrake"\r
-!define PRODUCT_VERSION "0.9.4"\r
+!define PRODUCT_VERSION "SVN 2592 Snapshot"\r
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Handbrake.exe"\r
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
@@ -55,7 +55,7 @@ Function .onInit
   Call GetDotNETVersion\r
   Pop $0\r
   ${If} $0 == "not found"\r
-    MessageBox MB_OK|MB_ICONSTOP ".NET runtime library is not installed. $\r$\n You can download .Net Framework 3.5 from the microsoft website. $\r$\n Alternatively you can use google for a direct download URL"\r
+    MessageBox MB_OK|MB_ICONSTOP ".NET runtime library is not installed. $\r$\n You can download .Net Framework 2.0 redistributable from the microsoft website. $\r$\n Alternatively you can use google for a direct download URL"\r
     Abort\r
   ${EndIf}\r
 \r
@@ -63,7 +63,7 @@ Function .onInit
 \r
   ${VersionCompare} $0 "2.0" $1\r
   ${If} $1 == 2\r
-    MessageBox MB_OK|MB_ICONSTOP ".NET runtime library v3.5 or newer is required. You have $0. $\r$\n You can download .Net Framework 3.5 from the Microsoft website. $\r$\n Alternatively you can use google for a direct download URL"\r
+    MessageBox MB_OK|MB_ICONSTOP ".NET runtime library v2.0 or newer is required. You have $0. $\r$\n You can download .Net Framework 2.0 redistributable from the Microsoft website. $\r$\n Alternatively you can use google for a direct download URL"\r
     Abort\r
   ${EndIf}\r
 FunctionEnd\r
@@ -103,7 +103,6 @@ Section "Handbrake" SEC01
   SetOutPath "$INSTDIR\doc"\r
   SetOverwrite ifnewer\r
   File "doc\AUTHORS"\r
-  File "doc\BUILD"\r
   File "doc\COPYING"\r
   File "doc\CREDITS"\r
   File "doc\NEWS"\r
@@ -146,7 +145,6 @@ Section Uninstall
   Delete "$INSTDIR\Handbrake.exe"\r
   Delete "$INSTDIR\Handbrake.exe.config"\r
   Delete "$INSTDIR\doc\AUTHORS"\r
-  Delete "$INSTDIR\doc\BUILD"\r
   Delete "$INSTDIR\doc\COPYING"\r
   Delete "$INSTDIR\doc\CREDITS"\r
   Delete "$INSTDIR\doc\NEWS"\r

diff --git a/win/C#/frmPreview.cs b/win/C#/frmPreview.cs
index f2356ae..c1f2e73 100644 (file)
--- a/win/C#/frmPreview.cs
+++ b/win/C#/frmPreview.cs
@@ -62,23 +62,33 @@ namespace Handbrake
         }\r
         private void btn_playQT_Click(object sender, EventArgs e)\r
         {\r
-            lbl_status.Visible = true;\r
-            try\r
+            if (mainWindow.text_destination.Text.Contains(".mkv"))\r
             {\r
-                QTControl.URL = "";\r
-                if (File.Exists(currently_playing))\r
-                    File.Delete(currently_playing);\r
+                MessageBox.Show(this,\r
+                                "The QuickTime Control does not support MKV files, It is recommended you use VLC option instead.",\r
+                                "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
             }\r
-            catch (Exception)\r
+            else\r
             {\r
-                MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
-            }\r
+                lbl_status.Visible = true;\r
+                try\r
+                {\r
+                    QTControl.URL = "";\r
+                    if (File.Exists(currently_playing))\r
+                        File.Delete(currently_playing);\r
+                }\r
+                catch (Exception)\r
+                {\r
+                    MessageBox.Show(this, "Unable to delete previous preview file. You may need to restart the application.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                }\r
 \r
-            btn_playQT.Enabled = false;\r
-            btn_playVLC.Enabled = false;\r
-            lbl_status.Text = "Encoding Sample for (QT) ...";\r
-            String query = hb_common_func.generatePreviewQuery(mainWindow, cb_duration.Text, cb_preview.Text);\r
-            ThreadPool.QueueUserWorkItem(procMonitor, query);\r
+                btn_playQT.Enabled = false;\r
+                btn_playVLC.Enabled = false;\r
+                lbl_status.Text = "Encoding Sample for (QT) ...";\r
+                String query = hb_common_func.generatePreviewQuery(mainWindow, cb_duration.Text, cb_preview.Text);\r
+\r
+                ThreadPool.QueueUserWorkItem(procMonitor, query);\r
+            }\r
         }\r
         private void procMonitor(object state)\r
         {\r
@@ -116,7 +126,7 @@ namespace Handbrake
 \r
                 // Get the sample filename\r
                 if (mainWindow.text_destination.Text != "")\r
-                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv");;\r
+                    currently_playing = mainWindow.text_destination.Text.Replace(".mp4", "_sample.mp4").Replace(".m4v", "_sample.m4v").Replace(".mkv", "_sample.mkv"); ;\r
 \r
                 // Play back in QT or VLC\r
                 if (playerSelection == "QT")\r
@@ -163,7 +173,7 @@ namespace Handbrake
                         lbl_status.Text = "VLC will now launch.";\r
                     }\r
                     else\r
-                        MessageBox.Show(this, "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in the program options is correct.", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
+                        MessageBox.Show(this, "Unable to detect VLC Player. \nPlease make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: \"Tools Menu > Options > Picture Tab\") ", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                 }\r
                 else\r
                     MessageBox.Show(this, "Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.", "VLC", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
@@ -184,9 +194,9 @@ namespace Handbrake
                     BeginInvoke(new UpdateUIHandler(OpenMovie));\r
                     return;\r
                 }\r
-                QTControl.Sizing = QTSizingModeEnum.qtControlFitsMovie;\r
                 QTControl.URL = currently_playing;\r
-                QTControl.Sizing = QTSizingModeEnum.qtMovieFitsControl;\r
+                QTControl.SetSizing(QTSizingModeEnum.qtControlFitsMovie, true);\r
+                QTControl.URL = currently_playing;\r
                 QTControl.Show();\r
 \r
                 this.ClientSize = QTControl.Size;\r

diff --git a/win/C#/frmPreview.resx b/win/C#/frmPreview.resx
index ef2d4bc..f75a67c 100644 (file)
--- a/win/C#/frmPreview.resx
+++ b/win/C#/frmPreview.resx
@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w\r
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACFTeXN0\r
         ZW0uV2luZG93cy5Gb3Jtcy5BeEhvc3QrU3RhdGUBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAVQAAAAIB\r
-        AAAAAQAAAAAAAAAAAAAAAEAAAAAACAAAnQYAAJ0GAAATAA8AAIATAAAAAAADAAAAAAALAP//AwAAAAAA\r
+        AAAAAQAAAAAAAAAAAAAAAEAAAAAACAAAnQYAAHEHAAATAA8AAIATAAAAAAADAAAAAAALAP//AwAAAAAA\r
         CAACAAAAAAAIAAIAAAAAAAgAAgAAAAAACw==\r
 </value>\r
   </data>\r