diff options
| -rw-r--r-- | win/C#/frmQueue.Designer.cs | 98 | ||||
| -rw-r--r-- | win/C#/frmQueue.cs | 17 | ||||
| -rw-r--r-- | win/C#/frmQueue.resx | 20 |
3 files changed, 111 insertions, 24 deletions
diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs index a8997e1a7..a7fafbfd0 100644 --- a/win/C#/frmQueue.Designer.cs +++ b/win/C#/frmQueue.Designer.cs @@ -50,6 +50,8 @@ namespace Handbrake this.mnu_export = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.mnu_readd = new System.Windows.Forms.ToolStripMenuItem();
+ this.drp_completeOption = new System.Windows.Forms.ToolStripComboBox();
+ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.SaveFile = new System.Windows.Forms.SaveFileDialog();
this.list_queue = new System.Windows.Forms.ListView();
this.Title = new System.Windows.Forms.ColumnHeader();
@@ -70,9 +72,10 @@ namespace Handbrake this.OpenFile = new System.Windows.Forms.OpenFileDialog();
this.lbl_encodeStatus = new System.Windows.Forms.Label();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.panel1 = new System.Windows.Forms.Panel();
- this.panel2 = new System.Windows.Forms.Panel();
this.lbl_encodeOptions = new System.Windows.Forms.Label();
+ this.panel2 = new System.Windows.Forms.Panel();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.panel3 = new System.Windows.Forms.Panel();
this.toolStrip1.SuspendLayout();
this.mnu_queue.SuspendLayout();
this.statusStrip1.SuspendLayout();
@@ -127,11 +130,13 @@ namespace Handbrake this.btn_encode,
this.btn_pause,
this.toolStripSeparator1,
- this.drop_button_queue});
+ this.drop_button_queue,
+ this.drp_completeOption,
+ this.toolStripButton1});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
- this.toolStrip1.Size = new System.Drawing.Size(813, 39);
+ this.toolStrip1.Size = new System.Drawing.Size(789, 39);
this.toolStrip1.TabIndex = 71;
this.toolStrip1.Text = "toolStrip1";
//
@@ -216,6 +221,34 @@ namespace Handbrake this.mnu_readd.ToolTipText = "Readds the currently encoding job back onto the queue.";
this.mnu_readd.Click += new System.EventHandler(this.MnuReaddClick);
//
+ // drp_completeOption
+ //
+ this.drp_completeOption.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.drp_completeOption.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.drp_completeOption.FlatStyle = System.Windows.Forms.FlatStyle.System;
+ this.drp_completeOption.Items.AddRange(new object[] {
+ "Do nothing",
+ "Shutdown",
+ "Suspend",
+ "Hibernate",
+ "Lock system",
+ "Log off",
+ "Quit HandBrake"});
+ this.drp_completeOption.Margin = new System.Windows.Forms.Padding(1, 0, 15, 0);
+ this.drp_completeOption.Name = "drp_completeOption";
+ this.drp_completeOption.Size = new System.Drawing.Size(155, 39);
+ this.drp_completeOption.SelectedIndexChanged += new System.EventHandler(this.CompleteOptionChanged);
+ //
+ // toolStripButton1
+ //
+ this.toolStripButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+ this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
+ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton1.Name = "toolStripButton1";
+ this.toolStripButton1.Size = new System.Drawing.Size(76, 36);
+ this.toolStripButton1.Text = "When Done:";
+ //
// SaveFile
//
this.SaveFile.Filter = "Batch|.bat";
@@ -237,7 +270,7 @@ namespace Handbrake this.list_queue.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
this.list_queue.Location = new System.Drawing.Point(15, 0);
this.list_queue.Name = "list_queue";
- this.list_queue.Size = new System.Drawing.Size(773, 214);
+ this.list_queue.Size = new System.Drawing.Size(759, 199);
this.list_queue.TabIndex = 72;
this.list_queue.UseCompatibleStateImageBehavior = false;
this.list_queue.View = System.Windows.Forms.View.Details;
@@ -330,7 +363,8 @@ namespace Handbrake this.statusStrip1.Location = new System.Drawing.Point(0, 363);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 12, 0);
- this.statusStrip1.Size = new System.Drawing.Size(813, 22);
+ this.statusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional;
+ this.statusStrip1.Size = new System.Drawing.Size(789, 22);
this.statusStrip1.TabIndex = 73;
this.statusStrip1.Text = "statusStrip1";
//
@@ -357,6 +391,7 @@ namespace Handbrake //
// splitContainer1
//
+ this.splitContainer1.BackColor = System.Drawing.Color.Transparent;
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
this.splitContainer1.Location = new System.Drawing.Point(0, 39);
@@ -365,6 +400,8 @@ namespace Handbrake //
// splitContainer1.Panel1
//
+ this.splitContainer1.Panel1.BackColor = System.Drawing.Color.Transparent;
+ this.splitContainer1.Panel1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.splitContainer1.Panel1.Controls.Add(this.lbl_encodeOptions);
this.splitContainer1.Panel1.Controls.Add(this.label3);
this.splitContainer1.Panel1.Controls.Add(this.lbl_dest);
@@ -375,42 +412,54 @@ namespace Handbrake // splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.list_queue);
+ this.splitContainer1.Panel2.Controls.Add(this.panel3);
this.splitContainer1.Panel2.Controls.Add(this.panel2);
this.splitContainer1.Panel2.Controls.Add(this.panel1);
- this.splitContainer1.Size = new System.Drawing.Size(813, 324);
+ this.splitContainer1.Size = new System.Drawing.Size(789, 324);
this.splitContainer1.SplitterDistance = 106;
this.splitContainer1.TabIndex = 74;
//
- // panel1
+ // lbl_encodeOptions
//
- this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
- this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(15, 214);
- this.panel1.TabIndex = 0;
+ this.lbl_encodeOptions.AutoEllipsis = true;
+ this.lbl_encodeOptions.Location = new System.Drawing.Point(117, 73);
+ this.lbl_encodeOptions.Name = "lbl_encodeOptions";
+ this.lbl_encodeOptions.Size = new System.Drawing.Size(671, 33);
+ this.lbl_encodeOptions.TabIndex = 74;
+ this.lbl_encodeOptions.Text = "-";
//
// panel2
//
+ this.panel2.BackColor = System.Drawing.Color.Transparent;
this.panel2.Dock = System.Windows.Forms.DockStyle.Right;
- this.panel2.Location = new System.Drawing.Point(788, 0);
+ this.panel2.Location = new System.Drawing.Point(774, 0);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(25, 214);
+ this.panel2.Size = new System.Drawing.Size(15, 214);
this.panel2.TabIndex = 1;
//
- // lbl_encodeOptions
+ // panel1
//
- this.lbl_encodeOptions.AutoEllipsis = true;
- this.lbl_encodeOptions.Location = new System.Drawing.Point(117, 73);
- this.lbl_encodeOptions.Name = "lbl_encodeOptions";
- this.lbl_encodeOptions.Size = new System.Drawing.Size(671, 33);
- this.lbl_encodeOptions.TabIndex = 74;
- this.lbl_encodeOptions.Text = "-";
+ this.panel1.BackColor = System.Drawing.Color.Transparent;
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Left;
+ this.panel1.Location = new System.Drawing.Point(0, 0);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(15, 214);
+ this.panel1.TabIndex = 0;
+ //
+ // panel3
+ //
+ this.panel3.BackColor = System.Drawing.Color.Transparent;
+ this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel3.Location = new System.Drawing.Point(15, 199);
+ this.panel3.Name = "panel3";
+ this.panel3.Size = new System.Drawing.Size(759, 15);
+ this.panel3.TabIndex = 73;
//
// frmQueue
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(813, 385);
+ this.ClientSize = new System.Drawing.Size(789, 385);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.toolStrip1);
@@ -474,5 +523,8 @@ namespace Handbrake private System.Windows.Forms.Panel panel2;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label lbl_encodeOptions;
+ private System.Windows.Forms.ToolStripComboBox drp_completeOption;
+ private System.Windows.Forms.ToolStripButton toolStripButton1;
+ private System.Windows.Forms.Panel panel3;
}
}
diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs index b5a37bc5a..7d52ddef5 100644 --- a/win/C#/frmQueue.cs +++ b/win/C#/frmQueue.cs @@ -62,6 +62,8 @@ namespace Handbrake queue.EncodeStarted += new EventHandler(queue_EncodeStarted);
queue.EncodeEnded += new EventHandler(queue_EncodeEnded);
+
+ drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
}
/// <summary>
@@ -687,5 +689,20 @@ namespace Handbrake this.Hide();
base.OnClosing(e);
}
+
+ /// <summary>
+ /// Change the OnComplete option setting.
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The EventArgs.
+ /// </param>
+ private void CompleteOptionChanged(object sender, EventArgs e)
+ {
+ Properties.Settings.Default.CompletionOption = drp_completeOption.Text;
+ Properties.Settings.Default.Save();
+ }
}
}
\ No newline at end of file diff --git a/win/C#/frmQueue.resx b/win/C#/frmQueue.resx index d4befb1f9..90014fcee 100644 --- a/win/C#/frmQueue.resx +++ b/win/C#/frmQueue.resx @@ -123,6 +123,22 @@ <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>114, 17</value>
</metadata>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI
+ ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9
+ HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN
+ rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K
+ TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx
+ oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8
+ 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI
+ xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX
+ LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd
+ KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC
+</value>
+ </data>
<metadata name="SaveFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>219, 17</value>
</metadata>
@@ -135,7 +151,9 @@ <metadata name="OpenFile.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>314, 17</value>
</metadata>
- <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <metadata name="splitContainer1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAYAMDAAAAEACACoDgAAZgAAACAgAAABAAgAqAgAAA4PAAAQEAAAAQAIAGgFAAC2FwAAMDAAAAEA
|