From 0d08a63314dbc793c4ffafbab2985ce13ad0617c Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 27 Apr 2009 15:41:45 +0000 Subject: WinGui: dvdnav option added to preferences. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2356 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/Functions/QueryGenerator.cs | 3 ++ win/C#/Properties/Settings.Designer.cs | 12 +++++ win/C#/Properties/Settings.settings | 3 ++ win/C#/app.config | 3 ++ win/C#/frmOptions.Designer.cs | 89 +++++++++++++++++++++++----------- win/C#/frmOptions.cs | 14 +++++- 6 files changed, 94 insertions(+), 30 deletions(-) (limited to 'win/C#') diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs index a78ce2dfa..1a6d1e95c 100644 --- a/win/C#/Functions/QueryGenerator.cs +++ b/win/C#/Functions/QueryGenerator.cs @@ -428,6 +428,9 @@ namespace Handbrake.Functions query += " -C " + processors + " "; query += " -v " + Properties.Settings.Default.verboseLevel; + + if (Properties.Settings.Default.dvdnav =="Checked") + query += " --dvdnav"; #endregion return query; diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs index de9c10654..2e3841fa7 100644 --- a/win/C#/Properties/Settings.Designer.cs +++ b/win/C#/Properties/Settings.Designer.cs @@ -334,5 +334,17 @@ namespace Handbrake.Properties { this["verboseLevel"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string dvdnav { + get { + return ((string)(this["dvdnav"])); + } + set { + this["dvdnav"] = value; + } + } } } diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings index a74478c2b..2964a6488 100644 --- a/win/C#/Properties/Settings.settings +++ b/win/C#/Properties/Settings.settings @@ -80,5 +80,8 @@ 1 + + + \ No newline at end of file diff --git a/win/C#/app.config b/win/C#/app.config index 1e16655c6..326695a57 100644 --- a/win/C#/app.config +++ b/win/C#/app.config @@ -85,6 +85,9 @@ 1 + + + diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs index b112b86dd..321fe2f70 100644 --- a/win/C#/frmOptions.Designer.cs +++ b/win/C#/frmOptions.Designer.cs @@ -58,6 +58,8 @@ namespace Handbrake this.txt_vlcPath = new System.Windows.Forms.TextBox(); this.label29 = new System.Windows.Forms.Label(); this.tab_cli = new System.Windows.Forms.TabPage(); + this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.check_saveLogWithVideo = new System.Windows.Forms.CheckBox(); this.btn_saveLog = new System.Windows.Forms.Button(); @@ -114,8 +116,8 @@ namespace Handbrake this.label26 = new System.Windows.Forms.Label(); this.label27 = new System.Windows.Forms.Label(); this.openFile_vlc = new System.Windows.Forms.OpenFileDialog(); - this.cb_logVerboseLvl = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); + this.label32 = new System.Windows.Forms.Label(); + this.check_dvdnav = new System.Windows.Forms.CheckBox(); this.tab_options.SuspendLayout(); this.tab_general.SuspendLayout(); this.tab_picture.SuspendLayout(); @@ -412,6 +414,33 @@ namespace Handbrake this.tab_cli.Text = "CLI"; this.tab_cli.UseVisualStyleBackColor = true; // + // cb_logVerboseLvl + // + this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_logVerboseLvl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cb_logVerboseLvl.FormattingEnabled = true; + this.cb_logVerboseLvl.Items.AddRange(new object[] { + "0", + "1", + "2"}); + this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 133); + this.cb_logVerboseLvl.Name = "cb_logVerboseLvl"; + this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21); + this.cb_logVerboseLvl.TabIndex = 86; + this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level"); + this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.BackColor = System.Drawing.Color.Transparent; + this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.Location = new System.Drawing.Point(68, 136); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(124, 13); + this.label3.TabIndex = 85; + this.label3.Text = "Log Verbosity Level:"; + // // label15 // this.label15.AutoSize = true; @@ -580,6 +609,8 @@ namespace Handbrake // // tab_advanced // + this.tab_advanced.Controls.Add(this.check_dvdnav); + this.tab_advanced.Controls.Add(this.label32); this.tab_advanced.Controls.Add(this.label30); this.tab_advanced.Controls.Add(this.drop_x264step); this.tab_advanced.Controls.Add(this.label28); @@ -600,7 +631,7 @@ namespace Handbrake // label30 // this.label30.AutoSize = true; - this.label30.Location = new System.Drawing.Point(76, 142); + this.label30.Location = new System.Drawing.Point(73, 142); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(230, 13); this.label30.TabIndex = 87; @@ -1069,32 +1100,30 @@ namespace Handbrake this.openFile_vlc.DefaultExt = "exe"; this.openFile_vlc.Filter = "exe|*.exe"; // - // cb_logVerboseLvl - // - this.cb_logVerboseLvl.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cb_logVerboseLvl.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_logVerboseLvl.FormattingEnabled = true; - this.cb_logVerboseLvl.Items.AddRange(new object[] { - "0", - "1", - "2"}); - this.cb_logVerboseLvl.Location = new System.Drawing.Point(198, 133); - this.cb_logVerboseLvl.Name = "cb_logVerboseLvl"; - this.cb_logVerboseLvl.Size = new System.Drawing.Size(111, 21); - this.cb_logVerboseLvl.TabIndex = 86; - this.ToolTip.SetToolTip(this.cb_logVerboseLvl, "Activity Log Verbosity Level"); - this.cb_logVerboseLvl.SelectedIndexChanged += new System.EventHandler(this.cb_logVerboseLvl_SelectedIndexChanged); - // - // label3 - // - this.label3.AutoSize = true; - this.label3.BackColor = System.Drawing.Color.Transparent; - this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.Location = new System.Drawing.Point(68, 136); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(124, 13); - this.label3.TabIndex = 85; - this.label3.Text = "Log Verbosity Level:"; + // label32 + // + this.label32.AutoSize = true; + this.label32.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label32.Location = new System.Drawing.Point(38, 184); + this.label32.Name = "label32"; + this.label32.Size = new System.Drawing.Size(32, 13); + this.label32.TabIndex = 89; + this.label32.Text = "CLI:"; + // + // check_dvdnav + // + this.check_dvdnav.AutoSize = true; + this.check_dvdnav.BackColor = System.Drawing.Color.Transparent; + this.check_dvdnav.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.check_dvdnav.Location = new System.Drawing.Point(76, 184); + this.check_dvdnav.Name = "check_dvdnav"; + this.check_dvdnav.Size = new System.Drawing.Size(185, 17); + this.check_dvdnav.TabIndex = 90; + this.check_dvdnav.Text = "Use DvdNav (Experimental)"; + this.ToolTip.SetToolTip(this.check_dvdnav, "Enables the built in update checker to check for the latest development snapshot " + + "builds.\r\nWarning: These are considered unstable builds and are not supported!"); + this.check_dvdnav.UseVisualStyleBackColor = false; + this.check_dvdnav.CheckedChanged += new System.EventHandler(this.check_dvdnav_CheckedChanged); // // frmOptions // @@ -1208,5 +1237,7 @@ namespace Handbrake private System.Windows.Forms.Label label28; internal System.Windows.Forms.ComboBox cb_logVerboseLvl; internal System.Windows.Forms.Label label3; + internal System.Windows.Forms.CheckBox check_dvdnav; + private System.Windows.Forms.Label label32; } } \ No newline at end of file diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs index f83133db6..34ccef623 100644 --- a/win/C#/frmOptions.cs +++ b/win/C#/frmOptions.cs @@ -104,6 +104,7 @@ namespace Handbrake if (Properties.Settings.Default.drive_detection == "Checked") btn_drive_detect.CheckState = CheckState.Checked; + // Enable / Disable Query editor tab if (Properties.Settings.Default.QueryEditorTab == "Checked") check_queryEditorTab.CheckState = CheckState.Checked; @@ -111,7 +112,12 @@ namespace Handbrake if (Properties.Settings.Default.MainWindowMinimize == "Checked") check_mainMinimize.CheckState = CheckState.Checked; + // x264 step drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep; + + // Use Experimental dvdnav + if (Properties.Settings.Default.dvdnav == "Checked") + check_dvdnav.CheckState = CheckState.Checked; } #region General @@ -251,12 +257,18 @@ namespace Handbrake Properties.Settings.Default.x264cqstep = drop_x264step.Text; } + private void check_dvdnav_CheckedChanged(object sender, EventArgs e) + { + Properties.Settings.Default.dvdnav = check_dvdnav.CheckState.ToString(); + } #endregion private void btn_close_Click(object sender, EventArgs e) { Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this this.Close(); - } + } + + } } \ No newline at end of file -- cgit v1.2.3