diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/Handbrake/My Project/Settings.Designer.vb | 12 | ||||
| -rw-r--r-- | win/Handbrake/My Project/Settings.settings | 3 | ||||
| -rw-r--r-- | win/Handbrake/app.config | 3 | ||||
| -rw-r--r-- | win/Handbrake/frmMain.resx | 3 | ||||
| -rw-r--r-- | win/Handbrake/frmMain.vb | 28 | ||||
| -rw-r--r-- | win/Handbrake/frmOptions.Designer.vb | 55 | ||||
| -rw-r--r-- | win/Handbrake/frmOptions.vb | 5 |
7 files changed, 92 insertions, 17 deletions
diff --git a/win/Handbrake/My Project/Settings.Designer.vb b/win/Handbrake/My Project/Settings.Designer.vb index 7cb65f961..aba5a6895 100644 --- a/win/Handbrake/My Project/Settings.Designer.vb +++ b/win/Handbrake/My Project/Settings.Designer.vb @@ -508,6 +508,18 @@ Namespace My Me("verbose") = value
End Set
End Property
+
+ <Global.System.Configuration.UserScopedSettingAttribute(), _
+ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
+ Global.System.Configuration.DefaultSettingValueAttribute("Normal")> _
+ Public Property Priority() As String
+ Get
+ Return CType(Me("Priority"),String)
+ End Get
+ Set
+ Me("Priority") = 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 1195a26f8..d96875001 100644 --- a/win/Handbrake/My Project/Settings.settings +++ b/win/Handbrake/My Project/Settings.settings @@ -116,5 +116,8 @@ <Setting Name="verbose" Type="System.Int32" Scope="User">
<Value Profile="(Default)" />
</Setting>
+ <Setting Name="Priority" Type="System.String" Scope="User">
+ <Value Profile="(Default)">Normal</Value>
+ </Setting>
</Settings>
</SettingsFile>
\ No newline at end of file diff --git a/win/Handbrake/app.config b/win/Handbrake/app.config index 6f69f12a6..fe54bf138 100644 --- a/win/Handbrake/app.config +++ b/win/Handbrake/app.config @@ -140,6 +140,9 @@ <setting name="largeFile" serializeAs="String">
<value />
</setting>
+ <setting name="Priority" serializeAs="String">
+ <value>Normal</value>
+ </setting>
</Handbrake.My.MySettings>
</userSettings>
</configuration>
diff --git a/win/Handbrake/frmMain.resx b/win/Handbrake/frmMain.resx index 752b751bb..653be2fe3 100644 --- a/win/Handbrake/frmMain.resx +++ b/win/Handbrake/frmMain.resx @@ -175,9 +175,6 @@ <metadata name="File_Save.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>234, 18</value>
</metadata>
- <metadata name="ToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>639, 17</value>
- </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
diff --git a/win/Handbrake/frmMain.vb b/win/Handbrake/frmMain.vb index 546d1ee64..0145d2350 100644 --- a/win/Handbrake/frmMain.vb +++ b/win/Handbrake/frmMain.vb @@ -502,6 +502,25 @@ Public Class frmMain Dim params As String = query
Dim proc As New System.Diagnostics.Process
proc = System.Diagnostics.Process.Start("""" + ApplicationPath + "\hbcli.exe""", params)
+ If My.Settings.Priority <> "Normal" Then
+ Dim level As String
+ level = My.Settings.Priority
+
+ Select Case level
+ Case "Realtime"
+ proc.PriorityClass = ProcessPriorityClass.RealTime
+ Case "High"
+ proc.PriorityClass = ProcessPriorityClass.High
+ Case "Above Normal"
+ proc.PriorityClass = ProcessPriorityClass.AboveNormal
+ Case "Below Normal"
+ proc.PriorityClass = ProcessPriorityClass.BelowNormal
+ Case "Low"
+ proc.PriorityClass = ProcessPriorityClass.Idle
+ End Select
+
+
+ End If
MessageBox.Show("The Handbrake encoder (CLI) will now start and should be encoding your video.", "Alert", MessageBoxButtons.OK, MessageBoxIcon.Asterisk)
@@ -676,6 +695,12 @@ Public Class frmMain text_height.BackColor = Color.White
End Sub
+ Private Sub drp_dvdtitle_click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_dvdtitle.Click
+ If drp_dvdtitle.Items.Count = 1 Then
+ MessageBox.Show("There are no titles to select. Please scan the DVD by clicking the 'browse' button above before trying to select a title.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+ End If
+ End Sub
+
Private Sub drp_dvdtitle_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_dvdtitle.SelectedIndexChanged
' If the title changes then the following text values are no longer correct.
' Maybe automatically update these in later versions.
@@ -683,6 +708,9 @@ Public Class frmMain lbl_RecomendedCrop.Text = "Select a Title"
QueryEditorText.Text = ""
+ ' Check if there are any titles and alert the user if there is not
+
+
' If the title is not automatic then read the dvd.dat file and populate the Subtitles box depending on the title slected.
If drp_dvdtitle.Text <> "Automatic" Then
Dim temp() As String
diff --git a/win/Handbrake/frmOptions.Designer.vb b/win/Handbrake/frmOptions.Designer.vb index 7af20530f..3aa5b4e40 100644 --- a/win/Handbrake/frmOptions.Designer.vb +++ b/win/Handbrake/frmOptions.Designer.vb @@ -34,6 +34,8 @@ Partial Class frmOptions Me.GroupBox3 = New System.Windows.Forms.GroupBox
Me.drp_processors = New System.Windows.Forms.ComboBox
Me.Label11 = New System.Windows.Forms.Label
+ Me.drp_Priority = New System.Windows.Forms.ComboBox
+ Me.Label4 = New System.Windows.Forms.Label
Me.GroupBox1.SuspendLayout()
Me.GroupBox2.SuspendLayout()
Me.GroupBox3.SuspendLayout()
@@ -43,7 +45,7 @@ Partial Class frmOptions '
Me.Label1.AutoSize = True
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.Location = New System.Drawing.Point(13, 22)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(151, 13)
Me.Label1.TabIndex = 0
@@ -53,7 +55,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(20, 48)
+ Me.check_updateCheck.Location = New System.Drawing.Point(16, 43)
Me.check_updateCheck.Name = "check_updateCheck"
Me.check_updateCheck.Size = New System.Drawing.Size(71, 17)
Me.check_updateCheck.TabIndex = 1
@@ -66,7 +68,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(292, 387)
+ Me.btn_close.Location = New System.Drawing.Point(291, 403)
Me.btn_close.Name = "btn_close"
Me.btn_close.Size = New System.Drawing.Size(107, 22)
Me.btn_close.TabIndex = 45
@@ -77,7 +79,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(20, 98)
+ Me.check_userDefaultSettings.Location = New System.Drawing.Point(16, 93)
Me.check_userDefaultSettings.Name = "check_userDefaultSettings"
Me.check_userDefaultSettings.Size = New System.Drawing.Size(71, 17)
Me.check_userDefaultSettings.TabIndex = 47
@@ -88,7 +90,7 @@ Partial Class frmOptions '
Me.Label2.AutoSize = True
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.Location = New System.Drawing.Point(13, 72)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(229, 13)
Me.Label2.TabIndex = 46
@@ -98,7 +100,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(20, 151)
+ Me.check_readDVDWindow.Location = New System.Drawing.Point(16, 146)
Me.check_readDVDWindow.Name = "check_readDVDWindow"
Me.check_readDVDWindow.Size = New System.Drawing.Size(71, 17)
Me.check_readDVDWindow.TabIndex = 49
@@ -109,7 +111,7 @@ Partial Class frmOptions '
Me.Label3.AutoSize = True
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.Location = New System.Drawing.Point(13, 124)
Me.Label3.Name = "Label3"
Me.Label3.Size = New System.Drawing.Size(215, 13)
Me.Label3.TabIndex = 48
@@ -119,7 +121,7 @@ Partial Class frmOptions '
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, 306)
+ Me.GroupBox1.Location = New System.Drawing.Point(12, 327)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(386, 70)
Me.GroupBox1.TabIndex = 50
@@ -148,7 +150,7 @@ Partial Class frmOptions 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.Size = New System.Drawing.Size(386, 175)
Me.GroupBox2.TabIndex = 51
Me.GroupBox2.TabStop = False
Me.GroupBox2.Text = "General Settings"
@@ -160,12 +162,14 @@ Partial Class frmOptions '
'GroupBox3
'
+ Me.GroupBox3.Controls.Add(Me.drp_Priority)
+ Me.GroupBox3.Controls.Add(Me.Label4)
Me.GroupBox3.Controls.Add(Me.drp_processors)
Me.GroupBox3.Controls.Add(Me.Label11)
Me.GroupBox3.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.GroupBox3.Location = New System.Drawing.Point(13, 211)
+ Me.GroupBox3.Location = New System.Drawing.Point(13, 193)
Me.GroupBox3.Name = "GroupBox3"
- Me.GroupBox3.Size = New System.Drawing.Size(386, 89)
+ Me.GroupBox3.Size = New System.Drawing.Size(386, 128)
Me.GroupBox3.TabIndex = 52
Me.GroupBox3.TabStop = False
Me.GroupBox3.Text = "Processor Detection"
@@ -176,7 +180,7 @@ Partial Class frmOptions Me.drp_processors.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.drp_processors.FormattingEnabled = True
Me.drp_processors.Items.AddRange(New Object() {"Automatic", "1", "2", "3", "4", "5", "6", "7", "8"})
- Me.drp_processors.Location = New System.Drawing.Point(19, 50)
+ Me.drp_processors.Location = New System.Drawing.Point(15, 40)
Me.drp_processors.Name = "drp_processors"
Me.drp_processors.Size = New System.Drawing.Size(111, 21)
Me.drp_processors.TabIndex = 41
@@ -185,17 +189,38 @@ Partial Class frmOptions '
Me.Label11.AutoSize = True
Me.Label11.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.Label11.Location = New System.Drawing.Point(16, 27)
+ Me.Label11.Location = New System.Drawing.Point(12, 22)
Me.Label11.Name = "Label11"
Me.Label11.Size = New System.Drawing.Size(142, 13)
Me.Label11.TabIndex = 40
Me.Label11.Text = "Number of processors: "
'
+ 'drp_Priority
+ '
+ Me.drp_Priority.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+ Me.drp_Priority.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.drp_Priority.FormattingEnabled = True
+ Me.drp_Priority.Items.AddRange(New Object() {"Realtime", "High", "Above Normal", "Normal", "Below Normal", "Low"})
+ Me.drp_Priority.Location = New System.Drawing.Point(15, 91)
+ Me.drp_Priority.Name = "drp_Priority"
+ Me.drp_Priority.Size = New System.Drawing.Size(111, 21)
+ Me.drp_Priority.TabIndex = 43
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Font = New System.Drawing.Font("Verdana", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.Label4.Location = New System.Drawing.Point(12, 73)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(132, 13)
+ Me.Label4.TabIndex = 42
+ Me.Label4.Text = "Default Priority Level:"
+ '
'frmOptions
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(411, 421)
+ Me.ClientSize = New System.Drawing.Size(411, 435)
Me.Controls.Add(Me.GroupBox3)
Me.Controls.Add(Me.GroupBox2)
Me.Controls.Add(Me.GroupBox1)
@@ -227,4 +252,6 @@ Partial Class frmOptions Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
Friend WithEvents drp_processors As System.Windows.Forms.ComboBox
Friend WithEvents Label11 As System.Windows.Forms.Label
+ Friend WithEvents drp_Priority As System.Windows.Forms.ComboBox
+ Friend WithEvents Label4 As System.Windows.Forms.Label
End Class
diff --git a/win/Handbrake/frmOptions.vb b/win/Handbrake/frmOptions.vb index a3158e8b6..f9e4326ab 100644 --- a/win/Handbrake/frmOptions.vb +++ b/win/Handbrake/frmOptions.vb @@ -36,6 +36,7 @@ Public Class frmOptions End If
drp_processors.Text = My.Settings.Processors
+ drp_Priority.Text = My.Settings.Priority
Catch ex As Exception
MessageBox.Show("ERROR: " & ex.ToString)
@@ -115,4 +116,8 @@ Public Class frmOptions Private Sub drp_processors_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_processors.SelectedIndexChanged
My.Settings.Processors = drp_processors.Text
End Sub
+
+ Private Sub ComboBox1_SelectedIndexChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles drp_Priority.SelectedIndexChanged
+ My.Settings.Priority = drp_Priority.Text
+ End Sub
End Class
\ No newline at end of file |