From: <ju...@us...> - 2006-08-01 05:24:46
|
Revision: 704 Author: julienq Date: 2006-07-31 22:24:37 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/urakawa/?rev=704&view=rev Log Message: ----------- Corrected the preference dialog initialization. Modified Paths: -------------- trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs trunk/urakawa/application/Obi/Obi/ObiForm.cs Modified: trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs 2006-08-01 05:14:30 UTC (rev 703) +++ trunk/urakawa/application/Obi/Obi/Dialogs/Preferences.cs 2006-08-01 05:24:37 UTC (rev 704) @@ -30,10 +30,28 @@ } } - private int mAudioChannels; // preferred number of audio channels - private int mSampleRate; // preferred sample rate - private int mBitDepth; // preferred bit depth + private string mOutputDevice; // preferred output device + private string mInputDevice; // preferred input device + private int mAudioChannels; // preferred number of audio channels + private int mSampleRate; // preferred sample rate + private int mBitDepth; // preferred bit depth + public string OutputDevice + { + get + { + return mOutputDevice; + } + } + + public string InputDevice + { + get + { + return mInputDevice; + } + } + public int AudioChannels { get @@ -58,19 +76,20 @@ } } - Settings settings = new Settings(); - ArrayList m_InDevicesList = new ArrayList(); ArrayList m_OutDevicesList = new ArrayList(); AudioRecorder ob_AudioRecorder = new AudioRecorder(); AudioPlayer ob_AudioPlayer = new AudioPlayer(); - public Preferences(string template, string dir) + /// <summary> + /// Initialize the preferences with the user settings. + /// </summary> + public Preferences(Settings settings) { InitializeComponent(); - mIdTemplate = template; + mIdTemplate = settings.IdTemplate; mTemplateBox.Text = mIdTemplate; - mDefaultDir = dir; + mDefaultDir = settings.DefaultPath; mDirectoryBox.Text = mDefaultDir; } @@ -87,10 +106,10 @@ private void button2_Click(object sender, EventArgs e) { - mIdTemplate = mTemplateBox.Text; + mIdTemplate = mTemplateBox.Text; mDefaultDir = mDirectoryBox.Text; - settings.LastInputDevice = comboInputDevice.SelectedItem.ToString(); - settings.LastOutputDevice = comboOutputDevice.SelectedItem.ToString(); + mInputDevice = comboInputDevice.SelectedItem.ToString(); + mOutputDevice = comboOutputDevice.SelectedItem.ToString(); } private void Preferences_Load(object sender, EventArgs e) Modified: trunk/urakawa/application/Obi/Obi/ObiForm.cs =================================================================== --- trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-08-01 05:14:30 UTC (rev 703) +++ trunk/urakawa/application/Obi/Obi/ObiForm.cs 2006-08-01 05:24:37 UTC (rev 704) @@ -253,37 +253,37 @@ } /// <summary> - /// Edit the preferences, starting from the Project tab. + /// Edit the preferences, starting from the Project tab. (JQ) /// </summary> private void preferencesToolStripMenuItem_Click(object sender, EventArgs e) { - Dialogs.Preferences dialog = new Dialogs.Preferences(mSettings.IdTemplate, mSettings.DefaultPath); + Dialogs.Preferences dialog = new Dialogs.Preferences(mSettings); dialog.SelectProjectTab(); - if (dialog.ShowDialog() == DialogResult.OK) - { - if (dialog.IdTemplate.Contains("#")) mSettings.IdTemplate = dialog.IdTemplate; - if (Directory.Exists(dialog.DefaultDir)) mSettings.DefaultPath = dialog.DefaultDir; - } + if (dialog.ShowDialog() == DialogResult.OK) UpdateSettings(dialog); Ready(); } /// <summary> - /// Edit the preferences, starting from the Audio tab. + /// Edit the preferences, starting from the Audio tab. (JQ) /// </summary> /// <param name="sender"></param> /// <param name="e"></param> private void audioPreferencesToolStripMenuItem_Click(object sender, EventArgs e) { - Dialogs.Preferences dialog = new Dialogs.Preferences(mSettings.IdTemplate, mSettings.DefaultPath); + Dialogs.Preferences dialog = new Dialogs.Preferences(mSettings); dialog.SelectAudioTab(); - if (dialog.ShowDialog() == DialogResult.OK) - { - if (dialog.IdTemplate.Contains("#")) mSettings.IdTemplate = dialog.IdTemplate; - if (Directory.Exists(dialog.DefaultDir)) mSettings.DefaultPath = dialog.DefaultDir; - } + if (dialog.ShowDialog() == DialogResult.OK) UpdateSettings(dialog); Ready(); } + /// <summary> + /// Update the settings after the user has made some changes in the preferrences dialog. (JQ) + /// </summary> + private void UpdateSettings(Dialogs.Preferences dialog) + { + if (dialog.IdTemplate.Contains("#")) mSettings.IdTemplate = dialog.IdTemplate; + if (Directory.Exists(dialog.DefaultDir)) mSettings.DefaultPath = dialog.DefaultDir; + } /// <summary> /// Save the settings when closing. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |