WinGui:

- New layout on options window. Added verbose mode option
- Added the ability to re-arrange the queue
- Fixed the issue where selecting the same chapter for start and finish would result in something like "-c 6-6"
- Few other small changes & design tweaks

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

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

diff --git a/win/Handbrake/My Project/Settings.Designer.vb b/win/Handbrake/My Project/Settings.Designer.vb
index a88432cfa32b566eaa0b2cbf21623def37984805..7c1a128a5d5baac9a591e05f2570c72e2f7fa19b 100644 (file)
--- a/win/Handbrake/My Project/Settings.Designer.vb
+++ b/win/Handbrake/My Project/Settings.Designer.vb
@@ -497,6 +497,17 @@ Namespace My
                 Me("largeFile") = value\r
             End Set\r
         End Property\r
+        \r
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _\r
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _\r
+        Public Property verbose() As Integer\r
+            Get\r
+                Return CType(Me("verbose"),Integer)\r
+            End Get\r
+            Set\r
+                Me("verbose") = value\r
+            End Set\r
+        End Property\r
     End Class\r
 End Namespace\r
 \r

diff --git a/win/Handbrake/My Project/Settings.settings b/win/Handbrake/My Project/Settings.settings
index 7287b45d3a1dc9865812019b367a675939d6fdc2..c8afbbd0f86c68cbe373c6f3d22335f230b90808 100644 (file)
--- a/win/Handbrake/My Project/Settings.settings
+++ b/win/Handbrake/My Project/Settings.settings
@@ -113,5 +113,8 @@
     <Setting Name="largeFile" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r
     </Setting>\r
+    <Setting Name="verbose" Type="System.Int32" Scope="User">\r
+      <Value Profile="(Default)" />\r
+    </Setting>\r
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb
index 873e8330c9e9d73f8d923334b92518e593ebb14a..7ef6d2f5f6ca3055639fd6bc218aa7e850a22eba 100644 (file)
--- a/win/Handbrake/frmMain.Designer.vb
+++ b/win/Handbrake/frmMain.Designer.vb
@@ -30,7 +30,6 @@ 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
@@ -230,6 +229,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
         Label38 = New System.Windows.Forms.Label\r
         Me.frmMainMenu.SuspendLayout()\r
         Me.GroupBox4.SuspendLayout()\r
@@ -260,7 +260,7 @@ Partial Class frmMain
         Me.frmMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.PresetsToolStripMenuItem, Me.HelpToolStripMenuItem})\r
         Me.frmMainMenu.Location = New System.Drawing.Point(0, 0)\r
         Me.frmMainMenu.Name = "frmMainMenu"\r
-        Me.frmMainMenu.Size = New System.Drawing.Size(700, 24)\r
+        Me.frmMainMenu.Size = New System.Drawing.Size(675, 24)\r
         Me.frmMainMenu.TabIndex = 0\r
         Me.frmMainMenu.Text = "MenuStrip1"\r
         '\r
@@ -318,12 +318,6 @@ 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
@@ -470,9 +464,9 @@ Partial Class frmMain
         Me.GroupBox4.Controls.Add(Me.Label12)\r
         Me.GroupBox4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.GroupBox4.ForeColor = System.Drawing.Color.Black\r
-        Me.GroupBox4.Location = New System.Drawing.Point(15, 159)\r
+        Me.GroupBox4.Location = New System.Drawing.Point(15, 157)\r
         Me.GroupBox4.Name = "GroupBox4"\r
-        Me.GroupBox4.Size = New System.Drawing.Size(668, 126)\r
+        Me.GroupBox4.Size = New System.Drawing.Size(647, 126)\r
         Me.GroupBox4.TabIndex = 406\r
         Me.GroupBox4.TabStop = False\r
         Me.GroupBox4.Text = "Destination"\r
@@ -635,7 +629,7 @@ Partial Class frmMain
         Me.GroupBox1.ForeColor = System.Drawing.Color.Black\r
         Me.GroupBox1.Location = New System.Drawing.Point(15, 35)\r
         Me.GroupBox1.Name = "GroupBox1"\r
-        Me.GroupBox1.Size = New System.Drawing.Size(668, 116)\r
+        Me.GroupBox1.Size = New System.Drawing.Size(647, 116)\r
         Me.GroupBox1.TabIndex = 407\r
         Me.GroupBox1.TabStop = False\r
         Me.GroupBox1.Text = "Source"\r
