WinGui:

- Removed option to disable verbose CLI.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1260 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 14 insertions, 104 deletions

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index ec6ebeefb..7778fcb16 100644
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -738,9 +738,7 @@ namespace Handbrake.Functions
 

             string queryAdvancedSettings = processors;

 

-            string verbose = "";

-            if (Properties.Settings.Default.verbose == "Checked")

-                verbose = " -v ";

+            string verbose = " -v ";

             #endregion

 

             return querySource + queryDestination + queryPictureSettings + queryVideoSettings + h264Settings + queryAudioSettings + ChapterMarkers + queryAdvancedSettings + verbose;

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 61db8ab09..d9c3fe0fe 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -82,12 +82,6 @@
     <PlatformTarget>x86</PlatformTarget>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="PresentationCore">

-      <RequiredTargetFramework>3.0</RequiredTargetFramework>

-    </Reference>

-    <Reference Include="PresentationFramework">

-      <RequiredTargetFramework>3.0</RequiredTargetFramework>

-    </Reference>

     <Reference Include="System" />

     <Reference Include="System.Data" />

     <Reference Include="System.Deployment" />

@@ -95,15 +89,6 @@
     <Reference Include="System.Messaging" />

     <Reference Include="System.Windows.Forms" />

     <Reference Include="System.Xml" />

-    <Reference Include="UIAutomationProvider">

-      <RequiredTargetFramework>3.0</RequiredTargetFramework>

-    </Reference>

-    <Reference Include="WindowsBase">

-      <RequiredTargetFramework>3.0</RequiredTargetFramework>

-    </Reference>

-    <Reference Include="WindowsFormsIntegration">

-      <RequiredTargetFramework>3.0</RequiredTargetFramework>

-    </Reference>

   </ItemGroup>

   <ItemGroup>

     <Compile Include="frmActivityWindow.cs">

@@ -272,22 +257,6 @@
       <WrapperTool>aximp</WrapperTool>

       <Isolated>False</Isolated>

     </COMReference>

-    <COMReference Include="MSComctlLib">

-      <Guid>{831FDD16-0C5C-11D2-A9FC-0000F8754DA1}</Guid>

-      <VersionMajor>2</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-    </COMReference>

-    <COMReference Include="stdole">

-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>

-      <VersionMajor>2</VersionMajor>

-      <VersionMinor>0</VersionMinor>

-      <Lcid>0</Lcid>

-      <WrapperTool>primary</WrapperTool>

-      <Isolated>False</Isolated>

-    </COMReference>

   </ItemGroup>

   <ItemGroup>

     <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 8dd4dc476..6cf86153e 100644
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -73,18 +73,6 @@ namespace Handbrake.Properties {
         

         [global::System.Configuration.UserScopedSettingAttribute()]

         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

-        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]

-        public string verbose {

-            get {

-                return ((string)(this["verbose"]));

-            }

-            set {

-                this["verbose"] = value;

-            }

-        }

-        

-        [global::System.Configuration.UserScopedSettingAttribute()]

