|
From: <nic...@us...> - 2013-12-03 20:05:42
|
Revision: 4696
http://sourceforge.net/p/mp-plugins/code/4696
Author: nicsergio
Date: 2013-12-03 20:05:38 +0000 (Tue, 03 Dec 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-12-03 15:44:57 UTC (rev 4695)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-12-03 20:05:38 UTC (rev 4696)
@@ -74,7 +74,7 @@
this.saveButton = new System.Windows.Forms.Button();
this.generalGroupBox = new System.Windows.Forms.GroupBox();
this.showContextLabelCheckBox = new System.Windows.Forms.CheckBox();
- this.showSubMenuBackgroundCheckBox = new System.Windows.Forms.CheckBox();
+ this.showSubItemBackgroundCheckBox = new System.Windows.Forms.CheckBox();
this.multiImageTimeGroupBox = new System.Windows.Forms.GroupBox();
this.multiIMageTimeLabel = new System.Windows.Forms.Label();
this.multiImageTimeSecLabel = new System.Windows.Forms.Label();
@@ -622,7 +622,7 @@
// generalGroupBox
//
this.generalGroupBox.Controls.Add(this.showContextLabelCheckBox);
- this.generalGroupBox.Controls.Add(this.showSubMenuBackgroundCheckBox);
+ this.generalGroupBox.Controls.Add(this.showSubItemBackgroundCheckBox);
this.generalGroupBox.Controls.Add(this.multiImageTimeGroupBox);
this.generalGroupBox.Controls.Add(this.defaultMenuItemGroupBox);
this.generalGroupBox.Controls.Add(this.backgroundAnimatedCheckBox);
@@ -639,7 +639,7 @@
//
this.showContextLabelCheckBox.AutoSize = true;
this.showContextLabelCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.showContextLabelCheckBox.Location = new System.Drawing.Point(178, 42);
+ this.showContextLabelCheckBox.Location = new System.Drawing.Point(178, 41);
this.showContextLabelCheckBox.Name = "showContextLabelCheckBox";
this.showContextLabelCheckBox.Size = new System.Drawing.Size(116, 17);
this.showContextLabelCheckBox.TabIndex = 7;
@@ -647,17 +647,17 @@
this.showContextLabelCheckBox.UseVisualStyleBackColor = true;
this.showContextLabelCheckBox.CheckedChanged += new System.EventHandler(this.showContextLabelCheckBox_CheckedChanged);
//
- // showSubMenuBackgroundCheckBox
+ // showSubItemBackgroundCheckBox
//
- this.showSubMenuBackgroundCheckBox.AutoSize = true;
- this.showSubMenuBackgroundCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.showSubMenuBackgroundCheckBox.Location = new System.Drawing.Point(12, 85);
- this.showSubMenuBackgroundCheckBox.Name = "showSubMenuBackgroundCheckBox";
- this.showSubMenuBackgroundCheckBox.Size = new System.Drawing.Size(250, 17);
- this.showSubMenuBackgroundCheckBox.TabIndex = 6;
- this.showSubMenuBackgroundCheckBox.Text = "Show sub menu background (fast systems only)";
- this.showSubMenuBackgroundCheckBox.UseVisualStyleBackColor = true;
- this.showSubMenuBackgroundCheckBox.CheckedChanged += new System.EventHandler(this.showSubMenuBackgroundCheckBox_CheckedChanged);
+ this.showSubItemBackgroundCheckBox.AutoSize = true;
+ this.showSubItemBackgroundCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.showSubItemBackgroundCheckBox.Location = new System.Drawing.Point(12, 85);
+ this.showSubItemBackgroundCheckBox.Name = "showSubItemBackgroundCheckBox";
+ this.showSubItemBackgroundCheckBox.Size = new System.Drawing.Size(250, 17);
+ this.showSubItemBackgroundCheckBox.TabIndex = 6;
+ this.showSubItemBackgroundCheckBox.Text = "Show sub menu background (fast systems only)";
+ this.showSubItemBackgroundCheckBox.UseVisualStyleBackColor = true;
+ this.showSubItemBackgroundCheckBox.CheckedChanged += new System.EventHandler(this.showSubItemBackgroundCheckBox_CheckedChanged);
//
// multiImageTimeGroupBox
//
@@ -1193,7 +1193,7 @@
private System.Windows.Forms.Panel defaultItemLeftPanel;
private System.Windows.Forms.Panel defaultItemRightPanel;
private System.Windows.Forms.CheckBox showContextLabelCheckBox;
- private System.Windows.Forms.CheckBox showSubMenuBackgroundCheckBox;
+ private System.Windows.Forms.CheckBox showSubItemBackgroundCheckBox;
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-12-03 15:44:57 UTC (rev 4695)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-12-03 20:05:38 UTC (rev 4696)
@@ -52,9 +52,9 @@
DefaultMenuItemRefresh();
defaultMenuItemComboBox.SelectedIndex = myMenu.GeneralDefaultItemIndex;
showRssCheckBox.Checked = myMenu.GeneralShowRSS;
- showContextLabelCheckBox.Checked = false;
+ showContextLabelCheckBox.Checked = myMenu.GeneralShowContextLabel;
backgroundAnimatedCheckBox.Checked = myMenu.GeneralBackgroundAnimated;
- showSubMenuBackgroundCheckBox.Checked = false;
+ showSubItemBackgroundCheckBox.Checked = myMenu.GeneralShowSubItemBackground;
int multiImageTime = myMenu.GeneralMultiImageTime / 1000;
multiImageTimeTrackBar.Value = ((multiImageTime >= multiImageTimeTrackBar.Minimum & multiImageTime <= multiImageTimeTrackBar.Maximum) ? multiImageTime : multiImageTimeTrackBar.Maximum);
multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString();
@@ -489,12 +489,14 @@
}
private void SaveMenu() //Salvataggio impostazioni e creazione menu
{
- myMenu.GeneralDefaultItemIndex = defaultMenuItemComboBox.SelectedIndex;
- myMenu.GeneralShowRSS = showRssCheckBox.Checked;
- myMenu.GeneralBackgroundAnimated = backgroundAnimatedCheckBox.Checked;
- myMenu.GeneralMultiImageTime = multiImageTimeTrackBar.Value * 1000;
- myMenu.EditorClearCache = clearCacheCheckBox.Checked;
- myMenu.EditorCreateBackup = createBackupCheckBox.Checked;
+ myMenu.GeneralDefaultItemIndex = defaultMenuItemComboBox.SelectedIndex;
+ myMenu.GeneralShowRSS = showRssCheckBox.Checked;
+ myMenu.GeneralShowContextLabel = showContextLabelCheckBox.Checked;
+ myMenu.GeneralBackgroundAnimated = backgroundAnimatedCheckBox.Checked;
+ myMenu.GeneralShowSubItemBackground = showSubItemBackgroundCheckBox.Checked;
+ myMenu.GeneralMultiImageTime = multiImageTimeTrackBar.Value * 1000;
+ myMenu.EditorClearCache = clearCacheCheckBox.Checked;
+ myMenu.EditorCreateBackup = createBackupCheckBox.Checked;
if (myMenu.SaveMenu(myMediaPortal.SelectedSkin.CachePath,
myMediaPortal.SelectedSkin.SkinPath)) //--> salvataggio & creazione (con eventuale cancellazione cache)
@@ -782,7 +784,7 @@
{
unsavedChanges = true;
}
- private void showSubMenuBackgroundCheckBox_CheckedChanged(object sender, EventArgs e)
+ private void showSubItemBackgroundCheckBox_CheckedChanged(object sender, EventArgs e)
{
unsavedChanges = true;
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-12-03 15:44:57 UTC (rev 4695)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-12-03 20:05:38 UTC (rev 4696)
@@ -249,7 +249,7 @@
<metadata name="showContextLabelCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="showSubMenuBackgroundCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <metadata name="showSubItemBackgroundCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="multiImageTimeGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-12-03 15:44:57 UTC (rev 4695)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-12-03 20:05:38 UTC (rev 4696)
@@ -45,7 +45,9 @@
private struct GeneralSettings //Struttura impostazioni generali di menu
{
public bool ShowRSS; //Attivazione visualizzazione notizie RSS
+ public bool ShowContextLabel; //Attivazione visualizzazione del testo aggiuntivo ("guarda"-"ascolta"-ecc.) degli elementi di menu
public bool BackgroundAnimated; //Attivazione animazione immagini di background
+ public bool ShowSubItemBackground; //Attivazione visualizzazione immagini di background specifiche per gli elementi di sotto-menu
public int DefaultItemIndex; //Indice elemento di menu predefinito (selezionato all'entrata)
public int MultiImageTime; //Tempo di commutazione immagini per controlli multi-image [ms]
}
@@ -101,9 +103,15 @@
innerNode = generalNode.SelectSingleNode("ShowRSS");
if (innerNode != null)
_general.ShowRSS = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
+ innerNode = generalNode.SelectSingleNode("ShowContextLabel");
+ if (innerNode != null)
+ _general.ShowContextLabel = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
innerNode = generalNode.SelectSingleNode("BackgroundAnimated");
if (innerNode != null)
_general.BackgroundAnimated = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
+ innerNode = generalNode.SelectSingleNode("ShowSubItemBackground");
+ if (innerNode != null)
+ _general.ShowSubItemBackground = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText));
innerNode = generalNode.SelectSingleNode("DefaultItemIndex");
if (innerNode != null)
_general.DefaultItemIndex = Convert.ToInt32(innerNode.InnerText);
@@ -247,10 +255,12 @@
const string NodeName = @"/profile";
- XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.ShowRSS", Convert.ToInt16(_general.ShowRSS).ToString());
- XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.BackgroundAnimated", Convert.ToInt16(_general.BackgroundAnimated).ToString());
- XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.DefaultItemIndex", "1"); //(_general.DefaultItemIndex + 1).ToString());
- XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.MultiImageTime", _general.MultiImageTime.ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.ShowRSS", Convert.ToInt16(_general.ShowRSS).ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.ShowContextLabel", Convert.ToInt16(_general.ShowContextLabel).ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.BackgroundAnimated", Convert.ToInt16(_general.BackgroundAnimated).ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.ShowSubItemBackground", Convert.ToInt16(_general.ShowSubItemBackground).ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.DefaultItemIndex", "1"); //(_general.DefaultItemIndex + 1).ToString());
+ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.MultiImageTime", _general.MultiImageTime.ToString());
/* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo
e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */
@@ -392,10 +402,12 @@
menuSettings.WriteElementString("CreateBackup", Convert.ToInt16(_editor.CreateBackup).ToString());
menuSettings.WriteEndElement();
menuSettings.WriteStartElement("General"); //--> salvataggio impostazioni generali di menu
- menuSettings.WriteElementString("ShowRSS", Convert.ToInt16(_general.ShowRSS).ToString());
- menuSettings.WriteElementString("BackgroundAnimated", Convert.ToInt16(_general.BackgroundAnimated).ToString());
- menuSettings.WriteElementString("DefaultItemIndex", _general.DefaultItemIndex.ToString());
- menuSettings.WriteElementString("MultiImageTime", _general.MultiImageTime.ToString());
+ menuSettings.WriteElementString("ShowRSS", Convert.ToInt16(_general.ShowRSS).ToString());
+ menuSettings.WriteElementString("ShowContextLabel", Convert.ToInt16(_general.ShowContextLabel).ToString());
+ menuSettings.WriteElementString("BackgroundAnimated", Convert.ToInt16(_general.BackgroundAnimated).ToString());
+ menuSettings.WriteElementString("ShowSubItemBackground", Convert.ToInt16(_general.ShowSubItemBackground).ToString());
+ menuSettings.WriteElementString("DefaultItemIndex", _general.DefaultItemIndex.ToString());
+ menuSettings.WriteElementString("MultiImageTime", _general.MultiImageTime.ToString());
menuSettings.WriteEndElement();
menuSettings.WriteStartElement("Items");
foreach (MenuItem mItem in _items) //Iterazione per salvataggio elementi di menu
@@ -456,17 +468,19 @@
#endregion
#region Proprietà
- public bool Initialized { get { return this._initialized; } }
- public bool EditorClearCache { get { return this._editor.ClearCache; } set { this._editor.ClearCache = value; } }
- public bool EditorCreateBackup { get { return this._editor.CreateBackup; } set { this._editor.CreateBackup = value; } }
- public bool GeneralShowRSS { get { return this._general.ShowRSS; } set { this._general.ShowRSS = value; } }
- public bool GeneralBackgroundAnimated { get { return this._general.BackgroundAnimated; } set { this._general.BackgroundAnimated = value; } }
- public int GeneralDefaultItemIndex { get { return this._general.DefaultItemIndex; } set { this._general.DefaultItemIndex = value; } }
- public int GeneralMultiImageTime { get { return this._general.MultiImageTime; } set { this._general.MultiImageTime = value; } }
- public BindingList<MenuItem> Items { get { return this._items; } }
- public int MenuItemsMinNum { get { return this.ItemsMinNum; } }
- public int MenuItemsMaxNum { get { return this.ItemsMaxNum; } }
- public int SubMenuItemsMaxNum { get { return this.SubItemsMaxNum; } }
+ public bool Initialized { get { return this._initialized; } }
+ public bool EditorClearCache { get { return this._editor.ClearCache; } set { this._editor.ClearCache = value; } }
+ public bool EditorCreateBackup { get { return this._editor.CreateBackup; } set { this._editor.CreateBackup = value; } }
+ public bool GeneralShowRSS { get { return this._general.ShowRSS; } set { this._general.ShowRSS = value; } }
+ public bool GeneralShowContextLabel { get { return this._general.ShowContextLabel; } set { this._general.ShowContextLabel = value; } }
+ public bool GeneralBackgroundAnimated { get { return this._general.BackgroundAnimated; } set { this._general.BackgroundAnimated = value; } }
+ public bool GeneralShowSubItemBackground { get { return this._general.ShowSubItemBackground; } set { this._general.ShowSubItemBackground = value; } }
+ public int GeneralDefaultItemIndex { get { return this._general.DefaultItemIndex; } set { this._general.DefaultItemIndex = value; } }
+ public int GeneralMultiImageTime { get { return this._general.MultiImageTime; } set { this._general.MultiImageTime = value; } }
+ public BindingList<MenuItem> Items { get { return this._items; } }
+ public int MenuItemsMinNum { get { return this.ItemsMinNum; } }
+ public int MenuItemsMaxNum { get { return this.ItemsMaxNum; } }
+ public int SubMenuItemsMaxNum { get { return this.SubItemsMaxNum; } }
#endregion
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml 2013-12-03 15:44:57 UTC (rev 4695)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml 2013-12-03 20:05:38 UTC (rev 4696)
@@ -6,7 +6,9 @@
</Editor>
<General>
<ShowRSS>1</ShowRSS>
+ <ShowContextLabel>1</ShowContextLabel>
<BackgroundAnimated>1</BackgroundAnimated>
+ <ShowSubItemBackground>0</ShowSubItemBackground>
<DefaultItemIndex>2</DefaultItemIndex>
<MultiImageTime>15000</MultiImageTime>
</General>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|