WinGui:

- Changed shell() to System.Diagnostics.Process.Start()
Appears to work a bit better than shell()

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@645 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/Handbrake.suo b/win/Handbrake.suo
index 33d942236879f003df57f05bed6b518b468971a7..eef2f1fada91d5374a84335c78ec026252ecc218 100644 (file)
Binary files a/win/Handbrake.suo and b/win/Handbrake.suo differ

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 7ef6d2f5f6ca3055639fd6bc218aa7e850a22eba..2fb8178cdbb6864c629fc14f8816ea34d10727c0 100644 (file)
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -19,6 +19,7 @@ Partial Class frmMain
     'Do not modify it using the code editor.\r
     <System.Diagnostics.DebuggerStepThrough()> _\r
     Private Sub InitializeComponent()\r
+        Me.components = New System.ComponentModel.Container\r
         Dim Label38 As System.Windows.Forms.Label\r
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))\r
         Me.frmMainMenu = New System.Windows.Forms.MenuStrip\r
@@ -30,6 +31,7 @@ Partial Class frmMain
         Me.toolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator\r
         Me.mnu_exit = New System.Windows.Forms.ToolStripMenuItem\r
         Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem\r
+        Me.mnu_encode = New System.Windows.Forms.ToolStripMenuItem\r
         Me.mnu_viewDVDdata = New System.Windows.Forms.ToolStripMenuItem\r
         Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator\r
         Me.mnu_options = New System.Windows.Forms.ToolStripMenuItem\r
@@ -229,7 +231,7 @@ Partial Class frmMain
         Me.DVD_Save = New System.Windows.Forms.SaveFileDialog\r
         Me.File_Save = New System.Windows.Forms.SaveFileDialog\r
         Me.lbl_update = New System.Windows.Forms.Label\r
-        Me.mnu_encode = New System.Windows.Forms.ToolStripMenuItem\r
+        Me.ToolTip = New System.Windows.Forms.ToolTip(Me.components)\r
         Label38 = New System.Windows.Forms.Label\r
         Me.frmMainMenu.SuspendLayout()\r
         Me.GroupBox4.SuspendLayout()\r
@@ -318,6 +320,12 @@ Partial Class frmMain
         Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(44, 20)\r
         Me.ToolsToolStripMenuItem.Text = "&Tools"\r
         '\r
+        'mnu_encode\r
+        '\r
+        Me.mnu_encode.Name = "mnu_encode"\r
+        Me.mnu_encode.Size = New System.Drawing.Size(155, 22)\r
+        Me.mnu_encode.Text = "Encode Queue"\r
+        '\r
         'mnu_viewDVDdata\r
         '\r
         Me.mnu_viewDVDdata.Name = "mnu_viewDVDdata"\r
@@ -587,6 +595,7 @@ Partial Class frmMain
         Me.text_destination.Name = "text_destination"\r
         Me.text_destination.Size = New System.Drawing.Size(262, 21)\r
         Me.text_destination.TabIndex = 4\r
+        Me.ToolTip.SetToolTip(Me.text_destination, "Where you wish to save your output file.")\r
         '\r
         'drp_audioCodec\r
         '\r
@@ -654,6 +663,7 @@ Partial Class frmMain
         Me.drop_chapterFinish.Size = New System.Drawing.Size(69, 21)\r
         Me.drop_chapterFinish.TabIndex = 41\r
         Me.drop_chapterFinish.Text = "Auto"\r
+        Me.ToolTip.SetToolTip(Me.drop_chapterFinish, "Encode chapters to this number")\r
         '\r
         'drop_chapterStart\r
         '\r
@@ -665,6 +675,7 @@ Partial Class frmMain
         Me.drop_chapterStart.Size = New System.Drawing.Size(69, 21)\r
         Me.drop_chapterStart.TabIndex = 40\r
         Me.drop_chapterStart.Text = "Auto"\r
+        Me.ToolTip.SetToolTip(Me.drop_chapterStart, "Encode chatpers from this number.")\r
         '\r
         'drp_dvdtitle\r
         '\r
@@ -677,6 +688,7 @@ Partial Class frmMain
         Me.drp_dvdtitle.Size = New System.Drawing.Size(119, 21)\r
         Me.drp_dvdtitle.TabIndex = 39\r
         Me.drp_dvdtitle.Text = "Automatic"\r
+        Me.ToolTip.SetToolTip(Me.drp_dvdtitle, "The title number you wish to encode.")\r
         '\r
         'RadioDVD\r
         '\r
@@ -735,6 +747,7 @@ Partial Class frmMain
         Me.text_source.Size = New System.Drawing.Size(253, 21)\r
         Me.text_source.TabIndex = 1\r
         Me.text_source.Text = "Click ""Browse"" to continue"\r
+        Me.ToolTip.SetToolTip(Me.text_source, "The input source location.")\r
         '\r
         'Label9\r
         '\r
@@ -775,7 +788,7 @@ Partial Class frmMain
         Me.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_encode.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_encode.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_encode.Location = New System.Drawing.Point(534, 590)\r
