From: sr55 Date: Tue, 13 Nov 2007 19:38:28 +0000 (+0000) Subject: WinGui: X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=b7b75424b2fb963857e5d30209ad61d5bfe2b4c9;p=handbrake-jp%2Fhandbrake-jp-git.git WinGui: - Copy to clipboard button on the dvd information window. - Show / hide presets button removed and replaced with an item in the presets menu. - Re-enabled the update status text. git-svn-id: svn://localhost/HandBrake/trunk@1057 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs index f07cb6fb..2c5f83a4 100644 --- a/win/C#/frmDvdInfo.Designer.cs +++ b/win/C#/frmDvdInfo.Designer.cs @@ -36,6 +36,7 @@ namespace Handbrake this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.label1 = new System.Windows.Forms.Label(); this.ToolTip = new System.Windows.Forms.ToolTip(this.components); + this.btn_copy = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // @@ -100,6 +101,21 @@ namespace Handbrake // this.ToolTip.Active = false; // + // btn_copy + // + this.btn_copy.BackColor = System.Drawing.SystemColors.ControlLight; + this.btn_copy.FlatAppearance.BorderColor = System.Drawing.Color.Black; + this.btn_copy.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + 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(19, 451); + this.btn_copy.Name = "btn_copy"; + this.btn_copy.Size = new System.Drawing.Size(134, 23); + this.btn_copy.TabIndex = 93; + this.btn_copy.Text = "Copy to Clipboard"; + this.btn_copy.UseVisualStyleBackColor = false; + this.btn_copy.Click += new System.EventHandler(this.btn_copy_Click); + // // frmDvdInfo // this.AcceptButton = this.btn_close; @@ -107,6 +123,7 @@ namespace Handbrake this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; this.ClientSize = new System.Drawing.Size(636, 493); + this.Controls.Add(this.btn_copy); this.Controls.Add(this.label1); this.Controls.Add(this.pictureBox1); this.Controls.Add(this.Label2); @@ -136,5 +153,6 @@ namespace Handbrake private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Label label1; internal System.Windows.Forms.ToolTip ToolTip; + internal System.Windows.Forms.Button btn_copy; } } \ No newline at end of file diff --git a/win/C#/frmDvdInfo.cs b/win/C#/frmDvdInfo.cs index 02338c11..ee3a4e5c 100644 --- a/win/C#/frmDvdInfo.cs +++ b/win/C#/frmDvdInfo.cs @@ -54,5 +54,11 @@ namespace Handbrake // Don't do anything } } + + private void btn_copy_Click(object sender, EventArgs e) + { + if (rtf_dvdInfo.Text != "") + Clipboard.SetText(rtf_dvdInfo.Text, TextDataFormat.Text); + } } } \ No newline at end of file diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs index 08201d07..4c8eebda 100644 --- a/win/C#/frmMain.Designer.cs +++ b/win/C#/frmMain.Designer.cs @@ -58,7 +58,6 @@ namespace Handbrake this.text_filesize = new System.Windows.Forms.TextBox(); this.text_bitrate = new System.Windows.Forms.TextBox(); this.drp_subtitle = new System.Windows.Forms.ComboBox(); - this.btn_presets = new System.Windows.Forms.Button(); this.btn_setDefault = new System.Windows.Forms.Button(); this.DVD_Open = new System.Windows.Forms.FolderBrowserDialog(); this.File_Open = new System.Windows.Forms.OpenFileDialog(); @@ -75,8 +74,8 @@ namespace Handbrake this.ToolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_options = new System.Windows.Forms.ToolStripMenuItem(); this.PresetsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnu_showPresets = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_presetReset = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.mnu_SelectDefault = new System.Windows.Forms.ToolStripMenuItem(); this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mnu_quickStart = new System.Windows.Forms.ToolStripMenuItem(); @@ -179,6 +178,7 @@ namespace Handbrake this.groupBox2 = new System.Windows.Forms.GroupBox(); this.listview_presets = new System.Windows.Forms.ListView(); this.presetname = new System.Windows.Forms.ColumnHeader(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); Label38 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit(); this.frmMainMenu.SuspendLayout(); @@ -555,22 +555,6 @@ namespace Handbrake this.drp_subtitle.Text = "None"; this.ToolTip.SetToolTip(this.drp_subtitle, "Select the subtitle language you require from this dropdown."); // - // btn_presets - // - this.btn_presets.FlatAppearance.BorderColor = System.Drawing.Color.Black; - this.btn_presets.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btn_presets.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btn_presets.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0))))); - this.btn_presets.Location = new System.Drawing.Point(549, 12); - this.btn_presets.Name = "btn_presets"; - this.btn_presets.Size = new System.Drawing.Size(111, 22); - this.btn_presets.TabIndex = 102; - this.btn_presets.Text = "Show Presets"; - this.ToolTip.SetToolTip(this.btn_presets, "Show or Hide the preset section"); - this.btn_presets.UseVisualStyleBackColor = true; - this.btn_presets.Visible = false; - this.btn_presets.Click += new System.EventHandler(this.btn_presets_Click); - // // btn_setDefault // this.btn_setDefault.BackColor = System.Drawing.SystemColors.ControlLight; @@ -697,13 +681,22 @@ namespace Handbrake // this.PresetsToolStripMenuItem.BackColor = System.Drawing.SystemColors.ControlLight; this.PresetsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnu_presetReset, - this.toolStripSeparator4, - this.mnu_SelectDefault}); + this.mnu_showPresets, + this.mnu_SelectDefault, + this.toolStripSeparator7, + this.mnu_presetReset}); this.PresetsToolStripMenuItem.Name = "PresetsToolStripMenuItem"; this.PresetsToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.PresetsToolStripMenuItem.Text = "&Presets"; // + // mnu_showPresets + // + this.mnu_showPresets.Name = "mnu_showPresets"; + this.mnu_showPresets.Size = new System.Drawing.Size(194, 22); + this.mnu_showPresets.Text = "Show Presets"; + this.mnu_showPresets.Visible = false; + this.mnu_showPresets.Click += new System.EventHandler(this.mnu_showPresets_Click); + // // mnu_presetReset // this.mnu_presetReset.Name = "mnu_presetReset"; @@ -712,12 +705,6 @@ namespace Handbrake this.mnu_presetReset.ToolTipText = "Resets all presets."; this.mnu_presetReset.Click += new System.EventHandler(this.mnu_presetReset_Click); // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(191, 6); - this.toolStripSeparator4.Visible = false; - // // mnu_SelectDefault // this.mnu_SelectDefault.Name = "mnu_SelectDefault"; @@ -1946,13 +1933,17 @@ namespace Handbrake this.presetname.Text = "Presets"; this.presetname.Width = 175; // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(191, 6); + // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.ControlLight; this.ClientSize = new System.Drawing.Size(874, 566); - this.Controls.Add(this.btn_presets); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox_dest); this.Controls.Add(this.btn_eCancel); @@ -2129,9 +2120,7 @@ namespace Handbrake private System.Windows.Forms.Label label23; internal System.Windows.Forms.Button btn_copy; private System.Windows.Forms.GroupBox groupBox2; - internal System.Windows.Forms.Button btn_presets; internal System.Windows.Forms.Button btn_setDefault; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem mnu_SelectDefault; private System.Windows.Forms.ToolStripMenuItem mnu_UpdateCheck; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; @@ -2146,6 +2135,8 @@ namespace Handbrake private System.Windows.Forms.ToolStripMenuItem mnu_save; internal System.Windows.Forms.ListView listview_presets; internal System.Windows.Forms.ColumnHeader presetname; + private System.Windows.Forms.ToolStripMenuItem mnu_showPresets; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; } } \ No newline at end of file diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs index 12d7a5d4..d9c13878 100644 --- a/win/C#/frmMain.cs +++ b/win/C#/frmMain.cs @@ -116,7 +116,7 @@ namespace Handbrake private void splashTimer(object sender) { - Thread.Sleep(2000); //sit for 2 seconds then exit + Thread.Sleep(1000); //sit for 1 seconds then exit } private void showSplash(object sender) @@ -134,7 +134,7 @@ namespace Handbrake if (item != null) { - listview_presets.SelectedItems.Clear(); + //listview_presets.SelectedItems.Clear(); item.Selected = true; } } @@ -178,7 +178,7 @@ namespace Handbrake Boolean update = ((verdata > vergui) || (verd1 > cliversion)); - //lbl_update.Visible = update; + lbl_update.Visible = update; return update; } @@ -206,7 +206,7 @@ namespace Handbrake { if (Properties.Settings.Default.hidePresets == "Checked") { - btn_presets.Visible = true; + mnu_showPresets.Visible = true; this.Width = 591; } @@ -313,6 +313,23 @@ namespace Handbrake #endregion #region Presets Menu + Boolean presetStatus; + + private void mnu_showPresets_Click(object sender, EventArgs e) + { + if (presetStatus == false) + { + this.Width = 881; + presetStatus = true; + mnu_showPresets.Text = "Hide Presets"; + } + else + { + this.Width = 590; + presetStatus = false; + mnu_showPresets.Text = "Show Presets"; + } + } private void mnu_presetReset_Click(object sender, EventArgs e) { @@ -330,13 +347,6 @@ namespace Handbrake listview_presets.SelectedItems.Clear(); item.Selected = true; } - - if (presetStatus == false) - { - this.Width = 881; - presetStatus = true; - btn_presets.Text = "Hide Presets"; - } } #endregion @@ -563,27 +573,7 @@ namespace Handbrake } - // Varibles - private Boolean presetStatus = false; - // Buttons - private void btn_presets_Click(object sender, EventArgs e) - { - if (presetStatus == false) - { - this.Width = 881; - presetStatus = true; - btn_presets.Text = "Hide Presets"; - } - else - { - this.Width = 590; - presetStatus = false; - btn_presets.Text = "Show Presets"; - } - - } - private void btn_setDefault_Click(object sender, EventArgs e) { String query = GenerateTheQuery(); @@ -648,6 +638,7 @@ namespace Handbrake } + #endregion //---------------------------------------------------