WinGUI:

- Small text changes on the read DVV window.

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

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index e528c0f2414bea3f5f6df66c1819b7c96a85923a..9ecb13cc3659d173be41e60365895e612bdf8153 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -480,15 +480,8 @@ Public Class frmMain
 \r
     Private Sub btn_queue_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_queue.Click\r
         Dim query As String\r
-        'Dim ApplicationPath As String = Application.StartupPath\r
-        'If (QueryEditorText.Text = "") Then\r
         query = GenerateTheQuery()\r
         frmQueue.list_queue.Items.Add(query)\r
-        ' Else\r
-        '    query = QueryEditorText.Text\r
-        '     frmQueue.list_queue.Items.Add(query)\r
-        '  End If\r
-\r
         frmQueue.Show()\r
     End Sub\r
 \r
@@ -514,6 +507,11 @@ Public Class frmMain
                 query = QueryEditorText.Text\r
                 Shell("""" + ApplicationPath + "\hbcli.exe""" + query)\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
             MessageBox.Show("Unable to Launch the Encoder.")\r

diff --git a/win/Handbrake/frmReadDVD.Designer.vb b/win/Handbrake/frmReadDVD.Designer.vb
index 8faa4ae6415bac68527580dbe85eb6a923534bf1..007a7cf9c26ab55584cdcaed81fd631c5d6a4955 100644 (file)
--- a/win/Handbrake/frmReadDVD.Designer.vb
+++ b/win/Handbrake/frmReadDVD.Designer.vb
@@ -24,17 +24,19 @@ Partial Class frmReadDVD
         Me.Label2 = New System.Windows.Forms.Label\r
         Me.Label3 = New System.Windows.Forms.Label\r
         Me.btn_ok = New System.Windows.Forms.Button\r
+        Me.Label4 = New System.Windows.Forms.Label\r
         Me.SuspendLayout()\r
         '\r
         'Label1\r
         '\r
         Me.Label1.AutoSize = True\r
-        Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label1.Location = New System.Drawing.Point(81, 42)\r
+        Me.Label1.Font = New System.Drawing.Font("Verdana", 6.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.Label1.Location = New System.Drawing.Point(6, 94)\r
         Me.Label1.Name = "Label1"\r
-        Me.Label1.Size = New System.Drawing.Size(364, 13)\r
+        Me.Label1.Size = New System.Drawing.Size(457, 12)\r
         Me.Label1.TabIndex = 20\r
-        Me.Label1.Text = "Please click OK to continue, This process may take a moment."\r
+        Me.Label1.Text = "Note: After pressing OK the window will remain open until the CLI has completed t" & _\r
+            "he scan."\r
         '\r
         'Label2\r
         '\r
@@ -52,9 +54,9 @@ Partial Class frmReadDVD
         Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.Label3.Location = New System.Drawing.Point(81, 21)\r
         Me.Label3.Name = "Label3"\r
-        Me.Label3.Size = New System.Drawing.Size(124, 13)\r
+        Me.Label3.Size = New System.Drawing.Size(231, 13)\r
         Me.Label3.TabIndex = 22\r
-        Me.Label3.Text = "Reading Disc Data..."\r
+        Me.Label3.Text = "The CLI is currently reading the DVD..."\r
         '\r
         'btn_ok\r
         '\r
@@ -63,7 +65,7 @@ Partial Class frmReadDVD
         Me.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_ok.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_ok.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_ok.Location = New System.Drawing.Point(454, 69)\r
+        Me.btn_ok.Location = New System.Drawing.Point(406, 64)\r
         Me.btn_ok.Name = "btn_ok"\r
         Me.btn_ok.Size = New System.Drawing.Size(56, 22)\r
         Me.btn_ok.TabIndex = 23\r
@@ -71,13 +73,24 @@ Partial Class frmReadDVD
         Me.btn_ok.Text = "Ok"\r
         Me.btn_ok.UseVisualStyleBackColor = False\r
         '\r
+        'Label4\r
+        '\r
+        Me.Label4.AutoSize = True\r
+        Me.Label4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.Label4.Location = New System.Drawing.Point(81, 43)\r
+        Me.Label4.Name = "Label4"\r
+        Me.Label4.Size = New System.Drawing.Size(130, 13)\r
+        Me.Label4.TabIndex = 24\r
+        Me.Label4.Text = "Press OK to continue."\r
+        '\r
         'frmReadDVD\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
         Me.BackColor = System.Drawing.SystemColors.Control\r
-        Me.ClientSize = New System.Drawing.Size(518, 98)\r
+        Me.ClientSize = New System.Drawing.Size(473, 116)\r
         Me.ControlBox = False\r
+        Me.Controls.Add(Me.Label4)\r
         Me.Controls.Add(Me.btn_ok)\r
         Me.Controls.Add(Me.Label3)\r
         Me.Controls.Add(Me.Label2)\r
@@ -98,4 +111,5 @@ Partial Class frmReadDVD
     Friend WithEvents Label2 As System.Windows.Forms.Label\r
     Friend WithEvents Label3 As System.Windows.Forms.Label\r
     Friend WithEvents btn_ok As System.Windows.Forms.Button\r
+    Friend WithEvents Label4 As System.Windows.Forms.Label\r
 End Class\r

diff --git a/win/Handbrake/frmReadDVD.vb b/win/Handbrake/frmReadDVD.vb
index 0a46d0b22353e19c13e2df8fdbf4948f62782d70..8d8c8f91c86cdb1a7f74709556d47a73049e636d 100644 (file)
--- a/win/Handbrake/frmReadDVD.vb
+++ b/win/Handbrake/frmReadDVD.vb
@@ -19,6 +19,7 @@ Public Class frmReadDVD
             MessageBox.Show("Unable to launch the CLI encoder.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             MessageBox.Show(ex.ToString)\r
         End Try\r
+\r
     End Sub\r
 \r
     '#\r