+        Me.btn_encode.Location = New System.Drawing.Point(538, 590)\r
         Me.btn_encode.Name = "btn_encode"\r
         Me.btn_encode.Size = New System.Drawing.Size(124, 22)\r
         Me.btn_encode.TabIndex = 19\r
@@ -790,7 +803,7 @@ Partial Class frmMain
         Me.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_queue.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_queue.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_queue.Location = New System.Drawing.Point(403, 590)\r
+        Me.btn_queue.Location = New System.Drawing.Point(407, 590)\r
         Me.btn_queue.Name = "btn_queue"\r
         Me.btn_queue.Size = New System.Drawing.Size(124, 22)\r
         Me.btn_queue.TabIndex = 412\r
@@ -1394,6 +1407,7 @@ Partial Class frmMain
         Me.drp_subtitle.Size = New System.Drawing.Size(213, 21)\r
         Me.drp_subtitle.TabIndex = 42\r
         Me.drp_subtitle.Text = "None"\r
+        Me.ToolTip.SetToolTip(Me.drp_subtitle, "Select the subtitle language you require from this dropdown.")\r
         '\r
         'Label19\r
         '\r
@@ -2342,12 +2356,6 @@ Partial Class frmMain
         Me.lbl_update.Text = "- A New Version is available!"\r
         Me.lbl_update.Visible = False\r
         '\r
-        'mnu_encode\r
-        '\r
-        Me.mnu_encode.Name = "mnu_encode"\r
-        Me.mnu_encode.Size = New System.Drawing.Size(155, 22)\r
-        Me.mnu_encode.Text = "Encode Queue"\r
-        '\r
         'frmMain\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
@@ -2600,5 +2608,6 @@ Partial Class frmMain
     Friend WithEvents Label37 As System.Windows.Forms.Label\r
     Friend WithEvents Label41 As System.Windows.Forms.Label\r
     Friend WithEvents mnu_encode As System.Windows.Forms.ToolStripMenuItem\r
+    Friend WithEvents ToolTip As System.Windows.Forms.ToolTip\r
 \r
 End Class\r

diff --git a/win/Handbrake/frmMain.resx b/win/Handbrake/frmMain.resx
index 59399005e39ed2a4c62b63aaae90935c82e0c277..725344506bdec9b194fb8ba5c92219299021e387 100644 (file)
--- a/win/Handbrake/frmMain.resx
+++ b/win/Handbrake/frmMain.resx
@@ -157,6 +157,15 @@
         Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII=\r
 </value>\r
   </data>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>639, 17</value>\r
+  </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>639, 17</value>\r
+  </metadata>\r
+  <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>639, 17</value>\r
+  </metadata>\r
   <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>136, 17</value>\r
   </metadata>\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 5b4ec26f2fd3806af2fc900d1dbb008bd0068c87..534c7fce64d44f8645ab298e3bb38f001af5c9db 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -503,30 +503,37 @@ Public Class frmMain
                                 , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
         End If\r
 \r
-            Try\r
-                If (QueryEditorText.Text = "") Then\r
-                    query = GenerateTheQuery()\r
-                    Shell("""" + ApplicationPath + "\hbcli.exe""" + query)\r
+        Try\r
+            If (QueryEditorText.Text = "") Then\r
+                query = GenerateTheQuery()\r
+\r
+                Dim params As String = query\r
+                Dim proc As New System.Diagnostics.Process\r
+                proc = System.Diagnostics.Process.Start("""" + ApplicationPath + "\hbcli.exe""", params)\r
+\r
                 MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
 \r
-                    'Lets start the process monitor to keep an eye on things.\r
-                    hbcliMonitor = New ProcessMonitor()\r
-                    Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)\r
-                    t.Start()\r
-                Else\r
-                    query = QueryEditorText.Text\r
-                    Shell("""" + ApplicationPath + "\hbcli.exe""" + query)\r
+                'Lets start the process monitor to keep an eye on things.\r
+                hbcliMonitor = New ProcessMonitor()\r
+                Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)\r
+                t.Start()\r
+            Else\r
+                query = QueryEditorText.Text\r
+\r
+                Dim params As String = query\r
+                Dim proc As New System.Diagnostics.Process\r
+                proc = System.Diagnostics.Process.Start("""" + ApplicationPath + "\hbcli.exe""", params)\r
                 MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
 \r
-                    'Lets start the process monitor to keep an eye on things.\r
-                    hbcliMonitor = New ProcessMonitor()\r
-                    Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)\r
-                    t.Start()\r
-                End If\r
-            Catch ex As Exception\r
+                'Lets start the process monitor to keep an eye on things.\r
+                hbcliMonitor = New ProcessMonitor()\r
+                Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)\r
+                t.Start()\r
+            End If\r
+        Catch ex As Exception\r
             MessageBox.Show("Unable to launch the HandBrake encoder.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)\r
-                MessageBox.Show(ex.ToString) ' Debug\r
-            End Try\r
+            MessageBox.Show(ex.ToString) ' Debug\r
+        End Try\r
 \r
     End Sub\r
 \r
@@ -1269,4 +1276,5 @@ Public Class frmMain
 \r
     End Sub\r
     '-----------------------------------------------\r
+\r
 End Class
\ No newline at end of file