-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

         [global::System.Configuration.DefaultSettingValueAttribute("0.9.1")]

         public string hb_version {

             get {

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 73269a033..fe065ff16 100644
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -14,9 +14,6 @@
     <Setting Name="updateStatus" Type="System.String" Scope="User">

       <Value Profile="(Default)">Checked</Value>

     </Setting>

-    <Setting Name="verbose" Type="System.String" Scope="User">

-      <Value Profile="(Default)">Checked</Value>

-    </Setting>

     <Setting Name="hb_version" Type="System.String" Scope="User">

       <Value Profile="(Default)">0.9.1</Value>

     </Setting>

diff --git a/win/C#/app.config b/win/C#/app.config
index 3b7b17186..3aa4e6a8e 100644
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -19,9 +19,6 @@
             <setting name="updateStatus" serializeAs="String">

                 <value>Checked</value>

             </setting>

-            <setting name="verbose" serializeAs="String">

-                <value>Checked</value>

-            </setting>

             <setting name="hb_version" serializeAs="String">

                 <value>0.9.1</value>

             </setting>

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 4ffaa959e..97b40d9cc 100644
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -35,7 +35,6 @@ namespace Handbrake
         private void InitializeComponent()

         {

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));

-            this.check_verbose = new System.Windows.Forms.CheckBox();

             this.btn_close = new System.Windows.Forms.Button();

             this.drp_completeOption = new System.Windows.Forms.ComboBox();

             this.label5 = new System.Windows.Forms.Label();

@@ -57,7 +56,6 @@ namespace Handbrake
             this.label3 = new System.Windows.Forms.Label();

             this.drp_Priority = new System.Windows.Forms.ComboBox();

             this.Label11 = new System.Windows.Forms.Label();

-            this.label6 = new System.Windows.Forms.Label();

             this.drp_processors = new System.Windows.Forms.ComboBox();

             this.Label4 = new System.Windows.Forms.Label();

             this.label8 = new System.Windows.Forms.Label();

@@ -71,19 +69,6 @@ namespace Handbrake
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();

             this.SuspendLayout();

             // 

-            // check_verbose

-            // 

-            this.check_verbose.AutoSize = true;

-            this.check_verbose.BackColor = System.Drawing.Color.Transparent;

-            this.check_verbose.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_verbose.Location = new System.Drawing.Point(16, 127);

-            this.check_verbose.Name = "check_verbose";

-            this.check_verbose.Size = new System.Drawing.Size(97, 17);

-            this.check_verbose.TabIndex = 51;

-            this.check_verbose.Text = "Verbose CLI";

-            this.check_verbose.UseVisualStyleBackColor = false;

-            this.check_verbose.CheckedChanged += new System.EventHandler(this.check_verbose_CheckedChanged);

-            // 

             // btn_close

             // 

             this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;

@@ -306,16 +291,14 @@ namespace Handbrake
             this.tab_debug.BackColor = System.Drawing.SystemColors.ControlLight;

             this.tab_debug.Controls.Add(this.label3);

             this.tab_debug.Controls.Add(this.drp_Priority);

-            this.tab_debug.Controls.Add(this.check_verbose);

             this.tab_debug.Controls.Add(this.Label11);

-            this.tab_debug.Controls.Add(this.label6);

             this.tab_debug.Controls.Add(this.drp_processors);

             this.tab_debug.Controls.Add(this.Label4);

             this.tab_debug.Location = new System.Drawing.Point(4, 22);

             this.tab_debug.Name = "tab_debug";

             this.tab_debug.Size = new System.Drawing.Size(411, 210);

             this.tab_debug.TabIndex = 2;

-            this.tab_debug.Text = "Debug && Process";

+            this.tab_debug.Text = "Performance";

             this.tab_debug.UseVisualStyleBackColor = true;

             // 

             // label3

@@ -358,17 +341,6 @@ namespace Handbrake
             this.Label11.TabIndex = 40;

             this.Label11.Text = "Number of processors: ";

             // 

-            // label6

-            // 

-            this.label6.AutoSize = true;

-            this.label6.BackColor = System.Drawing.Color.Transparent;

-            this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label6.Location = new System.Drawing.Point(13, 107);

-            this.label6.Name = "label6";

-            this.label6.Size = new System.Drawing.Size(173, 13);

-            this.label6.TabIndex = 1;

-            this.label6.Text = "Verbose and Debug mode";

-            // 

             // drp_processors

             // 

             this.drp_processors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

@@ -461,7 +433,6 @@ namespace Handbrake
 

         #endregion

 

-        internal System.Windows.Forms.CheckBox check_verbose;

         internal System.Windows.Forms.Button btn_close;

         internal System.Windows.Forms.ComboBox drp_completeOption;

         internal System.Windows.Forms.Label label5;

@@ -473,7 +444,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_updateCheck;

         internal System.Windows.Forms.CheckBox check_userDefaultSettings;

         private System.Windows.Forms.TabPage tab_debug;

-        private System.Windows.Forms.Label label6;

         private System.Windows.Forms.Label label8;

         private System.Windows.Forms.PictureBox pictureBox2;

         private System.Windows.Forms.Label label7;

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index e8d0bc02b..83bbffbdd 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -35,11 +35,6 @@ namespace Handbrake
             drp_Priority.Text = Properties.Settings.Default.processPriority;

             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;

 

-            if (Properties.Settings.Default.verbose == "Checked")

-            {

-                check_verbose.CheckState = CheckState.Checked;

-            }

-

             if (Properties.Settings.Default.tooltipEnable == "Checked")

             {

                 check_tooltip.CheckState = CheckState.Checked;

@@ -82,11 +77,6 @@ namespace Handbrake
             Properties.Settings.Default.processPriority = drp_Priority.Text;

         }

 

-        private void check_verbose_CheckedChanged(object sender, EventArgs e)

-        {

-            Properties.Settings.Default.verbose = check_verbose.CheckState.ToString();

-        }

-

         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

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index dfc5cea5e..ca3cc3cbc 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -58,11 +58,11 @@ namespace Handbrake
             this.label1 = new System.Windows.Forms.Label();

             this.label3 = new System.Windows.Forms.Label();

             this.toolStrip1 = new System.Windows.Forms.ToolStrip();

-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

-            this.SaveFile = new System.Windows.Forms.SaveFileDialog();

             this.btn_encode = new System.Windows.Forms.ToolStripButton();

             this.btn_stop = new System.Windows.Forms.ToolStripButton();

+            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

             this.btn_batch = new System.Windows.Forms.ToolStripButton();

+            this.SaveFile = new System.Windows.Forms.SaveFileDialog();

             this.pictureBox1 = new System.Windows.Forms.PictureBox();

             this.toolStrip1.SuspendLayout();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();

@@ -122,6 +122,7 @@ namespace Handbrake
             this.list_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.list_queue.HorizontalScrollbar = true;

             this.list_queue.Location = new System.Drawing.Point(12, 176);

+            this.list_queue.MultiColumn = true;

             this.list_queue.Name = "list_queue";

             this.list_queue.Size = new System.Drawing.Size(701, 145);

             this.list_queue.TabIndex = 28;

@@ -309,15 +310,6 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 71;

             this.toolStrip1.Text = "toolStrip1";

             // 

-            // toolStripSeparator1

-            // 

-            this.toolStripSeparator1.Name = "toolStripSeparator1";

-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49);

-            // 

-            // SaveFile

-            // 

-            this.SaveFile.Filter = "Batch|.bat";

-            // 

             // btn_encode

             // 

             this.btn_encode.Image = global::Handbrake.Properties.Resources.Play;

@@ -340,6 +332,11 @@ namespace Handbrake
             this.btn_stop.Visible = false;

             this.btn_stop.Click += new System.EventHandler(this.btn_stop_Click);

             // 

+            // toolStripSeparator1

+            // 

+            this.toolStripSeparator1.Name = "toolStripSeparator1";

+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49);

+            // 

             // btn_batch

             // 

             this.btn_batch.Image = global::Handbrake.Properties.Resources.ActivityWindow;

@@ -350,6 +347,10 @@ namespace Handbrake
             this.btn_batch.Text = "Batch Script";

             this.btn_batch.Click += new System.EventHandler(this.btn_batch_Click);

             // 

+            // SaveFile

+            // 

+            this.SaveFile.Filter = "Batch|.bat";

+            // 

             // pictureBox1

             // 

             this.pictureBox1.Image = global::Handbrake.Properties.Resources.Queue;