<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
<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
\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
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
\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
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
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
}\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
\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
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
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
projects / handbrake / commitdiff