From: <mis...@us...> - 2007-07-26 13:05:17
|
Revision: 767 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=767&view=rev Author: misterd_sf Date: 2007-07-26 06:05:15 -0700 (Thu, 26 Jul 2007) Log Message: ----------- Fix in configuration form of the gui plugin. Leave event of Share name wasn't handled correctly. Modified Paths: -------------- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs Modified: trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-07-25 19:07:12 UTC (rev 766) +++ trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.cs 2007-07-26 13:05:15 UTC (rev 767) @@ -35,213 +35,216 @@ using MediaPortal.Configuration; namespace MPlayer { + /// <summary> + /// Configuration of the window plugin for MPlayer + /// </summary> + public partial class ConfigurationForm : Form { + + #region variables /// <summary> - /// Configuration of the window plugin for MPlayer + /// Last selected Share in the form /// </summary> - public partial class ConfigurationForm : Form { + private MPlayer_Share lastShare; + #endregion - #region variables - /// <summary> - /// Last selected Share in the form - /// </summary> - private MPlayer_Share lastShare; - #endregion + #region ctor + /// <summary> + /// Standard constructor + /// </summary> + public ConfigurationForm() { + InitializeComponent(); + } + #endregion - #region ctor - /// <summary> - /// Standard constructor - /// </summary> - public ConfigurationForm() { - InitializeComponent(); - } - #endregion + #region Event handling + /// <summary> + /// Handles the form load event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void ConfigurationForm_Load(object sender, System.EventArgs e) { + loadConfiguration(); + } - #region Event handling - /// <summary> - /// Handles the form load event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void ConfigurationForm_Load(object sender, System.EventArgs e) { - loadConfiguration(); - } + /// <summary> + /// Handles the OK-Button click event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void okButton_Click(object sender, System.EventArgs e) { + saveConfiguration(); + this.Close(); + } - /// <summary> - /// Handles the OK-Button click event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void okButton_Click(object sender, System.EventArgs e) { - saveConfiguration(); - this.Close(); - } - - /// <summary> - /// Handles the Cancel-Button click event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void cancelButton_Click(object sender, EventArgs e) { - this.Close(); - } - - /// <summary> - /// Handles the Add-Button click event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void shareAdd_Click(object sender, EventArgs e) { - MPlayer_Share temp = new MPlayer_Share(); - temp.Name = "NewLocation"; - shareList.Items.Add(temp); - shareList.SelectedItem = temp; + /// <summary> + /// Handles the Cancel-Button click event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void cancelButton_Click(object sender, EventArgs e) { + this.Close(); + } - } + /// <summary> + /// Handles the Add-Button click event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void shareAdd_Click(object sender, EventArgs e) { + MPlayer_Share temp = new MPlayer_Share(); + temp.Name = "NewLocation"; + shareList.Items.Add(temp); + shareList.SelectedItem = temp; - /// <summary> - /// Handles the Delete-Button click event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void shareDelete_Click(object sender, EventArgs e) { - if (shareList.SelectedIndex > -1) { - shareList.Items.RemoveAt(shareList.SelectedIndex); - if (shareList.Items.Count > 0) { - shareList.SelectedIndex = 0; - } else { - shareList.SelectedIndex = -1; - } - } + } + /// <summary> + /// Handles the Delete-Button click event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void shareDelete_Click(object sender, EventArgs e) { + if (shareList.SelectedIndex > -1) { + shareList.Items.RemoveAt(shareList.SelectedIndex); + if (shareList.Items.Count > 0) { + shareList.SelectedIndex = 0; + } else { + shareList.SelectedIndex = -1; } + } - /// <summary> - /// Handles the Selected index change on the share list - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void shareList_SelectedIndexChanged(object sender, EventArgs e) { - if (lastShare != null) { - lastShare.Path = shareLocation.Text; - } + } - if (shareList.SelectedIndex > -1) { - lastShare = shareList.SelectedItem as MPlayer_Share; - shareName.Text = lastShare.Name; - shareLocation.Text = lastShare.Path; - shareName.Enabled = true; - shareLocation.Enabled = true; - } else { - shareName.Text = String.Empty; - shareLocation.Text = String.Empty; - shareName.Enabled = false; - shareLocation.Enabled = false; - lastShare = null; - } + /// <summary> + /// Handles the Selected index change on the share list + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void shareList_SelectedIndexChanged(object sender, EventArgs e) { + if (lastShare != null) { + lastShare.Path = shareLocation.Text; + } - } + if (shareList.SelectedIndex > -1) { + lastShare = shareList.SelectedItem as MPlayer_Share; + shareName.Text = lastShare.Name; + shareLocation.Text = lastShare.Path; + shareName.Enabled = true; + shareLocation.Enabled = true; + } else { + shareName.Text = String.Empty; + shareLocation.Text = String.Empty; + shareName.Enabled = false; + shareLocation.Enabled = false; + lastShare = null; + } - /// <summary> - /// Handles the Leave event on the extension Textfield - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void shareName_Leave(object sender, EventArgs e) { - if (lastShare != null) { - lastShare.Name = shareName.Text; - shareList.Items[shareList.SelectedIndex] = lastShare; - } + } + /// <summary> + /// Handles the Leave event on the extension Textfield + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void shareName_Leave(object sender, EventArgs e) { + if (lastShare != null) { + int selectedIndex = shareList.SelectedIndex; + if (selectedIndex != -1) { + lastShare.Name = shareName.Text; + shareList.Items[selectedIndex] = lastShare; } + } - /// <summary> - /// Handles the Leave event on the extension Textfield - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void shareLocation_Leave(object sender, EventArgs e) { - if (lastShare != null) { - lastShare.Path = shareLocation.Text; - shareList.Items[shareList.SelectedIndex] = lastShare; - } + } + /// <summary> + /// Handles the Leave event on the extension Textfield + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void shareLocation_Leave(object sender, EventArgs e) { + if (lastShare != null) { + lastShare.Path = shareLocation.Text; + shareList.Items[shareList.SelectedIndex] = lastShare; + } - } - /// <summary> - /// Handles the Browse-Button click event - /// </summary> - /// <param name="sender">Sender object</param> - /// <param name="e">Event Arguments</param> - private void browseButton_Click(object sender, EventArgs e) { - folderBrowserDialog1.SelectedPath = shareLocation.Text; - folderBrowserDialog1.ShowDialog(); - shareLocation.Text = folderBrowserDialog1.SelectedPath; - } - #endregion + } - #region Configuration Methods - /// <summary> - /// Loads the configuration with the shares - /// </summary> - private void loadConfiguration() { - try { - MPlayer_Share share = null; - XmlDocument doc = new XmlDocument(); - string path = Config.GetFile(Config.Dir.Config,"MPlayer_GUIPlugin.xml"); - doc.Load(path); - XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share"); - foreach (XmlNode nodeShare in listShare) { - share = new MPlayer_Share(); - share.Name = nodeShare.Attributes["name"].Value; - share.Path = nodeShare.Attributes["path"].Value; - shareList.Items.Add(share); - } - using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { - pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI"); - myVideoShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true); - myMusicShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true); - } - } catch (Exception e) { - Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message); - } + /// <summary> + /// Handles the Browse-Button click event + /// </summary> + /// <param name="sender">Sender object</param> + /// <param name="e">Event Arguments</param> + private void browseButton_Click(object sender, EventArgs e) { + folderBrowserDialog1.SelectedPath = shareLocation.Text; + folderBrowserDialog1.ShowDialog(); + shareLocation.Text = folderBrowserDialog1.SelectedPath; + } + #endregion + #region Configuration Methods + /// <summary> + /// Loads the configuration with the shares + /// </summary> + private void loadConfiguration() { + try { + MPlayer_Share share = null; + XmlDocument doc = new XmlDocument(); + string path = Config.GetFile(Config.Dir.Config, "MPlayer_GUIPlugin.xml"); + doc.Load(path); + XmlNodeList listShare = doc.DocumentElement.SelectNodes("/mplayergui/Share"); + foreach (XmlNode nodeShare in listShare) { + share = new MPlayer_Share(); + share.Name = nodeShare.Attributes["name"].Value; + share.Path = nodeShare.Attributes["path"].Value; + shareList.Items.Add(share); } - - /// <summary> - /// Stores the configuration with the shares - /// </summary> - private void saveConfiguration() { - shareList.SelectedIndex = -1; - XmlTextWriter writer = new XmlTextWriter(Config.GetFile(Config.Dir.Config,"MPlayer_GUIPlugin.xml"), System.Text.Encoding.UTF8); - writer.Formatting = Formatting.Indented; - writer.Indentation = 1; - writer.IndentChar = (char)9; - writer.WriteStartDocument(true); - writer.WriteStartElement("mplayergui"); //<mplayer> - writer.WriteAttributeString("version", "1"); - MPlayer_Share temp; - for (int i = 0; i < shareList.Items.Count; i++) { - temp = shareList.Items[i] as MPlayer_Share; - writer.WriteStartElement("Share"); //<Share> - writer.WriteAttributeString("name", temp.Name); - writer.WriteAttributeString("path", temp.Path); - writer.WriteEndElement(); //</Share> - } - writer.WriteEndElement(); //</mplayer> - writer.WriteEndDocument(); - writer.Close(); - using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { - if (String.IsNullOrEmpty(pluginName.Text)) { - xmlWriter.SetValue("mplayer", "displayNameOfGUI", "My MPlayer"); - } else { - xmlWriter.SetValue("mplayer", "displayNameOfGUI", pluginName.Text); - } - xmlWriter.SetValueAsBool("mplayer", "useMyMusicShares", myMusicShare.Checked); - xmlWriter.SetValueAsBool("mplayer", "useMyVideoShares", myVideoShare.Checked); - } + using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { + pluginName.Text = xmlreader.GetValueAsString("mplayer", "displayNameOfGUI", "My MPlayer GUI"); + myVideoShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyVideoShares", true); + myMusicShare.Checked = xmlreader.GetValueAsBool("mplayer", "useMyMusicShares", true); } - #endregion + } catch (Exception e) { + Log.Info("MPlayer GUI Error: Configuration could not be loaded: " + e.Message); + } } + + /// <summary> + /// Stores the configuration with the shares + /// </summary> + private void saveConfiguration() { + shareList.SelectedIndex = -1; + XmlTextWriter writer = new XmlTextWriter(Config.GetFile(Config.Dir.Config, "MPlayer_GUIPlugin.xml"), System.Text.Encoding.UTF8); + writer.Formatting = Formatting.Indented; + writer.Indentation = 1; + writer.IndentChar = (char)9; + writer.WriteStartDocument(true); + writer.WriteStartElement("mplayergui"); //<mplayer> + writer.WriteAttributeString("version", "1"); + MPlayer_Share temp; + for (int i = 0; i < shareList.Items.Count; i++) { + temp = shareList.Items[i] as MPlayer_Share; + writer.WriteStartElement("Share"); //<Share> + writer.WriteAttributeString("name", temp.Name); + writer.WriteAttributeString("path", temp.Path); + writer.WriteEndElement(); //</Share> + } + writer.WriteEndElement(); //</mplayer> + writer.WriteEndDocument(); + writer.Close(); + using (MediaPortal.Profile.Settings xmlWriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml"))) { + if (String.IsNullOrEmpty(pluginName.Text)) { + xmlWriter.SetValue("mplayer", "displayNameOfGUI", "My MPlayer"); + } else { + xmlWriter.SetValue("mplayer", "displayNameOfGUI", pluginName.Text); + } + xmlWriter.SetValueAsBool("mplayer", "useMyMusicShares", myMusicShare.Checked); + xmlWriter.SetValueAsBool("mplayer", "useMyVideoShares", myVideoShare.Checked); + } + } + #endregion + + } } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |