diff options
| -rw-r--r-- | win/C#/HandBrakeCS.csproj | 2 | ||||
| -rw-r--r-- | win/C#/frmExceptionWindow.Designer.cs | 29 | ||||
| -rw-r--r-- | win/C#/frmExceptionWindow.cs | 16 | ||||
| -rw-r--r-- | win/C#/frmExceptionWindow.resx | 3 |
4 files changed, 45 insertions, 5 deletions
diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 093f1e499..221211cc0 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -398,7 +398,6 @@ <None Include="Resources\logo128.png" />
<None Include="Resources\ActivityWindow.png" />
<None Include="Resources\AddToQueue.png" />
- <None Include="Resources\109_AllAnnotations_Error_64x64_72.png" />
<Content Include="Resources\ActivityWindow_small.png" />
<None Include="Resources\AddToQueue_small.png" />
<Content Include="Resources\copy.png" />
@@ -409,7 +408,6 @@ <None Include="Resources\info16.png" />
<None Include="Resources\folder.png" />
<None Include="Resources\download.png" />
- <None Include="Resources\error.png" />
<None Include="Resources\ErrorX.png" />
<Content Include="Resources\Output_Small.png" />
<None Include="Resources\Pause.png" />
diff --git a/win/C#/frmExceptionWindow.Designer.cs b/win/C#/frmExceptionWindow.Designer.cs index c856f9a09..6269904fd 100644 --- a/win/C#/frmExceptionWindow.Designer.cs +++ b/win/C#/frmExceptionWindow.Designer.cs @@ -28,6 +28,7 @@ /// </summary>
private void InitializeComponent()
{
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmExceptionWindow));
this.panel1 = new System.Windows.Forms.Panel();
this.panel2 = new System.Windows.Forms.Panel();
@@ -42,10 +43,13 @@ this.btn_close = new System.Windows.Forms.Button();
this.btn_copy = new System.Windows.Forms.Button();
this.rtf_exceptionFull = new System.Windows.Forms.RichTextBox();
+ this.rightClickMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.mnu_copy_log = new System.Windows.Forms.ToolStripMenuItem();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit();
this.panel4.SuspendLayout();
this.panel6.SuspendLayout();
+ this.rightClickMenu.SuspendLayout();
this.SuspendLayout();
//
// panel1
@@ -166,9 +170,11 @@ this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black;
this.btn_copy.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.btn_copy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));
- this.btn_copy.Location = new System.Drawing.Point(29, 8);
+ this.btn_copy.Image = global::Handbrake.Properties.Resources.copy;
+ this.btn_copy.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.btn_copy.Location = new System.Drawing.Point(14, 8);
this.btn_copy.Name = "btn_copy";
- this.btn_copy.Size = new System.Drawing.Size(70, 25);
+ this.btn_copy.Size = new System.Drawing.Size(85, 25);
this.btn_copy.TabIndex = 57;
this.btn_copy.Text = "Copy";
this.btn_copy.UseVisualStyleBackColor = false;
@@ -176,6 +182,7 @@ //
// rtf_exceptionFull
//
+ this.rtf_exceptionFull.ContextMenuStrip = this.rightClickMenu;
this.rtf_exceptionFull.Dock = System.Windows.Forms.DockStyle.Fill;
this.rtf_exceptionFull.Location = new System.Drawing.Point(76, 97);
this.rtf_exceptionFull.Name = "rtf_exceptionFull";
@@ -183,6 +190,21 @@ this.rtf_exceptionFull.TabIndex = 70;
this.rtf_exceptionFull.Text = "";
//
+ // rightClickMenu
+ //
+ this.rightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.mnu_copy_log});
+ this.rightClickMenu.Name = "rightClickMenu";
+ this.rightClickMenu.Size = new System.Drawing.Size(153, 48);
+ //
+ // mnu_copy_log
+ //
+ this.mnu_copy_log.Image = global::Handbrake.Properties.Resources.copy;
+ this.mnu_copy_log.Name = "mnu_copy_log";
+ this.mnu_copy_log.Size = new System.Drawing.Size(152, 22);
+ this.mnu_copy_log.Text = "Copy";
+ this.mnu_copy_log.Click += new System.EventHandler(this.mnu_copy_log_Click);
+ //
// frmExceptionWindow
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -201,6 +223,7 @@ ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit();
this.panel4.ResumeLayout(false);
this.panel6.ResumeLayout(false);
+ this.rightClickMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
@@ -220,5 +243,7 @@ internal System.Windows.Forms.Button btn_close;
private System.Windows.Forms.Panel panel6;
internal System.Windows.Forms.Button btn_copy;
+ private System.Windows.Forms.ContextMenuStrip rightClickMenu;
+ private System.Windows.Forms.ToolStripMenuItem mnu_copy_log;
}
}
\ No newline at end of file diff --git a/win/C#/frmExceptionWindow.cs b/win/C#/frmExceptionWindow.cs index 19d6f7ba1..407e03e33 100644 --- a/win/C#/frmExceptionWindow.cs +++ b/win/C#/frmExceptionWindow.cs @@ -51,6 +51,20 @@ namespace Handbrake }
/// <summary>
+ /// Copy from the right click menu
+ /// </summary>
+ /// <param name="sender">
+ /// The sender.
+ /// </param>
+ /// <param name="e">
+ /// The e.
+ /// </param>
+ private void mnu_copy_log_Click(object sender, EventArgs e)
+ {
+ Clipboard.SetDataObject(rtf_exceptionFull.SelectedText != string.Empty ? rtf_exceptionFull.SelectedText : rtf_exceptionFull.Text, true);
+ }
+
+ /// <summary>
/// Close the window
/// </summary>
/// <param name="sender">
@@ -62,6 +76,6 @@ namespace Handbrake private void btn_close_Click(object sender, EventArgs e)
{
this.Close();
- }
+ }
}
}
diff --git a/win/C#/frmExceptionWindow.resx b/win/C#/frmExceptionWindow.resx index ff217dc4f..6df001c71 100644 --- a/win/C#/frmExceptionWindow.resx +++ b/win/C#/frmExceptionWindow.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="rightClickMenu.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>
|