From: <nic...@us...> - 2014-06-25 20:00:30
|
Revision: 4849 http://sourceforge.net/p/mp-plugins/code/4849 Author: nicsergio Date: 2014-06-25 20:00:27 +0000 (Wed, 25 Jun 2014) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-25 17:03:14 UTC (rev 4848) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/NavigatorDialog.cs 2014-06-25 20:00:27 UTC (rev 4849) @@ -161,18 +161,6 @@ else base.selectOption(keySelected); //--> altrimenti selezione elemento lista } - - public new void Add(string strLabel) - { - bool mShowQuickNumbers = showQuickNumbers; - - if (strLabel.Length == 0 && showQuickNumbers) - showQuickNumbers = false; - - base.Add(strLabel); - - showQuickNumbers = mShowQuickNumbers; - } public override void Dispose() //Override metodo Dispose { panelView.SafeDispose(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-06-25 17:03:14 UTC (rev 4848) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-06-25 20:00:27 UTC (rev 4849) @@ -186,7 +186,6 @@ <General> <MenuHeader>Skin Navigator</MenuHeader> <ShowSeparator>1</ShowSeparator> - <Separator>--------------------------------</Separator> <ShowNumbers>1</ShowNumbers> <RemoveDuplicates>1</RemoveDuplicates> <DialogType>1</DialogType> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-25 17:03:14 UTC (rev 4848) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2014-06-25 20:00:27 UTC (rev 4849) @@ -340,7 +340,6 @@ #region Dati private string _menuHeader; //Titolo menu di navigazione private bool _showSeparator; //Visualizzazione separatore gruppi di destinazioni - private string _separator; //Eventuale separatore da visualizzare private bool _showNumbers; //Visualizzazione numeri cossispondenti a voci menu (per accesso da telecomando) private bool _removeDuplicates; //Rimozione destinazioni duplicate private DialogTypes _dialogType; //Tipologia della finestra di dialogo da utilizzare @@ -351,7 +350,6 @@ { _menuHeader = "Skin Navigator"; //--> titolo menu di navigazione _showSeparator = true; //--> visualizzazione separatore attiva - _separator = "-- -- -- -- -- --"; //--> separatore da visualizzare _showNumbers = true; //--> visualizzazione numeri cossispondenti a voci menu _removeDuplicates = true; //--> rimozione di destinazioni duplicate _dialogType = DialogTypes.DefaultDialog; //--> utilizzo della finestra di dialogo predefinita @@ -361,7 +359,6 @@ #region Proprietà public string MenuHeader { get { return this._menuHeader; } set { this._menuHeader = value; } } public bool ShowSeparator { get { return this._showSeparator; } set { this._showSeparator = value; } } - public string Separator { get { return this._separator; } set { this._separator = value; } } public bool ShowNumbers { get { return this._showNumbers; } set { this._showNumbers = value; } } public bool RemoveDuplicates { get { return this._removeDuplicates; } set { this._removeDuplicates = value; } } public DialogTypes DialogType { get { return this._dialogType; } set { this._dialogType = value; } } @@ -509,7 +506,11 @@ dlg.Add(lstItem); //--> aggiunta elemento nella lista } else - dlg.Add(_general.Separator); //--> se destinazione nulla: aggiunta separatore + { + dlg.ShowQuickNumbers = false; + dlg.Add(string.Empty); //--> se destinazione nulla: aggiunta separatore + dlg.ShowQuickNumbers = _general.ShowNumbers; + } } dlg.DoModal(GUIWindowManager.ActiveWindow); //--> visualizzazione menu @@ -551,9 +552,6 @@ innerNode = generalNode.SelectSingleNode("ShowSeparator"); if (innerNode != null) _general.ShowSeparator = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText)); - innerNode = generalNode.SelectSingleNode("Separator"); - if (innerNode != null) - _general.Separator = innerNode.InnerText; innerNode = generalNode.SelectSingleNode("ShowNumbers"); if (innerNode != null) _general.ShowNumbers = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText)); @@ -620,7 +618,6 @@ xmlSettings.WriteStartElement("General"); xmlSettings.WriteElementString("MenuHeader", _general.MenuHeader); xmlSettings.WriteElementString("ShowSeparator", Convert.ToInt16(_general.ShowSeparator).ToString()); - xmlSettings.WriteElementString("Separator", _general.Separator); xmlSettings.WriteElementString("ShowNumbers", Convert.ToInt16(_general.ShowNumbers).ToString()); xmlSettings.WriteElementString("RemoveDuplicates", Convert.ToInt16(_general.RemoveDuplicates).ToString()); xmlSettings.WriteElementString("DialogType", _general.DialogType.ToString()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |