X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=win%2FC%23%2FfrmOptions.cs;h=77a7a58cef3ec79d9284758aa1e3b011e91cef43;hb=cfa1fb7010dc9324e15d257bad7a73af66e9eb10;hp=d6c9489c6a962bc6e64eaa205b67ede357f3f23b;hpb=c6b9258bc1412ec3c41e7c9dba938def394525c1;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index d6c9489c..77a7a58c 100644
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -5,6 +5,7 @@
  	   It may be used under the terms of the GNU General Public License. */
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Forms;
 using Handbrake.Functions;
@@ -13,9 +14,16 @@ namespace Handbrake
 {
     public partial class frmOptions : Form
     {
-        public frmOptions()
+        private frmMain mainWindow;
+
+        public frmOptions(frmMain mw)
         {
             InitializeComponent();
+            mainWindow = mw;
+
+            IDictionary<string, string> langList = Main.mapLanguages();
+            foreach (string item in langList.Keys)
+                drop_preferredLang.Items.Add(item);
 
             // #############################
             // General
@@ -32,13 +40,16 @@ namespace Handbrake
             if (Properties.Settings.Default.updateStatus)
                 check_updateCheck.CheckState = CheckState.Checked;
 
-            // enable loading of default user settings.
-            if (Properties.Settings.Default.defaultSettings)
-                check_userDefaultSettings.CheckState = CheckState.Checked;
-
             // On Encode Completeion Action
             drp_completeOption.Text = Properties.Settings.Default.CompletionOption;
 
+            // Growl.
+            if (Properties.Settings.Default.growlEncode)
+                check_growlEncode.CheckState = CheckState.Checked;
+
+            if (Properties.Settings.Default.growlQueue)
+                check_GrowlQueue.CheckState = CheckState.Checked;
+
             // Enable auto naming feature.
             if (Properties.Settings.Default.autoNaming)
                 check_autoNaming.CheckState = CheckState.Checked;
@@ -63,6 +74,18 @@ namespace Handbrake
             txt_vlcPath.Text = Properties.Settings.Default.VLC_Path;
 
             // #############################
+            // Audio and Subtitles Tab
+            // #############################
+
+            drop_preferredLang.SelectedItem = Properties.Settings.Default.NativeLanguage;
+
+            if (Properties.Settings.Default.DubAudio)
+                radio_dub.Checked = true;
+            else
+                radio_foreignAndSubs.Checked = true;
+
+
+            // #############################
             // CLI
             // #############################
 
@@ -96,10 +119,6 @@ namespace Handbrake
             // Advanced
             // #############################
 
-            // Enable GUI DVD Drive detection code
-            if (Properties.Settings.Default.drive_detection)
-                btn_drive_detect.CheckState = CheckState.Checked;
-
             // Minimise to Tray
             if (Properties.Settings.Default.trayIconAlerts)
                 check_trayStatusAlerts.CheckState = CheckState.Checked;
@@ -112,6 +131,9 @@ namespace Handbrake
             if (Properties.Settings.Default.QueryEditorTab)
                 check_queryEditorTab.CheckState = CheckState.Checked;
 
+            // Prompt on inconsistant queries
+            check_promptOnUnmatchingQueries.Checked = Properties.Settings.Default.PromptOnUnmatchingQueries;
+
             // Preset update notification
             if (Properties.Settings.Default.presetNotification)
                 check_disablePresetNotification.CheckState = CheckState.Checked;
@@ -121,15 +143,46 @@ namespace Handbrake
                 check_inGuiStatus.CheckState = CheckState.Checked;
 
             // Days between update checks
-            numeric_updateCheckDays.Value = Properties.Settings.Default.daysBetweenUpdateCheck;
+            switch (Properties.Settings.Default.daysBetweenUpdateCheck)
+            {
+                case 1:
+                    drop_updateCheckDays.SelectedIndex = 0;
+                    break;
+                case 7:
+                    drop_updateCheckDays.SelectedIndex = 1;
+                    break;
+                case 30:
+                    drop_updateCheckDays.SelectedIndex = 2;
+                    break;
+            }
 
             // x264 step
-            CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");
-            drop_x264step.SelectedItem = Properties.Settings.Default.x264cqstep.ToString(culture);
+            string step = Properties.Settings.Default.x264cqstep.ToString(new CultureInfo("en-US"));
+            switch (step)
+            {
+                case "1":
+                    drop_x264step.SelectedIndex = 0;
+                    break;
+                case "0.5":
+                    drop_x264step.SelectedIndex = 1;
+                    break;
+                case "0.25":
+                    drop_x264step.SelectedIndex = 2;
+                    break;
+                case "0.2":
+                    drop_x264step.SelectedIndex = 3;
+                    break;
+            }
 
             // Use Experimental dvdnav
-            if (Properties.Settings.Default.dvdnav)
+            if (Properties.Settings.Default.noDvdNav)
                 check_dvdnav.CheckState = CheckState.Checked;
+
+            // #############################
+            // Debug
+            // #############################
+            if (Properties.Settings.Default.disableResCalc)
+                check_disableResCalc.Checked = true;
         }
 
         #region General
@@ -138,20 +191,26 @@ namespace Handbrake
             Properties.Settings.Default.updateStatus = check_updateCheck.Checked;
         }
 
-        private void check_userDefaultSettings_CheckedChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.defaultSettings = check_userDefaultSettings.Checked;
-        }
-
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.tooltipEnable = check_tooltip.Checked;
         }
+
         private void drp_completeOption_SelectedIndexChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.CompletionOption = drp_completeOption.Text;
         }
 
+        private void check_GrowlQueue_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.growlQueue = check_GrowlQueue.Checked;
+        }
+
+        private void check_growlEncode_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.growlEncode = check_growlEncode.Checked;
+        }
+
         private void check_autoNaming_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.autoNaming = check_autoNaming.Checked;
@@ -198,6 +257,23 @@ namespace Handbrake
         }
         #endregion
 
+        #region Audio and Subtitles
+        private void drop_preferredLang_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.NativeLanguage = drop_preferredLang.SelectedItem.ToString();
+        }
+        private void radio_dub_CheckedChanged(object sender, EventArgs e)
+        {
+            if (radio_dub.Checked)
+                Properties.Settings.Default.DubAudio = true;
+        }
+        private void radio_foreignAndSubs_CheckedChanged(object sender, EventArgs e)
+        {
+            if (radio_foreignAndSubs.Checked)
+                Properties.Settings.Default.DubAudio = false;
+        }       
+        #endregion
+
         #region CLI
         private void check_cli_minimized_CheckedChanged(object sender, EventArgs e)
         {
@@ -265,14 +341,11 @@ namespace Handbrake
         #endregion
 
         #region Advanced
-        private void btn_drive_detect_CheckedChanged(object sender, EventArgs e)
-        {
-            Properties.Settings.Default.drive_detection = btn_drive_detect.Checked;
-        }
 
         private void check_mainMinimize_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.MainWindowMinimize = check_mainMinimize.Checked;
+            check_trayStatusAlerts.Enabled = check_mainMinimize.Checked;
         }
 
         private void check_trayStatusAlerts_CheckedChanged(object sender, EventArgs e)
@@ -283,6 +356,12 @@ namespace Handbrake
         private void check_queryEditorTab_CheckedChanged(object sender, EventArgs e)
         {
             Properties.Settings.Default.QueryEditorTab = check_queryEditorTab.Checked;
+            check_promptOnUnmatchingQueries.Enabled = check_queryEditorTab.Checked;
+        }
+
+        private void check_promptOnUnmatchingQueries_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.PromptOnUnmatchingQueries = check_promptOnUnmatchingQueries.Checked;
         }
 
         private void check_disablePresetNotification_CheckedChanged(object sender, EventArgs e)
@@ -295,9 +374,20 @@ namespace Handbrake
             Properties.Settings.Default.enocdeStatusInGui = check_inGuiStatus.Checked;
         }
 
-        private void numeric_updateCheckDays_ValueChanged(object sender, EventArgs e)
+        private void drop_updateCheckDays_SelectedIndexChanged(object sender, EventArgs e)
         {
-            Properties.Settings.Default.daysBetweenUpdateCheck = (int)numeric_updateCheckDays.Value;
+            switch (drop_updateCheckDays.SelectedIndex)
+            {
+                case 0:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 1;
+                    break;
+                case 1:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 7;
+                    break;
+                case 2:
+                    Properties.Settings.Default.daysBetweenUpdateCheck = 30;
+                    break;
+            }
         }
 
         private void x264step_SelectedIndexChanged(object sender, EventArgs e)
@@ -317,11 +407,19 @@ namespace Handbrake
                     Properties.Settings.Default.x264cqstep = 0.20;
                     break;
             }
+            mainWindow.setQualityFromSlider();
         }
 
         private void check_dvdnav_CheckedChanged(object sender, EventArgs e)
         {
-            Properties.Settings.Default.dvdnav = check_dvdnav.Checked;
+            Properties.Settings.Default.noDvdNav = check_dvdnav.Checked;
+        }
+        #endregion
+
+        #region Debug
+        private void check_disableResCalc_CheckedChanged(object sender, EventArgs e)
+        {
+            Properties.Settings.Default.disableResCalc = check_disableResCalc.Checked;
         }
         #endregion
 
@@ -330,6 +428,5 @@ namespace Handbrake
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this
             this.Close();
         }
-
     }
 }
\ No newline at end of file