diff options
| author | sr55 <[email protected]> | 2007-06-26 18:10:51 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2007-06-26 18:10:51 +0000 |
| commit | b867f415ef36790ec568e2588f2bed2d9b494ece (patch) | |
| tree | 4be56bf8db0a255451704bf62bf0b894e831a175 | |
| parent | 219d834f145fed289fe2f641d5c16d221a1941c2 (diff) | |
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
| -rw-r--r-- | win/Handbrake.suo | bin | 29184 -> 29184 bytes | |||
| -rw-r--r-- | win/Handbrake/My Project/Settings.Designer.vb | 11 | ||||
| -rw-r--r-- | win/Handbrake/My Project/Settings.settings | 3 | ||||
| -rw-r--r-- | win/Handbrake/frmMain.Designer.vb | 61 | ||||
| -rw-r--r-- | win/Handbrake/frmMain.vb | 88 | ||||
| -rw-r--r-- | win/Handbrake/frmOptions.Designer.vb | 94 | ||||
| -rw-r--r-- | win/Handbrake/frmOptions.resx | 3 | ||||
| -rw-r--r-- | win/Handbrake/frmOptions.vb | 25 | ||||
| -rw-r--r-- | win/Handbrake/frmQueue.Designer.vb | 52 | ||||
| -rw-r--r-- | win/Handbrake/frmQueue.vb | 37 | ||||
| -rw-r--r-- | win/Handbrake/frmUpdate.Designer.vb | 10 |
11 files changed, 278 insertions, 106 deletions
diff --git a/win/Handbrake.suo b/win/Handbrake.suo Binary files differindex c854eb91b..33d942236 100644 --- a/win/Handbrake.suo +++ b/win/Handbrake.suo diff --git a/win/Handbrake/My Project/Settings.Designer.vb b/win/Handbrake/My Project/Settings.Designer.vb index a88432cfa..7c1a128a5 100644 --- 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
End Set
End Property
+
+ <Global.System.Configuration.UserScopedSettingAttribute(), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute()> _
+ Public Property verbose() As Integer
+ Get
+ Return CType(Me("verbose"),Integer)
+ End Get
+ Set
+ Me("verbose") = value
+ End Set
+ End Property
End Class
End Namespace
diff --git a/win/Handbrake/My Project/Settings.settings b/win/Handbrake/My Project/Settings.settings index 7287b45d3..c8afbbd0f 100644 --- 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">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="verbose" Type="System.Int32" Scope="User">
+ <Value Profile="(Default)" />
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file diff --git a/win/Handbrake/frmMain.Designer.vb b/win/Handbrake/frmMain.Designer.vb index 873e8330c..7ef6d2f5f 100644 --- 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
Me.mnu_exit = New System.Windows.Forms.ToolStripMenuItem
Me.ToolsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem
- Me.mnu_encode = New System.Windows.Forms.ToolStripMenuItem
Me.mnu_viewDVDdata = New System.Windows.Forms.ToolStripMenuItem
Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator
Me.mnu_options = New System.Windows.Forms.ToolStripMenuItem
@@ -230,6 +229,7 @@ Partial Class frmMain Me.DVD_Save = New System.Windows.Forms.SaveFileDialog
Me.File_Save = New System.Windows.Forms.SaveFileDialog
Me.lbl_update = New System.Windows.Forms.Label
+ Me.mnu_encode = New System.Windows.Forms.ToolStripMenuItem
Label38 = New System.Windows.Forms.Label
Me.frmMainMenu.SuspendLayout()
Me.GroupBox4.SuspendLayout()
@@ -260,7 +260,7 @@ Partial Class frmMain Me.frmMainMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FileToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.PresetsToolStripMenuItem, Me.HelpToolStripMenuItem})
Me.frmMainMenu.Location = New System.Drawing.Point(0, 0)
Me.frmMainMenu.Name = "frmMainMenu"
- Me.frmMainMenu.Size = New System.Drawing.Size(700, 24)
+ Me.frmMainMenu.Size = New System.Drawing.Size(675, 24)
Me.frmMainMenu.TabIndex = 0
Me.frmMainMenu.Text = "MenuStrip1"
'
@@ -318,12 +318,6 @@ Partial Class frmMain Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(44, 20)
Me.ToolsToolStripMenuItem.Text = "&Tools"
'
- 'mnu_encode
- '
- Me.mnu_encode.Name = "mnu_encode"
- Me.mnu_encode.Size = New System.Drawing.Size(155, 22)
- Me.mnu_encode.Text = "Encode Queue"
- '
'mnu_viewDVDdata
'
Me.mnu_viewDVDdata.Name = "mnu_viewDVDdata"
@@ -470,9 +464,9 @@ Partial Class frmMain Me.GroupBox4.Controls.Add(Me.Label12)
Me.GroupBox4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.GroupBox4.ForeColor = System.Drawing.Color.Black
- Me.GroupBox4.Location = New System.Drawing.Point(15, 159)
+ Me.GroupBox4.Location = New System.Drawing.Point(15, 157)
Me.GroupBox4.Name = "GroupBox4"
- Me.GroupBox4.Size = New System.Drawing.Size(668, 126)
+ Me.GroupBox4.Size = New System.Drawing.Size(647, 126)
Me.GroupBox4.TabIndex = 406
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Destination"
@@ -635,7 +629,7 @@ Partial Class frmMain Me.GroupBox1.ForeColor = System.Drawing.Color.Black
Me.GroupBox1.Location = New System.Drawing.Point(15, 35)
Me.GroupBox1.Name = "GroupBox1"
- Me.GroupBox1.Size = New System.Drawing.Size(668, 116)
+ Me.GroupBox1.Size = New System.Drawing.Size(647, 116)
Me.GroupBox1.TabIndex = 407
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Source"
@@ -781,7 +775,7 @@ Partial Class frmMain Me.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_encode.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_encode.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_encode.Location = New System.Drawing.Point(559, 591)
+ Me.btn_encode.Location = New System.Drawing.Point(534, 590)
Me.btn_encode.Name = "btn_encode"
Me.btn_encode.Size = New System.Drawing.Size(124, 22)
Me.btn_encode.TabIndex = 19
@@ -796,7 +790,7 @@ Partial Class frmMain Me.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_queue.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_queue.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_queue.Location = New System.Drawing.Point(428, 591)
+ Me.btn_queue.Location = New System.Drawing.Point(403, 590)
Me.btn_queue.Name = "btn_queue"
Me.btn_queue.Size = New System.Drawing.Size(124, 22)
Me.btn_queue.TabIndex = 412
@@ -817,7 +811,7 @@ Partial Class frmMain Me.h264Tab.Location = New System.Drawing.Point(4, 22)
Me.h264Tab.Name = "h264Tab"
Me.h264Tab.Padding = New System.Windows.Forms.Padding(3)
- Me.h264Tab.Size = New System.Drawing.Size(660, 268)
+ Me.h264Tab.Size = New System.Drawing.Size(639, 268)
Me.h264Tab.TabIndex = 5
Me.h264Tab.Text = "H.264"
'
@@ -855,7 +849,7 @@ Partial Class frmMain Me.btn_h264Clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_h264Clear.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_h264Clear.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_h264Clear.Location = New System.Drawing.Point(565, 50)
+ Me.btn_h264Clear.Location = New System.Drawing.Point(542, 50)
Me.btn_h264Clear.Name = "btn_h264Clear"
Me.btn_h264Clear.Size = New System.Drawing.Size(79, 23)
Me.btn_h264Clear.TabIndex = 45
@@ -877,7 +871,7 @@ Partial Class frmMain Me.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.rtf_h264advanced.Location = New System.Drawing.Point(16, 79)
Me.rtf_h264advanced.Name = "rtf_h264advanced"
- Me.rtf_h264advanced.Size = New System.Drawing.Size(628, 123)
+ Me.rtf_h264advanced.Size = New System.Drawing.Size(605, 123)
Me.rtf_h264advanced.TabIndex = 41
Me.rtf_h264advanced.Text = ""
'
@@ -900,7 +894,7 @@ Partial Class frmMain Me.TabPage4.Location = New System.Drawing.Point(4, 22)
Me.TabPage4.Name = "TabPage4"
Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage4.Size = New System.Drawing.Size(660, 268)
+ Me.TabPage4.Size = New System.Drawing.Size(639, 268)
Me.TabPage4.TabIndex = 4
Me.TabPage4.Text = "Advanced Settings"
'
@@ -953,7 +947,7 @@ Partial Class frmMain Me.TabPage2.Location = New System.Drawing.Point(4, 22)
Me.TabPage2.Name = "TabPage2"
Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage2.Size = New System.Drawing.Size(660, 268)
+ Me.TabPage2.Size = New System.Drawing.Size(639, 268)
Me.TabPage2.TabIndex = 3
Me.TabPage2.Text = "Audio Settings"
'
@@ -1102,7 +1096,7 @@ Partial Class frmMain Me.TabPage3.Location = New System.Drawing.Point(4, 22)
Me.TabPage3.Name = "TabPage3"
Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage3.Size = New System.Drawing.Size(660, 268)
+ Me.TabPage3.Size = New System.Drawing.Size(639, 268)
Me.TabPage3.TabIndex = 2
Me.TabPage3.Text = "Video Settings"
'
@@ -1386,7 +1380,7 @@ Partial Class frmMain Me.TabPage1.Location = New System.Drawing.Point(4, 22)
Me.TabPage1.Name = "TabPage1"
Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage1.Size = New System.Drawing.Size(660, 268)
+ Me.TabPage1.Size = New System.Drawing.Size(639, 268)
Me.TabPage1.TabIndex = 0
Me.TabPage1.Text = "Picture Settings"
'
@@ -1395,7 +1389,7 @@ Partial Class frmMain Me.drp_subtitle.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.drp_subtitle.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.drp_subtitle.FormattingEnabled = True
- Me.drp_subtitle.Location = New System.Drawing.Point(404, 36)
+ Me.drp_subtitle.Location = New System.Drawing.Point(381, 36)
Me.drp_subtitle.Name = "drp_subtitle"
Me.drp_subtitle.Size = New System.Drawing.Size(213, 21)
Me.drp_subtitle.TabIndex = 42
@@ -1405,7 +1399,7 @@ Partial Class frmMain '
Me.Label19.AutoSize = True
Me.Label19.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label19.Location = New System.Drawing.Point(334, 13)
+ Me.Label19.Location = New System.Drawing.Point(311, 13)
Me.Label19.Name = "Label19"
Me.Label19.Size = New System.Drawing.Size(64, 13)
Me.Label19.TabIndex = 39
@@ -1454,7 +1448,7 @@ Partial Class frmMain '
Me.Label21.AutoSize = True
Me.Label21.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label21.Location = New System.Drawing.Point(401, 63)
+ Me.Label21.Location = New System.Drawing.Point(378, 63)
Me.Label21.Name = "Label21"
Me.Label21.Size = New System.Drawing.Size(224, 26)
Me.Label21.TabIndex = 34
@@ -1464,7 +1458,7 @@ Partial Class frmMain '
Me.Label20.AutoSize = True
Me.Label20.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label20.Location = New System.Drawing.Point(337, 39)
+ Me.Label20.Location = New System.Drawing.Point(314, 39)
Me.Label20.Name = "Label20"
Me.Label20.Size = New System.Drawing.Size(61, 13)
Me.Label20.TabIndex = 33
@@ -1574,7 +1568,7 @@ Partial Class frmMain Me.advancedOptions.Location = New System.Drawing.Point(15, 291)
Me.advancedOptions.Name = "advancedOptions"
Me.advancedOptions.SelectedIndex = 0
- Me.advancedOptions.Size = New System.Drawing.Size(668, 294)
+ Me.advancedOptions.Size = New System.Drawing.Size(647, 294)
Me.advancedOptions.TabIndex = 410
Me.advancedOptions.TabStop = False
'
@@ -1589,7 +1583,7 @@ Partial Class frmMain Me.TabPage6.Location = New System.Drawing.Point(4, 22)
Me.TabPage6.Name = "TabPage6"
Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
- Me.TabPage6.Size = New System.Drawing.Size(660, 268)
+ Me.TabPage6.Size = New System.Drawing.Size(639, 268)
Me.TabPage6.TabIndex = 6
Me.TabPage6.Text = "Query Editor"
'
@@ -1619,7 +1613,7 @@ Partial Class frmMain Me.btn_ClearQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_ClearQuery.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_ClearQuery.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_ClearQuery.Location = New System.Drawing.Point(566, 73)
+ Me.btn_ClearQuery.Location = New System.Drawing.Point(542, 73)
Me.btn_ClearQuery.Name = "btn_ClearQuery"
Me.btn_ClearQuery.Size = New System.Drawing.Size(79, 23)
Me.btn_ClearQuery.TabIndex = 39
@@ -1644,7 +1638,7 @@ Partial Class frmMain Me.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.QueryEditorText.Location = New System.Drawing.Point(16, 102)
Me.QueryEditorText.Name = "QueryEditorText"
- Me.QueryEditorText.Size = New System.Drawing.Size(629, 139)
+ Me.QueryEditorText.Size = New System.Drawing.Size(605, 139)
Me.QueryEditorText.TabIndex = 41
Me.QueryEditorText.Text = ""
'
@@ -2348,11 +2342,17 @@ Partial Class frmMain Me.lbl_update.Text = "- A New Version is available!"
Me.lbl_update.Visible = False
'
+ 'mnu_encode
+ '
+ Me.mnu_encode.Name = "mnu_encode"
+ Me.mnu_encode.Size = New System.Drawing.Size(155, 22)
+ Me.mnu_encode.Text = "Encode Queue"
+ '
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(700, 621)
+ Me.ClientSize = New System.Drawing.Size(675, 621)
Me.Controls.Add(Me.lbl_update)
Me.Controls.Add(Me.btn_queue)
Me.Controls.Add(Me.btn_encode)
@@ -2364,6 +2364,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MainMenuStrip = Me.frmMainMenu
Me.MaximumSize = New System.Drawing.Size(878, 750)
+ Me.MinimumSize = New System.Drawing.Size(683, 648)
Me.Name = "frmMain"
Me.Text = "Handbrake"
Me.frmMainMenu.ResumeLayout(False)
@@ -2397,7 +2398,6 @@ Partial Class frmMain Friend WithEvents toolStripSeparator2 As System.Windows.Forms.ToolStripSeparator
Friend WithEvents mnu_exit As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents ToolsToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
- Friend WithEvents mnu_encode As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents HelpToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents mnu_about As System.Windows.Forms.ToolStripMenuItem
Friend WithEvents GroupBox4 As System.Windows.Forms.GroupBox
@@ -2599,5 +2599,6 @@ Partial Class frmMain Friend WithEvents check_largeFile As System.Windows.Forms.CheckBox
Friend WithEvents Label37 As System.Windows.Forms.Label
Friend WithEvents Label41 As System.Windows.Forms.Label
+ Friend WithEvents mnu_encode As System.Windows.Forms.ToolStripMenuItem
End Class
diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb index 1bffcd51e..5b4ec26f2 100644 --- a/win/Handbrake/frmMain.vb +++ b/win/Handbrake/frmMain.vb @@ -191,9 +191,9 @@ Public Class frmMain StreamWriter.WriteLine(CRF)
StreamWriter.WriteLine(advH264)
StreamWriter.Close()
- MessageBox.Show("Your profile has been sucessfully saved.", "STATUS", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
+ MessageBox.Show("Your profile has been sucessfully saved.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
Catch
- 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)
+ 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)
End Try
End If
End Sub
@@ -246,7 +246,7 @@ Public Class frmMain SliderValue.Text = slider_videoQuality.Value & "%"
Catch ex As Exception
- MessageBox.Show("Unable to load profile.", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)
+ MessageBox.Show("Unable to load profile.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)
End Try
End If
@@ -459,7 +459,7 @@ Public Class frmMain lAvailableSpace = Drv.AvailableSpace
lAvailableSpace = lAvailableSpace / 1024 / 1024 / 1024
If lAvailableSpace < 4 Then
- MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ MessageBox.Show("Low on Disk Space. There is: " & lAvailableSpace & "GB Available", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
End If
Dim lTotalSpace As Long
@@ -499,33 +499,34 @@ Public Class frmMain Dim ApplicationPath As String = Application.StartupPath
If (frmQueue.list_queue.Items.Count > 0) Then
- 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)
+ 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." _
+ , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
End If
- Try
- If (QueryEditorText.Text = "") Then
- query = GenerateTheQuery()
- Shell("""" + ApplicationPath + "\hbcli.exe""" + query)
- MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
-
- 'Lets start the process monitor to keep an eye on things.
- hbcliMonitor = New ProcessMonitor()
- Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)
- t.Start()
- Else
- query = QueryEditorText.Text
- Shell("""" + ApplicationPath + "\hbcli.exe""" + query)
- MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "ALERT", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
-
- 'Lets start the process monitor to keep an eye on things.
- hbcliMonitor = New ProcessMonitor()
- Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)
- t.Start()
- End If
- Catch ex As Exception
- MessageBox.Show("Unable to Launch the Encoder.")
- MessageBox.Show(ex.ToString) ' Debug
- End Try
+ Try
+ If (QueryEditorText.Text = "") Then
+ query = GenerateTheQuery()
+ Shell("""" + ApplicationPath + "\hbcli.exe""" + query)
+ MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
+
+ 'Lets start the process monitor to keep an eye on things.
+ hbcliMonitor = New ProcessMonitor()
+ Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)
+ t.Start()
+ Else
+ query = QueryEditorText.Text
+ Shell("""" + ApplicationPath + "\hbcli.exe""" + query)
+ MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
+
+ 'Lets start the process monitor to keep an eye on things.
+ hbcliMonitor = New ProcessMonitor()
+ Dim t = New Thread(AddressOf hbcliMonitor.tmrProcCheck)
+ t.Start()
+ End If
+ Catch ex As Exception
+ MessageBox.Show("Unable to launch the HandBrake encoder.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error)
+ MessageBox.Show(ex.ToString) ' Debug
+ End Try
End Sub
@@ -545,10 +546,10 @@ Public Class frmMain Try
If (chapterFinish < chapterStart) Then
- MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ MessageBox.Show("Invalid Chapter Range! - Final chapter can not be smaller than the starting chapter.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
End If
Catch ex As Exception
- MessageBox.Show("Invalid Character Entered")
+ MessageBox.Show("Invalid Character Entered!", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)
End Try
End Sub
@@ -558,10 +559,10 @@ Public Class frmMain Try
If (chapterStart > chapterFinish) Then
- MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ MessageBox.Show("Invalid Chapter Range! - Start chapter can not be larger than the Final chapter.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
End If
Catch ex As Exception
- MessageBox.Show("Invalid Character Entered", "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Hand)
+ MessageBox.Show("Invalid Character Entered", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)
End Try
End Sub
@@ -936,7 +937,7 @@ Public Class frmMain If (source = "") Then
- MessageBox.Show("No Source has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ MessageBox.Show("No Source has been selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
Else
source = " -i " + """" + source + """"
End If
@@ -953,6 +954,8 @@ Public Class frmMain dvdChapter = ""
ElseIf (chapterFinish = totalChapters & chapterStart > 1) Then
dvdChapter = ""
+ ElseIf chapterFinish = chapterStart Then
+ dvdChapter = " -c " + chapterStart
Else
dvdChapter = " -c " + chapterStart + "-" + chapterFinish
End If
@@ -968,7 +971,7 @@ Public Class frmMain Dim height As String = text_height.Text
If (destination = "") Then
- MessageBox.Show("No destination has been selected.", "WARNING", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ MessageBox.Show("No destination has been selected.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
Else
destination = " -o " + """" + destination + """"
End If
@@ -1208,7 +1211,15 @@ Public Class frmMain Dim queryAdvancedSettings As String = processors
'----------------------------------------------------------------------
- Return querySource + queryDestination + queryPictureSettings + queryVideoSettings + h264Settings + queryAudioSettings + queryAdvancedSettings
+ ' Verbose option
+ Dim verbose As String = ""
+ If My.Settings.verbose = 1 Then
+ verbose = " -v "
+ End If
+ '----------------------------------------------------------------------
+
+
+ Return querySource + queryDestination + queryPictureSettings + queryVideoSettings + h264Settings + queryAudioSettings + queryAdvancedSettings + verbose
End Function
@@ -1258,9 +1269,4 @@ Public Class frmMain End Sub
'-----------------------------------------------
-
-
- Private Sub TabPage1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles TabPage1.Click
-
- End Sub
End Class
\ No newline at end of file diff --git a/win/Handbrake/frmOptions.Designer.vb b/win/Handbrake/frmOptions.Designer.vb index 4e1bd37e7..05278026b 100644 --- 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
Me.check_readDVDWindow = New System.Windows.Forms.CheckBox
Me.Label3 = New System.Windows.Forms.Label
+ Me.GroupBox1 = New System.Windows.Forms.GroupBox
+ Me.check_verbose = New System.Windows.Forms.CheckBox
+ Me.GroupBox2 = New System.Windows.Forms.GroupBox
+ Me.File_Save = New System.Windows.Forms.SaveFileDialog
+ Me.GroupBox1.SuspendLayout()
+ Me.GroupBox2.SuspendLayout()
Me.SuspendLayout()
'
'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label1.Location = New System.Drawing.Point(9, 11)
+ Me.Label1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label1.Location = New System.Drawing.Point(17, 27)
Me.Label1.Name = "Label1"
- Me.Label1.Size = New System.Drawing.Size(168, 13)
+ Me.Label1.Size = New System.Drawing.Size(151, 13)
Me.Label1.TabIndex = 0
Me.Label1.Text = "Update Check on Startup"
'
@@ -43,7 +49,7 @@ Partial Class frmOptions '
Me.check_updateCheck.AutoSize = True
Me.check_updateCheck.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.check_updateCheck.Location = New System.Drawing.Point(12, 32)
+ Me.check_updateCheck.Location = New System.Drawing.Point(20, 48)
Me.check_updateCheck.Name = "check_updateCheck"
Me.check_updateCheck.Size = New System.Drawing.Size(71, 17)
Me.check_updateCheck.TabIndex = 1
@@ -56,7 +62,7 @@ Partial Class frmOptions Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_close.Location = New System.Drawing.Point(257, 171)
+ Me.btn_close.Location = New System.Drawing.Point(292, 287)
Me.btn_close.Name = "btn_close"
Me.btn_close.Size = New System.Drawing.Size(107, 22)
Me.btn_close.TabIndex = 45
@@ -67,7 +73,7 @@ Partial Class frmOptions '
Me.check_userDefaultSettings.AutoSize = True
Me.check_userDefaultSettings.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.check_userDefaultSettings.Location = New System.Drawing.Point(12, 82)
+ Me.check_userDefaultSettings.Location = New System.Drawing.Point(20, 98)
Me.check_userDefaultSettings.Name = "check_userDefaultSettings"
Me.check_userDefaultSettings.Size = New System.Drawing.Size(71, 17)
Me.check_userDefaultSettings.TabIndex = 47
@@ -77,10 +83,10 @@ Partial Class frmOptions 'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label2.Location = New System.Drawing.Point(9, 61)
+ Me.Label2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label2.Location = New System.Drawing.Point(17, 77)
Me.Label2.Name = "Label2"
- Me.Label2.Size = New System.Drawing.Size(259, 13)
+ Me.Label2.Size = New System.Drawing.Size(229, 13)
Me.Label2.TabIndex = 46
Me.Label2.Text = "Load Users Default Settings on Startup"
'
@@ -88,7 +94,7 @@ Partial Class frmOptions '
Me.check_readDVDWindow.AutoSize = True
Me.check_readDVDWindow.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.check_readDVDWindow.Location = New System.Drawing.Point(12, 135)
+ Me.check_readDVDWindow.Location = New System.Drawing.Point(20, 151)
Me.check_readDVDWindow.Name = "check_readDVDWindow"
Me.check_readDVDWindow.Size = New System.Drawing.Size(71, 17)
Me.check_readDVDWindow.TabIndex = 49
@@ -98,31 +104,73 @@ Partial Class frmOptions 'Label3
'
Me.Label3.AutoSize = True
- Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label3.Location = New System.Drawing.Point(9, 113)
+ Me.Label3.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label3.Location = New System.Drawing.Point(17, 129)
Me.Label3.Name = "Label3"
- Me.Label3.Size = New System.Drawing.Size(238, 13)
+ Me.Label3.Size = New System.Drawing.Size(215, 13)
Me.Label3.TabIndex = 48
Me.Label3.Text = "Show Select DVD window on startup"
'
+ 'GroupBox1
+ '
+ Me.GroupBox1.Controls.Add(Me.check_verbose)
+ Me.GroupBox1.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox1.Location = New System.Drawing.Point(12, 211)
+ Me.GroupBox1.Name = "GroupBox1"
+ Me.GroupBox1.Size = New System.Drawing.Size(386, 70)
+ Me.GroupBox1.TabIndex = 50
+ Me.GroupBox1.TabStop = False
+ Me.GroupBox1.Text = "Verbose Mode"
+ '
+ 'check_verbose
+ '
+ Me.check_verbose.AutoSize = True
+ Me.check_verbose.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.check_verbose.Location = New System.Drawing.Point(20, 31)
+ Me.check_verbose.Name = "check_verbose"
+ Me.check_verbose.Size = New System.Drawing.Size(71, 17)
+ Me.check_verbose.TabIndex = 51
+ Me.check_verbose.Text = "Enabled"
+ Me.check_verbose.UseVisualStyleBackColor = True
+ '
+ 'GroupBox2
+ '
+ Me.GroupBox2.Controls.Add(Me.Label1)
+ Me.GroupBox2.Controls.Add(Me.check_updateCheck)
+ Me.GroupBox2.Controls.Add(Me.check_readDVDWindow)
+ Me.GroupBox2.Controls.Add(Me.Label2)
+ Me.GroupBox2.Controls.Add(Me.Label3)
+ Me.GroupBox2.Controls.Add(Me.check_userDefaultSettings)
+ Me.GroupBox2.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.GroupBox2.Location = New System.Drawing.Point(12, 12)
+ Me.GroupBox2.Name = "GroupBox2"
+ Me.GroupBox2.Size = New System.Drawing.Size(386, 193)
+ Me.GroupBox2.TabIndex = 51
+ Me.GroupBox2.TabStop = False
+ Me.GroupBox2.Text = "General Settings"
+ '
+ 'File_Save
+ '
+ Me.File_Save.DefaultExt = "hb"
+ Me.File_Save.Filter = "txt|*.txt"
+ '
'frmOptions
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(382, 202)
- Me.Controls.Add(Me.check_readDVDWindow)
- Me.Controls.Add(Me.Label3)
- Me.Controls.Add(Me.check_userDefaultSettings)
- Me.Controls.Add(Me.Label2)
+ Me.ClientSize = New System.Drawing.Size(411, 320)
+ Me.Controls.Add(Me.GroupBox2)
+ Me.Controls.Add(Me.GroupBox1)
Me.Controls.Add(Me.btn_close)
- Me.Controls.Add(Me.check_updateCheck)
- Me.Controls.Add(Me.Label1)
Me.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.Name = "frmOptions"
Me.Text = "Options"
+ Me.GroupBox1.ResumeLayout(False)
+ Me.GroupBox1.PerformLayout()
+ Me.GroupBox2.ResumeLayout(False)
+ Me.GroupBox2.PerformLayout()
Me.ResumeLayout(False)
- Me.PerformLayout()
End Sub
Friend WithEvents Label1 As System.Windows.Forms.Label
@@ -132,4 +180,8 @@ Partial Class frmOptions Friend WithEvents Label2 As System.Windows.Forms.Label
Friend WithEvents check_readDVDWindow As System.Windows.Forms.CheckBox
Friend WithEvents Label3 As System.Windows.Forms.Label
+ Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
+ Friend WithEvents check_verbose As System.Windows.Forms.CheckBox
+ Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
+ Friend WithEvents File_Save As System.Windows.Forms.SaveFileDialog
End Class
diff --git a/win/Handbrake/frmOptions.resx b/win/Handbrake/frmOptions.resx index 37f92905a..771d71723 100644 --- a/win/Handbrake/frmOptions.resx +++ b/win/Handbrake/frmOptions.resx @@ -117,6 +117,9 @@ <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
diff --git a/win/Handbrake/frmOptions.vb b/win/Handbrake/frmOptions.vb index 23294e230..297945eb4 100644 --- a/win/Handbrake/frmOptions.vb +++ b/win/Handbrake/frmOptions.vb @@ -31,6 +31,12 @@ Public Class frmOptions check_readDVDWindow.CheckState = CheckState.Unchecked
End If
+ If My.Settings.verbose = 1 Then
+ check_verbose.CheckState = CheckState.Checked
+ Else
+ check_verbose.CheckState = CheckState.Unchecked
+ End If
+
Catch ex As Exception
MessageBox.Show("ERROR: " & ex.ToString)
End Try
@@ -89,4 +95,23 @@ Public Class frmOptions End Try
End If
End Sub
+
+
+ Private Sub check_verbose_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles check_verbose.CheckedChanged
+ If check_verbose.CheckState = 1 Then
+ Try
+ My.Settings.verbose = 1
+ Catch Ex As Exception
+ MessageBox.Show("ERROR: " & Ex.ToString)
+ End Try
+ Else
+ Try
+ My.Settings.verbose = 0
+ Catch Ex As Exception
+ MessageBox.Show("ERROR: " & Ex.ToString)
+ End Try
+ End If
+ End Sub
+
+
End Class
\ No newline at end of file diff --git a/win/Handbrake/frmQueue.Designer.vb b/win/Handbrake/frmQueue.Designer.vb index 28a25c3c6..9ccbb2f2d 100644 --- 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
Me.Label1 = New System.Windows.Forms.Label
Me.btn_delete = New System.Windows.Forms.Button
+ Me.btn_up = New System.Windows.Forms.Button
+ Me.btn_down = New System.Windows.Forms.Button
Me.SuspendLayout()
'
'btn_Close
@@ -34,7 +36,7 @@ Partial Class frmQueue Me.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_Close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_Close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_Close.Location = New System.Drawing.Point(16, 403)
+ Me.btn_Close.Location = New System.Drawing.Point(518, 377)
Me.btn_Close.Name = "btn_Close"
Me.btn_Close.Size = New System.Drawing.Size(124, 22)
Me.btn_Close.TabIndex = 20
@@ -46,9 +48,9 @@ Partial Class frmQueue '
Me.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
Me.list_queue.FormattingEnabled = True
- Me.list_queue.Location = New System.Drawing.Point(16, 34)
+ Me.list_queue.Location = New System.Drawing.Point(12, 40)
Me.list_queue.Name = "list_queue"
- Me.list_queue.Size = New System.Drawing.Size(593, 353)
+ Me.list_queue.Size = New System.Drawing.Size(630, 327)
Me.list_queue.TabIndex = 21
'
'btn_q_encoder
@@ -58,7 +60,7 @@ Partial Class frmQueue Me.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_q_encoder.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_q_encoder.Location = New System.Drawing.Point(485, 403)
+ Me.btn_q_encoder.Location = New System.Drawing.Point(12, 377)
Me.btn_q_encoder.Name = "btn_q_encoder"
Me.btn_q_encoder.Size = New System.Drawing.Size(124, 22)
Me.btn_q_encoder.TabIndex = 22
@@ -69,7 +71,7 @@ Partial Class frmQueue 'Label1
'
Me.Label1.AutoSize = True
- Me.Label1.Location = New System.Drawing.Point(13, 13)
+ Me.Label1.Location = New System.Drawing.Point(12, 17)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(110, 13)
Me.Label1.TabIndex = 23
@@ -82,7 +84,7 @@ Partial Class frmQueue Me.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_delete.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_delete.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_delete.Location = New System.Drawing.Point(355, 403)
+ Me.btn_delete.Location = New System.Drawing.Point(142, 377)
Me.btn_delete.Name = "btn_delete"
Me.btn_delete.Size = New System.Drawing.Size(124, 22)
Me.btn_delete.TabIndex = 24
@@ -90,12 +92,44 @@ Partial Class frmQueue Me.btn_delete.Text = "Delete Item"
Me.btn_delete.UseVisualStyleBackColor = False
'
+ 'btn_up
+ '
+ Me.btn_up.BackColor = System.Drawing.SystemColors.Control
+ Me.btn_up.FlatAppearance.BorderColor = System.Drawing.Color.Black
+ Me.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_up.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btn_up.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
+ Me.btn_up.Location = New System.Drawing.Point(436, 12)
+ Me.btn_up.Name = "btn_up"
+ Me.btn_up.Size = New System.Drawing.Size(100, 22)
+ Me.btn_up.TabIndex = 25
+ Me.btn_up.TabStop = False
+ Me.btn_up.Text = "Move Up"
+ Me.btn_up.UseVisualStyleBackColor = False
+ '
+ 'btn_down
+ '
+ Me.btn_down.BackColor = System.Drawing.SystemColors.Control
+ Me.btn_down.FlatAppearance.BorderColor = System.Drawing.Color.Black
+ Me.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.btn_down.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.btn_down.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
+ Me.btn_down.Location = New System.Drawing.Point(542, 12)
+ Me.btn_down.Name = "btn_down"
+ Me.btn_down.Size = New System.Drawing.Size(100, 22)
+ Me.btn_down.TabIndex = 26
+ Me.btn_down.TabStop = False
+ Me.btn_down.Text = "Move Down"
+ Me.btn_down.UseVisualStyleBackColor = False
+ '
'frmQueue
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(621, 437)
+ Me.ClientSize = New System.Drawing.Size(651, 411)
Me.ControlBox = False
+ Me.Controls.Add(Me.btn_down)
+ Me.Controls.Add(Me.btn_up)
Me.Controls.Add(Me.btn_delete)
Me.Controls.Add(Me.Label1)
Me.Controls.Add(Me.btn_q_encoder)
@@ -103,6 +137,8 @@ Partial Class frmQueue Me.Controls.Add(Me.btn_Close)
Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
Me.MaximizeBox = False
+ Me.MaximumSize = New System.Drawing.Size(659, 438)
+ Me.MinimumSize = New System.Drawing.Size(659, 438)
Me.Name = "frmQueue"
Me.ShowInTaskbar = False
Me.Text = " Queue"
@@ -115,4 +151,6 @@ Partial Class frmQueue Friend WithEvents btn_q_encoder As System.Windows.Forms.Button
Friend WithEvents Label1 As System.Windows.Forms.Label
Friend WithEvents btn_delete As System.Windows.Forms.Button
+ Friend WithEvents btn_up As System.Windows.Forms.Button
+ Friend WithEvents btn_down As System.Windows.Forms.Button
End Class
diff --git a/win/Handbrake/frmQueue.vb b/win/Handbrake/frmQueue.vb index bc1090343..b0786eb98 100644 --- a/win/Handbrake/frmQueue.vb +++ b/win/Handbrake/frmQueue.vb @@ -33,7 +33,8 @@ Public Class frmQueue Try
Shell("""" + ApplicationPath + "\hbcli.exe""" + list_queue.Items.Item(encodeItems))
Catch ex As Exception
- MessageBox.Show("ERROR: No items left on the queue. Code: 01")
+ MessageBox.Show("Unable to launch the encoder. Queue run failed.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)
+ MessageBox.Show(ex.ToString)
End Try
' Lets start the process monitor
@@ -68,7 +69,8 @@ Public Class frmQueue Try
Shell("""" + ApplicationPath + "\hbcli.exe""" + list_queue.Items.Item(encodeItems))
Catch ex As Exception
- MessageBox.Show("Error Code: q1, Please report this error.")
+ MessageBox.Show("Unable to launch the encoder. Queue run failed.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand)
+ MessageBox.Show(ex.ToString)
End Try
' Lets start the process monitor
@@ -132,5 +134,36 @@ Public Class frmQueue End Sub
End Class
+ Private Sub btn_up_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_up.Click
+ Dim count As Integer = list_queue.Items.Count
+ Dim itemToMove As Integer = list_queue.SelectedIndex
+ Dim previousItem As String = ""
+ Dim previousItemint As Integer = 0
+
+ If (itemToMove > 0) Then
+ previousItemint = itemToMove - 1
+ previousItem = list_queue.Items.Item(previousItemint)
+ list_queue.Items.Item(previousItemint) = list_queue.Items.Item(itemToMove)
+ list_queue.Items.Item(itemToMove) = previousItem
+ list_queue.SelectedIndex = list_queue.SelectedIndex - 1
+ End If
+ End Sub
+ Private Sub btn_down_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btn_down.Click
+ Dim count As Integer = list_queue.Items.Count
+ Dim itemToMove As Integer = list_queue.SelectedIndex
+ Dim itemAfter As String = ""
+ Dim itemAfterInt As Integer = 0
+
+
+ MessageBox.Show(count)
+ MessageBox.Show(itemToMove)
+ If (itemToMove < (count - 1)) Then
+ itemAfterInt = itemToMove + 1
+ itemAfter = list_queue.Items.Item(itemAfterInt)
+ list_queue.Items.Item(itemAfterInt) = list_queue.Items.Item(itemToMove)
+ list_queue.Items.Item(itemToMove) = itemAfter
+ list_queue.SelectedIndex = list_queue.SelectedIndex + 1
+ End If
+ End Sub
End Class
\ No newline at end of file diff --git a/win/Handbrake/frmUpdate.Designer.vb b/win/Handbrake/frmUpdate.Designer.vb index b429040d2..8d19bd272 100644 --- 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
Me.Dest_browse.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Dest_browse.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.Dest_browse.Location = New System.Drawing.Point(372, 136)
+ Me.Dest_browse.Location = New System.Drawing.Point(15, 137)
Me.Dest_browse.Name = "Dest_browse"
Me.Dest_browse.Size = New System.Drawing.Size(107, 22)
Me.Dest_browse.TabIndex = 38
@@ -111,11 +111,11 @@ Partial Class frmUpdate Me.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat
Me.btn_close.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.btn_close.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer))
- Me.btn_close.Location = New System.Drawing.Point(12, 136)
+ Me.btn_close.Location = New System.Drawing.Point(360, 137)
Me.btn_close.Name = "btn_close"
- Me.btn_close.Size = New System.Drawing.Size(107, 22)
+ Me.btn_close.Size = New System.Drawing.Size(122, 22)
Me.btn_close.TabIndex = 44
- Me.btn_close.Text = "Close"
+ Me.btn_close.Text = "Close Window"
Me.btn_close.UseVisualStyleBackColor = True
'
'lbl_update
@@ -217,7 +217,7 @@ Partial Class frmUpdate '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(502, 172)
+ Me.ClientSize = New System.Drawing.Size(498, 172)
Me.Controls.Add(Me.lbl_startupStatus)
Me.Controls.Add(Me.Label8)
Me.Controls.Add(Me.cliVersion)
|