@@ -781,7 +775,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(559, 591)\r
+        Me.btn_encode.Location = New System.Drawing.Point(534, 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
@@ -796,7 +790,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(428, 591)\r
+        Me.btn_queue.Location = New System.Drawing.Point(403, 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
@@ -817,7 +811,7 @@ Partial Class frmMain
         Me.h264Tab.Location = New System.Drawing.Point(4, 22)\r
         Me.h264Tab.Name = "h264Tab"\r
         Me.h264Tab.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.h264Tab.Size = New System.Drawing.Size(660, 268)\r
+        Me.h264Tab.Size = New System.Drawing.Size(639, 268)\r
         Me.h264Tab.TabIndex = 5\r
         Me.h264Tab.Text = "H.264"\r
         '\r
@@ -855,7 +849,7 @@ Partial Class frmMain
         Me.btn_h264Clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_h264Clear.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_h264Clear.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_h264Clear.Location = New System.Drawing.Point(565, 50)\r
+        Me.btn_h264Clear.Location = New System.Drawing.Point(542, 50)\r
         Me.btn_h264Clear.Name = "btn_h264Clear"\r
         Me.btn_h264Clear.Size = New System.Drawing.Size(79, 23)\r
         Me.btn_h264Clear.TabIndex = 45\r
@@ -877,7 +871,7 @@ Partial Class frmMain
         Me.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle\r
         Me.rtf_h264advanced.Location = New System.Drawing.Point(16, 79)\r
         Me.rtf_h264advanced.Name = "rtf_h264advanced"\r
-        Me.rtf_h264advanced.Size = New System.Drawing.Size(628, 123)\r
+        Me.rtf_h264advanced.Size = New System.Drawing.Size(605, 123)\r
         Me.rtf_h264advanced.TabIndex = 41\r
         Me.rtf_h264advanced.Text = ""\r
         '\r
@@ -900,7 +894,7 @@ Partial Class frmMain
         Me.TabPage4.Location = New System.Drawing.Point(4, 22)\r
         Me.TabPage4.Name = "TabPage4"\r
         Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.TabPage4.Size = New System.Drawing.Size(660, 268)\r
+        Me.TabPage4.Size = New System.Drawing.Size(639, 268)\r
         Me.TabPage4.TabIndex = 4\r
         Me.TabPage4.Text = "Advanced Settings"\r
         '\r
@@ -953,7 +947,7 @@ Partial Class frmMain
         Me.TabPage2.Location = New System.Drawing.Point(4, 22)\r
         Me.TabPage2.Name = "TabPage2"\r
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.TabPage2.Size = New System.Drawing.Size(660, 268)\r
+        Me.TabPage2.Size = New System.Drawing.Size(639, 268)\r
         Me.TabPage2.TabIndex = 3\r
         Me.TabPage2.Text = "Audio Settings"\r
         '\r
@@ -1102,7 +1096,7 @@ Partial Class frmMain
         Me.TabPage3.Location = New System.Drawing.Point(4, 22)\r
         Me.TabPage3.Name = "TabPage3"\r
         Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.TabPage3.Size = New System.Drawing.Size(660, 268)\r
+        Me.TabPage3.Size = New System.Drawing.Size(639, 268)\r
         Me.TabPage3.TabIndex = 2\r
         Me.TabPage3.Text = "Video Settings"\r
         '\r
@@ -1386,7 +1380,7 @@ Partial Class frmMain
         Me.TabPage1.Location = New System.Drawing.Point(4, 22)\r
         Me.TabPage1.Name = "TabPage1"\r
         Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.TabPage1.Size = New System.Drawing.Size(660, 268)\r
+        Me.TabPage1.Size = New System.Drawing.Size(639, 268)\r
         Me.TabPage1.TabIndex = 0\r
         Me.TabPage1.Text = "Picture Settings"\r
         '\r
@@ -1395,7 +1389,7 @@ Partial Class frmMain
         Me.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.drp_subtitle.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.drp_subtitle.FormattingEnabled = True\r
-        Me.drp_subtitle.Location = New System.Drawing.Point(404, 36)\r
+        Me.drp_subtitle.Location = New System.Drawing.Point(381, 36)\r
         Me.drp_subtitle.Name = "drp_subtitle"\r
         Me.drp_subtitle.Size = New System.Drawing.Size(213, 21)\r
         Me.drp_subtitle.TabIndex = 42\r
@@ -1405,7 +1399,7 @@ Partial Class frmMain
         '\r
         Me.Label19.AutoSize = True\r
         Me.Label19.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label19.Location = New System.Drawing.Point(334, 13)\r
+        Me.Label19.Location = New System.Drawing.Point(311, 13)\r
         Me.Label19.Name = "Label19"\r
         Me.Label19.Size = New System.Drawing.Size(64, 13)\r
         Me.Label19.TabIndex = 39\r
@@ -1454,7 +1448,7 @@ Partial Class frmMain
         '\r
         Me.Label21.AutoSize = True\r
         Me.Label21.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label21.Location = New System.Drawing.Point(401, 63)\r
+        Me.Label21.Location = New System.Drawing.Point(378, 63)\r
         Me.Label21.Name = "Label21"\r
         Me.Label21.Size = New System.Drawing.Size(224, 26)\r
         Me.Label21.TabIndex = 34\r
@@ -1464,7 +1458,7 @@ Partial Class frmMain
         '\r
         Me.Label20.AutoSize = True\r
         Me.Label20.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label20.Location = New System.Drawing.Point(337, 39)\r
+        Me.Label20.Location = New System.Drawing.Point(314, 39)\r
         Me.Label20.Name = "Label20"\r
         Me.Label20.Size = New System.Drawing.Size(61, 13)\r
         Me.Label20.TabIndex = 33\r
@@ -1574,7 +1568,7 @@ Partial Class frmMain
         Me.advancedOptions.Location = New System.Drawing.Point(15, 291)\r
         Me.advancedOptions.Name = "advancedOptions"\r
         Me.advancedOptions.SelectedIndex = 0\r
-        Me.advancedOptions.Size = New System.Drawing.Size(668, 294)\r
+        Me.advancedOptions.Size = New System.Drawing.Size(647, 294)\r
         Me.advancedOptions.TabIndex = 410\r
         Me.advancedOptions.TabStop = False\r
         '\r
@@ -1589,7 +1583,7 @@ Partial Class frmMain
         Me.TabPage6.Location = New System.Drawing.Point(4, 22)\r
         Me.TabPage6.Name = "TabPage6"\r
         Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)\r
-        Me.TabPage6.Size = New System.Drawing.Size(660, 268)\r
+        Me.TabPage6.Size = New System.Drawing.Size(639, 268)\r
         Me.TabPage6.TabIndex = 6\r
         Me.TabPage6.Text = "Query Editor"\r
         '\r
@@ -1619,7 +1613,7 @@ Partial Class frmMain
         Me.btn_ClearQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_ClearQuery.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_ClearQuery.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_ClearQuery.Location = New System.Drawing.Point(566, 73)\r
+        Me.btn_ClearQuery.Location = New System.Drawing.Point(542, 73)\r
         Me.btn_ClearQuery.Name = "btn_ClearQuery"\r
         Me.btn_ClearQuery.Size = New System.Drawing.Size(79, 23)\r
         Me.btn_ClearQuery.TabIndex = 39\r
@@ -1644,7 +1638,7 @@ Partial Class frmMain
         Me.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle\r
         Me.QueryEditorText.Location = New System.Drawing.Point(16, 102)\r
         Me.QueryEditorText.Name = "QueryEditorText"\r
-        Me.QueryEditorText.Size = New System.Drawing.Size(629, 139)\r
+        Me.QueryEditorText.Size = New System.Drawing.Size(605, 139)\r
         Me.QueryEditorText.TabIndex = 41\r
         Me.QueryEditorText.Text = ""\r
         '\r
@@ -2348,11 +2342,17 @@ 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
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
-        Me.ClientSize = New System.Drawing.Size(700, 621)\r
+        Me.ClientSize = New System.Drawing.Size(675, 621)\r
         Me.Controls.Add(Me.lbl_update)\r
         Me.Controls.Add(Me.btn_queue)\r
         Me.Controls.Add(Me.btn_encode)\r
@@ -2364,6 +2364,7 @@ Partial Class frmMain
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)\r
         Me.MainMenuStrip = Me.frmMainMenu\r
         Me.MaximumSize = New System.Drawing.Size(878, 750)\r
