From 62fdeb573866ed7181ee77bac63e5fb9d5ce6226 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 4 Oct 2008 13:52:57 +0000 Subject: WinGui: - Few more improvements to the ActivityWindow. Hopefully makes it a bit more user friendly. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1808 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/HandBrakeCS.csproj | 1 + win/C#/Properties/Resources.Designer.cs | 7 +++ win/C#/Properties/Resources.resx | 3 ++ win/C#/Resources/copy.png | Bin 0 -> 3291 bytes win/C#/frmActivityWindow.Designer.cs | 81 +++++++++++++++++--------------- win/C#/frmActivityWindow.cs | 8 ++-- win/C#/frmActivityWindow.resx | 35 ++++---------- 7 files changed, 67 insertions(+), 68 deletions(-) create mode 100644 win/C#/Resources/copy.png (limited to 'win') diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj index 54ba64709..cea26368c 100644 --- a/win/C#/HandBrakeCS.csproj +++ b/win/C#/HandBrakeCS.csproj @@ -241,6 +241,7 @@ + diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs index ff6d278e5..0a9c4b7c4 100644 --- a/win/C#/Properties/Resources.Designer.cs +++ b/win/C#/Properties/Resources.Designer.cs @@ -81,6 +81,13 @@ namespace Handbrake.Properties { } } + internal static System.Drawing.Bitmap copy { + get { + object obj = ResourceManager.GetObject("copy", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap disc_small { get { object obj = ResourceManager.GetObject("disc_small", resourceCulture); diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx index c4f88cfed..7fa9934d3 100644 --- a/win/C#/Properties/Resources.resx +++ b/win/C#/Properties/Resources.resx @@ -187,4 +187,7 @@ ..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\copy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/win/C#/Resources/copy.png b/win/C#/Resources/copy.png new file mode 100644 index 000000000..c11c6a753 Binary files /dev/null and b/win/C#/Resources/copy.png differ diff --git a/win/C#/frmActivityWindow.Designer.cs b/win/C#/frmActivityWindow.Designer.cs index d4e5ee33c..b6bb55eb8 100644 --- a/win/C#/frmActivityWindow.Designer.cs +++ b/win/C#/frmActivityWindow.Designer.cs @@ -39,14 +39,14 @@ namespace Handbrake this.rtf_actLog = new System.Windows.Forms.RichTextBox(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); - this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem(); - this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem(); this.panel1 = new System.Windows.Forms.Panel(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.txt_log = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripDropDownButton(); + this.btn_encode_log = new System.Windows.Forms.ToolStripMenuItem(); + this.btn_scan_log = new System.Windows.Forms.ToolStripMenuItem(); this.btn_copy = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.lbl_slb = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStrip1.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -72,7 +72,6 @@ namespace Handbrake this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripDropDownButton1, - this.toolStripSeparator1, this.btn_copy}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; @@ -81,34 +80,6 @@ namespace Handbrake this.toolStrip1.TabIndex = 96; this.toolStrip1.Text = "toolStrip1"; // - // toolStripDropDownButton1 - // - this.toolStripDropDownButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; - this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btn_encode_log, - this.btn_scan_log}); - this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); - this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(78, 22); - this.toolStripDropDownButton1.Text = "Select Log"; - // - // btn_encode_log - // - this.btn_encode_log.Image = global::Handbrake.Properties.Resources.ActivityWindow_small; - this.btn_encode_log.Name = "btn_encode_log"; - this.btn_encode_log.Size = new System.Drawing.Size(151, 22); - this.btn_encode_log.Text = "Encode Log"; - this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click); - // - // btn_scan_log - // - this.btn_scan_log.Image = global::Handbrake.Properties.Resources.Movies_Small; - this.btn_scan_log.Name = "btn_scan_log"; - this.btn_scan_log.Size = new System.Drawing.Size(151, 22); - this.btn_scan_log.Text = "Scan Log"; - this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click); - // // panel1 // this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -120,6 +91,7 @@ namespace Handbrake // statusStrip1 // this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.lbl_slb, this.txt_log}); this.statusStrip1.Location = new System.Drawing.Point(0, 555); this.statusStrip1.Name = "statusStrip1"; @@ -134,20 +106,51 @@ namespace Handbrake this.txt_log.Size = new System.Drawing.Size(85, 17); this.txt_log.Text = "{selected log}"; // + // toolStripDropDownButton1 + // + this.toolStripDropDownButton1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.toolStripDropDownButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.btn_encode_log, + this.btn_scan_log}); + this.toolStripDropDownButton1.Image = global::Handbrake.Properties.Resources.Output_Small; + this.toolStripDropDownButton1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + this.toolStripDropDownButton1.Size = new System.Drawing.Size(94, 22); + this.toolStripDropDownButton1.Text = "Select Log"; + // + // btn_encode_log + // + this.btn_encode_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.btn_encode_log.Name = "btn_encode_log"; + this.btn_encode_log.Size = new System.Drawing.Size(152, 22); + this.btn_encode_log.Text = "Encode Log"; + this.btn_encode_log.Click += new System.EventHandler(this.btn_encode_log_Click); + // + // btn_scan_log + // + this.btn_scan_log.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; + this.btn_scan_log.Name = "btn_scan_log"; + this.btn_scan_log.Size = new System.Drawing.Size(152, 22); + this.btn_scan_log.Text = "Scan Log"; + this.btn_scan_log.Click += new System.EventHandler(this.btn_scan_log_Click); + // // btn_copy // - this.btn_copy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; this.btn_copy.Image = ((System.Drawing.Image)(resources.GetObject("btn_copy.Image"))); + this.btn_copy.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.btn_copy.ImageTransparentColor = System.Drawing.Color.Magenta; this.btn_copy.Name = "btn_copy"; - this.btn_copy.Size = new System.Drawing.Size(106, 22); + this.btn_copy.Size = new System.Drawing.Size(122, 22); this.btn_copy.Text = "Copy to clipboard"; this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click); // - // toolStripSeparator1 + // lbl_slb // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.lbl_slb.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_slb.Name = "lbl_slb"; + this.lbl_slb.Size = new System.Drawing.Size(94, 17); + this.lbl_slb.Text = "Selected Log: "; // // frmActivityWindow // @@ -187,7 +190,7 @@ namespace Handbrake private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton1; private System.Windows.Forms.ToolStripMenuItem btn_encode_log; private System.Windows.Forms.ToolStripMenuItem btn_scan_log; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripButton btn_copy; + private System.Windows.Forms.ToolStripStatusLabel lbl_slb; } } \ No newline at end of file diff --git a/win/C#/frmActivityWindow.cs b/win/C#/frmActivityWindow.cs index 6d46a449c..c0911eaca 100644 --- a/win/C#/frmActivityWindow.cs +++ b/win/C#/frmActivityWindow.cs @@ -49,9 +49,9 @@ namespace Handbrake startLogThread(read_file); if (file == "dvdinfo.dat") - txt_log.Text = "Selected Log: Scan Log"; + txt_log.Text = "Scan Log"; else if (file == "hb_encode_log.dat") - txt_log.Text = "Selected Log: Encode Log"; + txt_log.Text = "Encode Log"; // When the window closes, we want to abort the monitor thread. @@ -110,7 +110,7 @@ namespace Handbrake read_file = "dvdinfo.dat"; displayLogHeader(); startLogThread(read_file); - txt_log.Text = "Selected Log: Scan Log"; + txt_log.Text = "Scan Log"; } /// @@ -128,7 +128,7 @@ namespace Handbrake position = 0; displayLogHeader(); startLogThread(read_file); - txt_log.Text = "Selected Log: Encode Log"; + txt_log.Text = "Encode Log"; } /// diff --git a/win/C#/frmActivityWindow.resx b/win/C#/frmActivityWindow.resx index 0b13bb7d5..f35a715fb 100644 --- a/win/C#/frmActivityWindow.resx +++ b/win/C#/frmActivityWindow.resx @@ -124,34 +124,19 @@ 105, 17 - - - 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 + OGJjAAAAAElFTkSuQmCC -- cgit v1.2.3