+        Me.MinimumSize = New System.Drawing.Size(683, 648)\r
         Me.Name = "frmMain"\r
         Me.Text = "Handbrake"\r
         Me.frmMainMenu.ResumeLayout(False)\r
@@ -2397,7 +2398,6 @@ Partial Class frmMain
     Friend WithEvents toolStripSeparator2 As System.Windows.Forms.ToolStripSeparator\r
     Friend WithEvents mnu_exit As System.Windows.Forms.ToolStripMenuItem\r
     Friend WithEvents ToolsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem\r
-    Friend WithEvents mnu_encode As System.Windows.Forms.ToolStripMenuItem\r
     Friend WithEvents HelpToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem\r
     Friend WithEvents mnu_about As System.Windows.Forms.ToolStripMenuItem\r
     Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox\r
@@ -2599,5 +2599,6 @@ Partial Class frmMain
     Friend WithEvents check_largeFile As System.Windows.Forms.CheckBox\r
     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
 \r
 End Class\r

diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb
index 1bffcd51e71658a09ee9339b5f9f29f66aa3594d..5b4ec26f2fd3806af2fc900d1dbb008bd0068c87 100644 (file)
--- a/win/Handbrake/frmMain.vb
+++ b/win/Handbrake/frmMain.vb
@@ -191,9 +191,9 @@ Public Class frmMain
                 StreamWriter.WriteLine(CRF)\r
                 StreamWriter.WriteLine(advH264)\r
                 StreamWriter.Close()\r
-                MessageBox.Show("Your profile has been sucessfully saved.", "STATUS", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
+                MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
             Catch\r
-                MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+                MessageBox.Show("Unable to write to the file. Please make sure the location has the correct permissions for file writing.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             End Try\r
         End If\r
     End Sub\r
@@ -246,7 +246,7 @@ Public Class frmMain
                 SliderValue.Text = slider_videoQuality.Value & "%"\r
 \r
             Catch ex As Exception\r
-                MessageBox.Show("Unable to load profile.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+                MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
             End Try\r
         End If\r
 \r
@@ -459,7 +459,7 @@ Public Class frmMain
                 lAvailableSpace = Drv.AvailableSpace\r
                 lAvailableSpace = lAvailableSpace / 1024 / 1024 / 1024\r
                 If lAvailableSpace < 4 Then\r
-                    MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
+                    MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
                 End If\r
 \r
                 Dim lTotalSpace As Long\r
@@ -499,33 +499,34 @@ Public Class frmMain
         Dim ApplicationPath As String = Application.StartupPath\r
 \r
         If (frmQueue.list_queue.Items.Count > 0) Then\r
-            MessageBox.Show("You have items on the video queue. If you wish to run the queue, click the Enocde Videos button on the Queue window.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)\r
+            MessageBox.Show("You have items on the video queue. If you wish to run the queue please use the encode video button on the queue window." _\r
+                                , "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
-                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
-                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
-            MessageBox.Show(ex.ToString) ' Debug\r
-        End Try\r
+            Try\r
+                If (QueryEditorText.Text = "") Then\r
+                    query = GenerateTheQuery()\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
+                Else\r
+                    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 HandBrake encoder.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)\r
+                MessageBox.Show(ex.ToString) ' Debug\r
+            End Try\r
 \r
     End Sub\r
 \r
@@ -545,10 +546,10 @@ Public Class frmMain
 \r
         Try\r
             If (chapterFinish < chapterStart) Then\r
-                MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
+                MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
             End If\r
         Catch ex As Exception\r
-            MessageBox.Show("Invalid Character Entered")\r
+            MessageBox.Show("Invalid Character Entered!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
     End Sub\r
 \r
@@ -558,10 +559,10 @@ Public Class frmMain
 \r
         Try\r
             If (chapterStart > chapterFinish) Then\r
-                MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
+                MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
             End If\r
         Catch ex As Exception\r
-            MessageBox.Show("Invalid Character Entered", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+            MessageBox.Show("Invalid Character Entered", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
         End Try\r
     End Sub\r
 \r
@@ -936,7 +937,7 @@ Public Class frmMain
 \r
 \r
         If (source = "") Then\r
-            MessageBox.Show("No Source has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
+            MessageBox.Show("No Source has been selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
         Else\r
             source = " -i " + """" + source + """"\r
         End If\r
@@ -953,6 +954,8 @@ Public Class frmMain
             dvdChapter = ""\r
         ElseIf (chapterFinish = totalChapters & chapterStart > 1) Then\r
             dvdChapter = ""\r
+        ElseIf chapterFinish = chapterStart Then\r
+            dvdChapter = " -c " + chapterStart\r
         Else\r
             dvdChapter = " -c " + chapterStart + "-" + chapterFinish\r
         End If\r
@@ -968,7 +971,7 @@ Public Class frmMain
         Dim height As String = text_height.Text\r
 \r
         If (destination = "") Then\r
-            MessageBox.Show("No destination has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
+            MessageBox.Show("No destination has been selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)\r
         Else\r
             destination = " -o " + """" + destination + """"\r
         End If\r
@@ -1208,7 +1211,15 @@ Public Class frmMain
         Dim queryAdvancedSettings As String = processors\r
         '----------------------------------------------------------------------\r
 \r
-        Return querySource + queryDestination + queryPictureSettings + queryVideoSettings + h264Settings + queryAudioSettings + queryAdvancedSettings\r
+        ' Verbose option\r
+        Dim verbose As String = ""\r
+        If My.Settings.verbose = 1 Then\r
+            verbose = " -v "\r
+        End If\r
+        '----------------------------------------------------------------------\r
+\r
+\r
+        Return querySource + queryDestination + queryPictureSettings + queryVideoSettings + h264Settings + queryAudioSettings + queryAdvancedSettings + verbose\r
 \r
     End Function\r
 \r
@@ -1258,9 +1269,4 @@ Public Class frmMain
 \r
     End Sub\r
     '-----------------------------------------------\r
-\r
-\r
-    Private Sub TabPage1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TabPage1.Click\r
-\r
-    End Sub\r
 End Class
\ No newline at end of file

diff --git a/win/Handbrake/frmOptions.Designer.vb b/win/Handbrake/frmOptions.Designer.vb
index 4e1bd37e73c84c766808a5438e90232e466c6bec..05278026b675bd84ed49c2a31a6f88dd49a354fb 100644 (file)
--- a/win/Handbrake/frmOptions.Designer.vb
+++ b/win/Handbrake/frmOptions.Designer.vb
@@ -27,15 +27,21 @@ Partial Class frmOptions
         Me.Label2 = New System.Windows.Forms.Label\r
         Me.check_readDVDWindow = New System.Windows.Forms.CheckBox\r
         Me.Label3 = New System.Windows.Forms.Label\r
+        Me.GroupBox1 = New System.Windows.Forms.GroupBox\r
+        Me.check_verbose = New System.Windows.Forms.CheckBox\r
+        Me.GroupBox2 = New System.Windows.Forms.GroupBox\r
+        Me.File_Save = New System.Windows.Forms.SaveFileDialog\r
+        Me.GroupBox1.SuspendLayout()\r
+        Me.GroupBox2.SuspendLayout()\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.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label1.Location = New System.Drawing.Point(9, 11)\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(17, 27)\r
         Me.Label1.Name = "Label1"\r
-        Me.Label1.Size = New System.Drawing.Size(168, 13)\r
+        Me.Label1.Size = New System.Drawing.Size(151, 13)\r
         Me.Label1.TabIndex = 0\r
         Me.Label1.Text = "Update Check on Startup"\r
         '\r
@@ -43,7 +49,7 @@ Partial Class frmOptions
         '\r
         Me.check_updateCheck.AutoSize = True\r
         Me.check_updateCheck.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.check_updateCheck.Location = New System.Drawing.Point(12, 32)\r
+        Me.check_updateCheck.Location = New System.Drawing.Point(20, 48)\r
         Me.check_updateCheck.Name = "check_updateCheck"\r
         Me.check_updateCheck.Size = New System.Drawing.Size(71, 17)\r
         Me.check_updateCheck.TabIndex = 1\r
@@ -56,7 +62,7 @@ Partial Class frmOptions
         Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_close.Location = New System.Drawing.Point(257, 171)\r
+        Me.btn_close.Location = New System.Drawing.Point(292, 287)\r
         Me.btn_close.Name = "btn_close"\r
         Me.btn_close.Size = New System.Drawing.Size(107, 22)\r
         Me.btn_close.TabIndex = 45\r
@@ -67,7 +73,7 @@ Partial Class frmOptions
         '\r
         Me.check_userDefaultSettings.AutoSize = True\r
         Me.check_userDefaultSettings.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.check_userDefaultSettings.Location = New System.Drawing.Point(12, 82)\r
+        Me.check_userDefaultSettings.Location = New System.Drawing.Point(20, 98)\r
         Me.check_userDefaultSettings.Name = "check_userDefaultSettings"\r
         Me.check_userDefaultSettings.Size = New System.Drawing.Size(71, 17)\r
         Me.check_userDefaultSettings.TabIndex = 47\r
@@ -77,10 +83,10 @@ Partial Class frmOptions
         'Label2\r
         '\r
         Me.Label2.AutoSize = True\r
-        Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label2.Location = New System.Drawing.Point(9, 61)\r
+        Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.Label2.Location = New System.Drawing.Point(17, 77)\r
         Me.Label2.Name = "Label2"\r
-        Me.Label2.Size = New System.Drawing.Size(259, 13)\r
+        Me.Label2.Size = New System.Drawing.Size(229, 13)\r
         Me.Label2.TabIndex = 46\r
         Me.Label2.Text = "Load Users Default Settings on Startup"\r
         '\r
@@ -88,7 +94,7 @@ Partial Class frmOptions
         '\r
         Me.check_readDVDWindow.AutoSize = True\r
         Me.check_readDVDWindow.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.check_readDVDWindow.Location = New System.Drawing.Point(12, 135)\r
+        Me.check_readDVDWindow.Location = New System.Drawing.Point(20, 151)\r
         Me.check_readDVDWindow.Name = "check_readDVDWindow"\r
         Me.check_readDVDWindow.Size = New System.Drawing.Size(71, 17)\r
         Me.check_readDVDWindow.TabIndex = 49\r
@@ -98,31 +104,73 @@ Partial Class frmOptions
         'Label3\r
         '\r
         Me.Label3.AutoSize = True\r
-        Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
-        Me.Label3.Location = New System.Drawing.Point(9, 113)\r
+        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(17, 129)\r
         Me.Label3.Name = "Label3"\r
-        Me.Label3.Size = New System.Drawing.Size(238, 13)\r
+        Me.Label3.Size = New System.Drawing.Size(215, 13)\r
         Me.Label3.TabIndex = 48\r
         Me.Label3.Text = "Show Select DVD window on startup"\r
         '\r
+        'GroupBox1\r
+        '\r
+        Me.GroupBox1.Controls.Add(Me.check_verbose)\r
+        Me.GroupBox1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 211)\r
+        Me.GroupBox1.Name = "GroupBox1"\r
+        Me.GroupBox1.Size = New System.Drawing.Size(386, 70)\r
+        Me.GroupBox1.TabIndex = 50\r
+        Me.GroupBox1.TabStop = False\r
+        Me.GroupBox1.Text = "Verbose Mode"\r
+        '\r
+        'check_verbose\r
+        '\r
+        Me.check_verbose.AutoSize = True\r
+        Me.check_verbose.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.check_verbose.Location = New System.Drawing.Point(20, 31)\r
+        Me.check_verbose.Name = "check_verbose"\r
+        Me.check_verbose.Size = New System.Drawing.Size(71, 17)\r
+        Me.check_verbose.TabIndex = 51\r
+        Me.check_verbose.Text = "Enabled"\r
+        Me.check_verbose.UseVisualStyleBackColor = True\r
+        '\r
+        'GroupBox2\r
+        '\r
+        Me.GroupBox2.Controls.Add(Me.Label1)\r
+        Me.GroupBox2.Controls.Add(Me.check_updateCheck)\r
+        Me.GroupBox2.Controls.Add(Me.check_readDVDWindow)\r
+        Me.GroupBox2.Controls.Add(Me.Label2)\r
+        Me.GroupBox2.Controls.Add(Me.Label3)\r
+        Me.GroupBox2.Controls.Add(Me.check_userDefaultSettings)\r
+        Me.GroupBox2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.GroupBox2.Location = New System.Drawing.Point(12, 12)\r
+        Me.GroupBox2.Name = "GroupBox2"\r
+        Me.GroupBox2.Size = New System.Drawing.Size(386, 193)\r
+        Me.GroupBox2.TabIndex = 51\r
+        Me.GroupBox2.TabStop = False\r
+        Me.GroupBox2.Text = "General Settings"\r
+        '\r
+        'File_Save\r
+        '\r
+        Me.File_Save.DefaultExt = "hb"\r
+        Me.File_Save.Filter = "txt|*.txt"\r
+        '\r
         'frmOptions\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
-        Me.ClientSize = New System.Drawing.Size(382, 202)\r
-        Me.Controls.Add(Me.check_readDVDWindow)\r
-        Me.Controls.Add(Me.Label3)\r
-        Me.Controls.Add(Me.check_userDefaultSettings)\r
-        Me.Controls.Add(Me.Label2)\r
+        Me.ClientSize = New System.Drawing.Size(411, 320)\r
+        Me.Controls.Add(Me.GroupBox2)\r
+        Me.Controls.Add(Me.GroupBox1)\r
         Me.Controls.Add(Me.btn_close)\r
-        Me.Controls.Add(Me.check_updateCheck)\r
-        Me.Controls.Add(Me.Label1)\r
         Me.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)\r
         Me.Name = "frmOptions"\r
         Me.Text = "Options"\r
+        Me.GroupBox1.ResumeLayout(False)\r
+        Me.GroupBox1.PerformLayout()\r
+        Me.GroupBox2.ResumeLayout(False)\r
+        Me.GroupBox2.PerformLayout()\r
         Me.ResumeLayout(False)\r
-        Me.PerformLayout()\r
 \r
     End Sub\r
     Friend WithEvents Label1 As System.Windows.Forms.Label\r
@@ -132,4 +180,8 @@ Partial Class frmOptions
     Friend WithEvents Label2 As System.Windows.Forms.Label\r
     Friend WithEvents check_readDVDWindow As System.Windows.Forms.CheckBox\r
     Friend WithEvents Label3 As System.Windows.Forms.Label\r
+    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox\r
+    Friend WithEvents check_verbose As System.Windows.Forms.CheckBox\r
+    Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox\r
+    Friend WithEvents File_Save As System.Windows.Forms.SaveFileDialog\r
 End Class\r

diff --git a/win/Handbrake/frmOptions.resx b/win/Handbrake/frmOptions.resx
index 37f92905aa75f4b64a504b27e90538792d5ec57a..771d7172333e90f08856d86463c41f4761366d87 100644 (file)
--- a/win/Handbrake/frmOptions.resx
+++ b/win/Handbrake/frmOptions.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">\r
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>\r
   </resheader>\r
+  <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
+    <value>17, 17</value>\r
+  </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r

diff --git a/win/Handbrake/frmOptions.vb b/win/Handbrake/frmOptions.vb
index 23294e230271998a371f9b862e1f0d998c4a2a3a..297945eb4ac54e94c9d80075ce5ca249a28ed8a9 100644 (file)
--- a/win/Handbrake/frmOptions.vb
+++ b/win/Handbrake/frmOptions.vb
@@ -31,6 +31,12 @@ Public Class frmOptions
                 check_readDVDWindow.CheckState = CheckState.Unchecked\r
             End If\r
 \r
+            If My.Settings.verbose = 1 Then\r
+                check_verbose.CheckState = CheckState.Checked\r
+            Else\r
+                check_verbose.CheckState = CheckState.Unchecked\r
+            End If\r
+\r
         Catch ex As Exception\r
             MessageBox.Show("ERROR:  " & ex.ToString)\r
         End Try\r
@@ -89,4 +95,23 @@ Public Class frmOptions
             End Try\r
         End If\r
     End Sub\r
+\r
+\r
+    Private Sub check_verbose_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles check_verbose.CheckedChanged\r
+        If check_verbose.CheckState = 1 Then\r
+            Try\r
+                My.Settings.verbose = 1\r
+            Catch Ex As Exception\r
+                MessageBox.Show("ERROR:  " & Ex.ToString)\r
+            End Try\r
+        Else\r
+            Try\r
+                My.Settings.verbose = 0\r
+            Catch Ex As Exception\r
+                MessageBox.Show("ERROR:  " & Ex.ToString)\r
+            End Try\r
+        End If\r
+    End Sub\r
+\r
+\r
 End Class
\ No newline at end of file

diff --git a/win/Handbrake/frmQueue.Designer.vb b/win/Handbrake/frmQueue.Designer.vb
index 28a25c3c63033cf4b5abae14ff3aa749453104eb..9ccbb2f2df2f657fca9a7041f33ae9ae7c241f01 100644 (file)
--- a/win/Handbrake/frmQueue.Designer.vb
+++ b/win/Handbrake/frmQueue.Designer.vb
@@ -25,6 +25,8 @@ Partial Class frmQueue
         Me.btn_q_encoder = New System.Windows.Forms.Button\r
         Me.Label1 = New System.Windows.Forms.Label\r
         Me.btn_delete = New System.Windows.Forms.Button\r
+        Me.btn_up = New System.Windows.Forms.Button\r
+        Me.btn_down = New System.Windows.Forms.Button\r
         Me.SuspendLayout()\r
         '\r
         'btn_Close\r
@@ -34,7 +36,7 @@ Partial Class frmQueue
         Me.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_Close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_Close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_Close.Location = New System.Drawing.Point(16, 403)\r
+        Me.btn_Close.Location = New System.Drawing.Point(518, 377)\r
         Me.btn_Close.Name = "btn_Close"\r
         Me.btn_Close.Size = New System.Drawing.Size(124, 22)\r
         Me.btn_Close.TabIndex = 20\r
@@ -46,9 +48,9 @@ Partial Class frmQueue
         '\r
         Me.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle\r
         Me.list_queue.FormattingEnabled = True\r
-        Me.list_queue.Location = New System.Drawing.Point(16, 34)\r
+        Me.list_queue.Location = New System.Drawing.Point(12, 40)\r
         Me.list_queue.Name = "list_queue"\r
-        Me.list_queue.Size = New System.Drawing.Size(593, 353)\r
+        Me.list_queue.Size = New System.Drawing.Size(630, 327)\r
         Me.list_queue.TabIndex = 21\r
         '\r
         'btn_q_encoder\r
@@ -58,7 +60,7 @@ Partial Class frmQueue
         Me.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_q_encoder.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_q_encoder.Location = New System.Drawing.Point(485, 403)\r
+        Me.btn_q_encoder.Location = New System.Drawing.Point(12, 377)\r
         Me.btn_q_encoder.Name = "btn_q_encoder"\r
         Me.btn_q_encoder.Size = New System.Drawing.Size(124, 22)\r
         Me.btn_q_encoder.TabIndex = 22\r
@@ -69,7 +71,7 @@ Partial Class frmQueue
         'Label1\r
         '\r
         Me.Label1.AutoSize = True\r
-        Me.Label1.Location = New System.Drawing.Point(13, 13)\r
+        Me.Label1.Location = New System.Drawing.Point(12, 17)\r
         Me.Label1.Name = "Label1"\r
         Me.Label1.Size = New System.Drawing.Size(110, 13)\r
         Me.Label1.TabIndex = 23\r
@@ -82,7 +84,7 @@ Partial Class frmQueue
         Me.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_delete.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_delete.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_delete.Location = New System.Drawing.Point(355, 403)\r
+        Me.btn_delete.Location = New System.Drawing.Point(142, 377)\r
         Me.btn_delete.Name = "btn_delete"\r
         Me.btn_delete.Size = New System.Drawing.Size(124, 22)\r
         Me.btn_delete.TabIndex = 24\r
@@ -90,12 +92,44 @@ Partial Class frmQueue
         Me.btn_delete.Text = "Delete Item"\r
         Me.btn_delete.UseVisualStyleBackColor = False\r
         '\r
+        'btn_up\r
+        '\r
+        Me.btn_up.BackColor = System.Drawing.SystemColors.Control\r
+        Me.btn_up.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
+        Me.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
+        Me.btn_up.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.btn_up.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
+        Me.btn_up.Location = New System.Drawing.Point(436, 12)\r
+        Me.btn_up.Name = "btn_up"\r
+        Me.btn_up.Size = New System.Drawing.Size(100, 22)\r
+        Me.btn_up.TabIndex = 25\r
+        Me.btn_up.TabStop = False\r
+        Me.btn_up.Text = "Move Up"\r
+        Me.btn_up.UseVisualStyleBackColor = False\r
+        '\r
+        'btn_down\r
+        '\r
+        Me.btn_down.BackColor = System.Drawing.SystemColors.Control\r
+        Me.btn_down.FlatAppearance.BorderColor = System.Drawing.Color.Black\r
+        Me.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
+        Me.btn_down.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
+        Me.btn_down.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
+        Me.btn_down.Location = New System.Drawing.Point(542, 12)\r
+        Me.btn_down.Name = "btn_down"\r
+        Me.btn_down.Size = New System.Drawing.Size(100, 22)\r
+        Me.btn_down.TabIndex = 26\r
+        Me.btn_down.TabStop = False\r
+        Me.btn_down.Text = "Move Down"\r
+        Me.btn_down.UseVisualStyleBackColor = False\r
+        '\r
         'frmQueue\r
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
-        Me.ClientSize = New System.Drawing.Size(621, 437)\r
+        Me.ClientSize = New System.Drawing.Size(651, 411)\r
         Me.ControlBox = False\r
+        Me.Controls.Add(Me.btn_down)\r
+        Me.Controls.Add(Me.btn_up)\r
         Me.Controls.Add(Me.btn_delete)\r
         Me.Controls.Add(Me.Label1)\r
         Me.Controls.Add(Me.btn_q_encoder)\r
@@ -103,6 +137,8 @@ Partial Class frmQueue
         Me.Controls.Add(Me.btn_Close)\r
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)\r
         Me.MaximizeBox = False\r
+        Me.MaximumSize = New System.Drawing.Size(659, 438)\r
+        Me.MinimumSize = New System.Drawing.Size(659, 438)\r
         Me.Name = "frmQueue"\r
         Me.ShowInTaskbar = False\r
         Me.Text = " Queue"\r
@@ -115,4 +151,6 @@ Partial Class frmQueue
     Friend WithEvents btn_q_encoder As System.Windows.Forms.Button\r
     Friend WithEvents Label1 As System.Windows.Forms.Label\r
     Friend WithEvents btn_delete As System.Windows.Forms.Button\r
+    Friend WithEvents btn_up As System.Windows.Forms.Button\r
+    Friend WithEvents btn_down As System.Windows.Forms.Button\r
 End Class\r

diff --git a/win/Handbrake/frmQueue.vb b/win/Handbrake/frmQueue.vb
index bc1090343d2a2758afab661074576baa9982f42e..b0786eb986e491dc884a8b9395eaa9fead3b4fb3 100644 (file)
--- a/win/Handbrake/frmQueue.vb
+++ b/win/Handbrake/frmQueue.vb
@@ -33,7 +33,8 @@ Public Class frmQueue
         Try\r
             Shell("""" + ApplicationPath + "\hbcli.exe""" + list_queue.Items.Item(encodeItems))\r
         Catch ex As Exception\r
-            MessageBox.Show("ERROR: No items left on the queue. Code: 01")\r
+            MessageBox.Show("Unable to launch the encoder. Queue run failed.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+            MessageBox.Show(ex.ToString)\r
         End Try\r
 \r
         ' Lets start the process monitor\r
@@ -68,7 +69,8 @@ Public Class frmQueue
             Try\r
                 Shell("""" + ApplicationPath + "\hbcli.exe""" + list_queue.Items.Item(encodeItems))\r
             Catch ex As Exception\r
-                MessageBox.Show("Error Code: q1, Please report this error.")\r
+                MessageBox.Show("Unable to launch the encoder. Queue run failed.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)\r
+                MessageBox.Show(ex.ToString)\r
             End Try\r
 \r
             ' Lets start the process monitor\r
@@ -132,5 +134,36 @@ Public Class frmQueue
         End Sub\r
     End Class\r
 \r
+    Private Sub btn_up_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_up.Click\r
+        Dim count As Integer = list_queue.Items.Count\r
+        Dim itemToMove As Integer = list_queue.SelectedIndex\r
+        Dim previousItem As String = ""\r
+        Dim previousItemint As Integer = 0\r
+\r
+        If (itemToMove > 0) Then\r
+            previousItemint = itemToMove - 1\r
+            previousItem = list_queue.Items.Item(previousItemint)\r
+            list_queue.Items.Item(previousItemint) = list_queue.Items.Item(itemToMove)\r
+            list_queue.Items.Item(itemToMove) = previousItem\r
+            list_queue.SelectedIndex = list_queue.SelectedIndex - 1\r
+        End If\r
+    End Sub\r
 \r
+    Private Sub btn_down_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_down.Click\r
+        Dim count As Integer = list_queue.Items.Count\r
+        Dim itemToMove As Integer = list_queue.SelectedIndex\r
+        Dim itemAfter As String = ""\r
+        Dim itemAfterInt As Integer = 0\r
+\r
+\r
+        MessageBox.Show(count)\r
+        MessageBox.Show(itemToMove)\r
+        If (itemToMove < (count - 1)) Then\r
+            itemAfterInt = itemToMove + 1\r
+            itemAfter = list_queue.Items.Item(itemAfterInt)\r
+            list_queue.Items.Item(itemAfterInt) = list_queue.Items.Item(itemToMove)\r
+            list_queue.Items.Item(itemToMove) = itemAfter\r
+            list_queue.SelectedIndex = list_queue.SelectedIndex + 1\r
+        End If\r
+    End Sub\r
 End Class
\ No newline at end of file

diff --git a/win/Handbrake/frmUpdate.Designer.vb b/win/Handbrake/frmUpdate.Designer.vb
index b429040d270ab23c796ffcdffb89a9332d65da3a..8d19bd2722bb9ec1da305b29d027b1f24f7619f2 100644 (file)
--- a/win/Handbrake/frmUpdate.Designer.vb
+++ b/win/Handbrake/frmUpdate.Designer.vb
@@ -54,7 +54,7 @@ Partial Class frmUpdate
         Me.Dest_browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.Dest_browse.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.Dest_browse.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.Dest_browse.Location = New System.Drawing.Point(372, 136)\r
+        Me.Dest_browse.Location = New System.Drawing.Point(15, 137)\r
         Me.Dest_browse.Name = "Dest_browse"\r
         Me.Dest_browse.Size = New System.Drawing.Size(107, 22)\r
         Me.Dest_browse.TabIndex = 38\r
@@ -111,11 +111,11 @@ Partial Class frmUpdate
         Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat\r
         Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))\r
         Me.btn_close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))\r
-        Me.btn_close.Location = New System.Drawing.Point(12, 136)\r
+        Me.btn_close.Location = New System.Drawing.Point(360, 137)\r
         Me.btn_close.Name = "btn_close"\r
-        Me.btn_close.Size = New System.Drawing.Size(107, 22)\r
+        Me.btn_close.Size = New System.Drawing.Size(122, 22)\r
         Me.btn_close.TabIndex = 44\r
-        Me.btn_close.Text = "Close"\r
+        Me.btn_close.Text = "Close Window"\r
         Me.btn_close.UseVisualStyleBackColor = True\r
         '\r
         'lbl_update\r
@@ -217,7 +217,7 @@ Partial Class frmUpdate
         '\r
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)\r
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font\r
-        Me.ClientSize = New System.Drawing.Size(502, 172)\r
+        Me.ClientSize = New System.Drawing.Size(498, 172)\r
         Me.Controls.Add(Me.lbl_startupStatus)\r
         Me.Controls.Add(Me.Label8)\r
         Me.Controls.Add(Me.cliVersion)\r