Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4768] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-03-01 18:05:32
|
Revision: 4768
http://sourceforge.net/p/mp-plugins/code/4768
Author: nicsergio
Date: 2014-03-01 18:05:25 +0000 (Sat, 01 Mar 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
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/XtremeMenuEditor.csproj
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -105,7 +105,6 @@
this.Controls.Add(this.itemsTabControl);
this.Name = "SkinItems";
this.Size = new System.Drawing.Size(247, 573);
- this.Load += new System.EventHandler(this.SkinItemsControl_Load);
this.SizeChanged += new System.EventHandler(this.SkinItemsControl_SizeChanged);
this.itemsTabControl.ResumeLayout(false);
this.linksTabPage.ResumeLayout(false);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -7,7 +7,7 @@
namespace My.Common
{
- public partial class SkinItems : UserControl
+ internal partial class SkinItems : UserControl
{
public SkinItems()
{
@@ -20,8 +20,8 @@
//Impostazione spazio dei nomi predefinito
//DefaultNamespace = resNames.ElementAt(0).Substring(0, resNames.ElementAt(0).IndexOf(".Resource"));
- _skinLinksImgs.ImageSize = new Size(24, 24);
- _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
+ skinLinksImgs.ImageSize = new Size(24, 24);
+ skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit;
foreach (string resName in resNames) //Iterazione di caricamento immagini per treevie link della skin
{
try
@@ -29,19 +29,19 @@
//Chiave: nome immagine senza percorso
string resKey = resName.Remove(0, resName.LastIndexOf("TreeViewIcons.") + "TreeViewIcons.".Length);
//Aggiunta dell'immagine
- _skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
+ skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName)));
}
catch { }
}
}
- public delegate void ItemChanged(SkinItemsType itemType, int index);
- public new event ItemChanged Enter;
- public event ItemChanged Changed;
- public new event ItemChanged DoubleClick;
+ public delegate void ItemChanged(SkinItemsType itemType, int selectedIndex);
+ public new event EventHandler Enter;
+ public new event EventHandler DoubleClick;
+ public event EventHandler SelectedIndexChanged;
- protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
+ protected ImageList skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
public enum SkinItemsType //Tipologie di azioni di modica stato
{
@@ -58,7 +58,7 @@
int i = 0;
skinLinksTreeView.Nodes.Clear();
- skinLinksTreeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview
+ skinLinksTreeView.ImageList = skinLinksImgs; //--> aggancio a lista immagini per treeview
TreeNode node = new TreeNode();
foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview
{
@@ -69,38 +69,20 @@
i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
}
- skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
- if (selectFirst)
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
if (collapseTreeView)
skinLinksTreeView.CollapseAll();
else
skinLinksTreeView.ExpandAll();
+ skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1);
+ if (selectFirst)
+ skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
+
}
- internal void SetIndex(int index)
- {
- if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
- {
- try
- {
- skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
- }
- catch
- {
- skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
- }
- else
- skinFilesListBox.SelectedIndex = index; //--> selezione eventuale file corrispondente a WindowID
- }
+
- private void SkinItemsControl_Load(object sender, EventArgs e)
- {
-
- }
private void SwitchFocus()
{
if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
@@ -119,49 +101,86 @@
private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
{
- SwitchFocus();
+ Focus();
}
private void itemsTabControl_Click(object sender, EventArgs e)
{
- SwitchFocus();
+ Focus();
}
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinFilesListBox_Enter(object sender, EventArgs e)
{
- Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (Enter != null)
+ Enter(sender, e);
}
-
- private void skinFilesListBox_Enter(object sender, EventArgs e)
+ private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
{
- Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (SelectedIndexChanged != null)
+ SelectedIndexChanged(sender, e);
}
-
private void skinFilesListBox_DoubleClick(object sender, EventArgs e)
{
- DoubleClick(SkinItemsType.Files, skinFilesListBox.SelectedIndex);
+ if (DoubleClick != null)
+ DoubleClick(sender, e);
}
-
+ private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ {
+ if (Enter != null)
+ Enter(sender, e);
+ }
private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- Changed(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (SelectedIndexChanged != null)
+ SelectedIndexChanged(sender, e);
}
-
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
+ private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- Enter(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (DoubleClick != null)
+ DoubleClick(sender, e);
}
- private void skinLinksTreeView_DoubleClick(object sender, EventArgs e)
+
+
+
+ public new void Focus()
{
- //Indice nodo selezionato TreeView --> corrispondente a chiave)
- DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ skinLinksTreeView.Focus();
+ else
+ skinFilesListBox.Focus();
}
+ public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } set { itemsTabControl.SelectedIndex = (int)value; } }
+ public new bool Focused { get { return (skinFilesListBox.Focused | skinLinksTreeView.Focused | itemsTabControl.Focused); } }
+ public new Color BackColor { get { return skinFilesListBox.BackColor; } set { if (skinFilesListBox.BackColor != value) { skinFilesListBox.BackColor = value; skinLinksTreeView.BackColor = value; } } }
- public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } }
-
+ public int SelectedIndex
+ {
+ get
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ return (skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1;
+ else
+ return skinFilesListBox.SelectedIndex;
+ }
+ set
+ {
+ if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ {
+ //Indice nodo selezionato TreeView --> corrispondente a chiave)
+ try
+ {
+ skinLinksTreeView.SelectedNode = ((value >= 0) ? skinLinksTreeView.Nodes.Find(value.ToString(), true)[0] : null);
+ }
+ catch
+ {
+ skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
+ }
+ }
+ else
+ skinFilesListBox.SelectedIndex = value; //--> selezione eventuale file corrispondente a WindowID
+ }
+ }
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -7,7 +7,7 @@
namespace My.Common
{
- public partial class VersionInfo : Form //Form di visualizzazione informazioni sulla versione
+ internal partial class VersionInfo : Form //Form di visualizzazione informazioni sulla versione
{
#region Dati
static VersionInfo myVersionInfo; //Istanza form di visualizzazione versione
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-03-01 18:05:25 UTC (rev 4768)
@@ -29,6 +29,7 @@
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = EXE|x86
+ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = EXE|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = DLL|x86
{350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = DLL|x86
{4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU
@@ -47,7 +48,6 @@
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -355,11 +355,13 @@
//
this.skinItems.Location = new System.Drawing.Point(266, 8);
this.skinItems.Name = "skinItems";
+ this.skinItems.SelectedIndex = -1;
+ this.skinItems.SelectedTab = My.Common.SkinItems.SkinItemsType.Links;
this.skinItems.Size = new System.Drawing.Size(330, 260);
this.skinItems.TabIndex = 39;
- this.skinItems.Enter += new My.Common.SkinItems.ItemChanged(this.skinItems_Enter);
- this.skinItems.Changed += new My.Common.SkinItems.ItemChanged(this.skinItems_Changed);
- this.skinItems.DoubleClick += new My.Common.SkinItems.ItemChanged(this.skinItems_DoubleClick);
+ this.skinItems.Enter += new System.EventHandler(this.skinItems_Enter);
+ this.skinItems.DoubleClick += new System.EventHandler(this.skinItems_DoubleClick);
+ this.skinItems.SelectedIndexChanged += new System.EventHandler(this.skinItems_SelectedIndexChanged);
//
// ShortCuterConfig
//
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -144,9 +144,9 @@
shortCutsDataGridView.DataSource = myShortCuts.Items;
}
- private void ShowLinkProperties(SkinItems.SkinItemsType itemType, int index) //Visualizzazione proprietà link
+ private void ShowLinkProperties() //Visualizzazione proprietà link
{
- if (index < 0) //Se indice invalido --> reset proprietà
+ if (skinItems.SelectedIndex < 0) //Se indice invalido --> reset proprietà
{
skinFileLabel.Text = "-";
windowIdLabel.Text = "-";
@@ -154,18 +154,18 @@
}
else //Visualizzazione proprietà elemento selezionato
{
- switch (itemType)
+ switch (skinItems.SelectedTab)
{
case SkinItems.SkinItemsType.Files: //Lista files della skin
- skinFileLabel.Text = mySkin.SkinFiles[index].Name;
- windowIdLabel.Text = mySkin.SkinFiles[index].Id.ToString();
+ skinFileLabel.Text = mySkin.SkinFiles[skinItems.SelectedIndex].Name;
+ windowIdLabel.Text = mySkin.SkinFiles[skinItems.SelectedIndex].Id.ToString();
loadParameterTextBox.Text = "-";
break;
case SkinItems.SkinItemsType.Links: //Lista links predefiniti della skin
- skinFileLabel.Text = mySkin.SkinLinks[index].XmlFile;
- windowIdLabel.Text = mySkin.SkinLinks[index].WindowID.ToString();
- loadParameterTextBox.Text = mySkin.SkinLinks[index].LoadParameter;
+ skinFileLabel.Text = mySkin.SkinLinks[skinItems.SelectedIndex].XmlFile;
+ windowIdLabel.Text = mySkin.SkinLinks[skinItems.SelectedIndex].WindowID.ToString();
+ loadParameterTextBox.Text = mySkin.SkinLinks[skinItems.SelectedIndex].LoadParameter;
break;
}
}
@@ -189,7 +189,7 @@
//Selezione eventuale file corrispondente a WindowID
showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID);
- skinItems.SetIndex(showIndex);
+ skinItems.SelectedIndex = showIndex;
}
}
}
@@ -377,28 +377,28 @@
}
#endregion
#region Eventi Liste Files & Links Skin
- private void skinItems_Enter(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_Enter(object sender, EventArgs e)
{
propLeftPictureBox.Visible = false; //--> il link non è collegato allo shortcut selezionato
- ShowLinkProperties(itemType, index);
+ ShowLinkProperties();
}
- private void skinItems_Changed(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_SelectedIndexChanged(object sender, EventArgs e)
{
- ShowLinkProperties(itemType, index);
+ ShowLinkProperties();
}
- private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index)
+ private void skinItems_DoubleClick(object sender, EventArgs e)
{
- if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && index >= 0)
+ if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && skinItems.SelectedIndex >= 0)
{
- if (itemType == SkinItems.SkinItemsType.Files)
+ if (skinItems.SelectedTab == SkinItems.SkinItemsType.Files)
{
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[index].Id.ToString();
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinFiles[skinItems.SelectedIndex].Id.ToString();
shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = "";
}
else
{
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[index].WindowID.ToString();
- shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[index].LoadParameter;
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[skinItems.SelectedIndex].WindowID.ToString();
+ shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[skinItems.SelectedIndex].LoadParameter;
}
forceCell = true;
shortCutsDataGridView.CurrentCell = shortCutsDataGridView[5, shortCutsDataGridView.CurrentRow.Index];
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -30,11 +30,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BHEditorForm));
- this.itemsTabControl = new System.Windows.Forms.TabControl();
- this.linksTabPage = new System.Windows.Forms.TabPage();
- this.skinLinksTreeView = new System.Windows.Forms.TreeView();
- this.skinTabPage = new System.Windows.Forms.TabPage();
- this.skinFilesListBox = new System.Windows.Forms.ListBox();
this.multiImageFolderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog();
this.singleImageOpenFileDialog = new System.Windows.Forms.OpenFileDialog();
this.propertiesPanel = new System.Windows.Forms.Panel();
@@ -110,9 +105,7 @@
this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox();
this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox();
this.arrowsPictureBox = new System.Windows.Forms.PictureBox();
- this.itemsTabControl.SuspendLayout();
- this.linksTabPage.SuspendLayout();
- this.skinTabPage.SuspendLayout();
+ this.skinItems = new My.Common.SkinItems();
this.propertiesPanel.SuspendLayout();
this.propertiesGroupBox.SuspendLayout();
this.iconGroupBox.SuspendLayout();
@@ -138,64 +131,6 @@
((System.ComponentModel.ISupportInitialize)(this.arrowsPictureBox)).BeginInit();
this.SuspendLayout();
//
- // itemsTabControl
- //
- this.itemsTabControl.Controls.Add(this.linksTabPage);
- this.itemsTabControl.Controls.Add(this.skinTabPage);
- this.itemsTabControl.ItemSize = new System.Drawing.Size(74, 18);
- this.itemsTabControl.Location = new System.Drawing.Point(12, 12);
- this.itemsTabControl.Name = "itemsTabControl";
- this.itemsTabControl.SelectedIndex = 0;
- this.itemsTabControl.Size = new System.Drawing.Size(247, 573);
- this.itemsTabControl.TabIndex = 0;
- this.itemsTabControl.SelectedIndexChanged += new System.EventHandler(this.itemsTabControl_SelectedIndexChanged);
- this.itemsTabControl.Click += new System.EventHandler(this.itemsTabControl_Click);
- //
- // linksTabPage
- //
- this.linksTabPage.Controls.Add(this.skinLinksTreeView);
- this.linksTabPage.Location = new System.Drawing.Point(4, 22);
- this.linksTabPage.Name = "linksTabPage";
- this.linksTabPage.Padding = new System.Windows.Forms.Padding(3);
- this.linksTabPage.Size = new System.Drawing.Size(239, 547);
- this.linksTabPage.TabIndex = 0;
- this.linksTabPage.Text = "Default Links";
- this.linksTabPage.UseVisualStyleBackColor = true;
- //
- // skinLinksTreeView
- //
- this.skinLinksTreeView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
- this.skinLinksTreeView.FullRowSelect = true;
- this.skinLinksTreeView.HideSelection = false;
- this.skinLinksTreeView.Location = new System.Drawing.Point(1, 5);
- this.skinLinksTreeView.Name = "skinLinksTreeView";
- this.skinLinksTreeView.Size = new System.Drawing.Size(235, 538);
- this.skinLinksTreeView.TabIndex = 1;
- this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
- this.skinLinksTreeView.Enter += new System.EventHandler(this.skinLinksTreeView_Enter);
- //
- // skinTabPage
- //
- this.skinTabPage.Controls.Add(this.skinFilesListBox);
- this.skinTabPage.Location = new System.Drawing.Point(4, 22);
- this.skinTabPage.Name = "skinTabPage";
- this.skinTabPage.Padding = new System.Windows.Forms.Padding(3);
- this.skinTabPage.Size = new System.Drawing.Size(239, 547);
- this.skinTabPage.TabIndex = 1;
- this.skinTabPage.Text = "Skin Files";
- this.skinTabPage.UseVisualStyleBackColor = true;
- //
- // skinFilesListBox
- //
- this.skinFilesListBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227)))));
- this.skinFilesListBox.FormattingEnabled = true;
- this.skinFilesListBox.Location = new System.Drawing.Point(1, 5);
- this.skinFilesListBox.Name = "skinFilesListBox";
- this.skinFilesListBox.Size = new System.Drawing.Size(235, 537);
- this.skinFilesListBox.TabIndex = 0;
- this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged);
- this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter);
- //
// multiImageFolderBrowserDialog
//
this.multiImageFolderBrowserDialog.Description = "Select multi-image folder for this menu item";
@@ -1045,18 +980,29 @@
this.arrowsPictureBox.TabIndex = 26;
this.arrowsPictureBox.TabStop = false;
//
+ // skinItems
+ //
+ this.skinItems.Location = new System.Drawing.Point(12, 12);
+ this.skinItems.Name = "skinItems";
+ this.skinItems.SelectedIndex = -1;
+ this.skinItems.SelectedTab = My.Common.SkinItems.SkinItemsType.Links;
+ this.skinItems.Size = new System.Drawing.Size(247, 573);
+ this.skinItems.TabIndex = 32;
+ this.skinItems.Enter += new System.EventHandler(this.skinItems_Enter);
+ this.skinItems.SelectedIndexChanged += new System.EventHandler(this.skinItems_SelectedIndexChanged);
+ //
// BHEditorForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(1018, 602);
+ this.Controls.Add(this.skinItems);
this.Controls.Add(this.menuPanel);
this.Controls.Add(this.propertiesPanel);
this.Controls.Add(this.infoPictureBox);
this.Controls.Add(this.subMenuRowAddButton);
this.Controls.Add(this.menuRowAddButton);
- this.Controls.Add(this.itemsTabControl);
this.Controls.Add(this.propLeftPictureBox);
this.Controls.Add(this.propRightPictureBox);
this.Controls.Add(this.menuRowEditButton);
@@ -1073,9 +1019,6 @@
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BHEditorForm_FormClosing);
this.Load += new System.EventHandler(this.BHEditorForm_Load);
this.Shown += new System.EventHandler(this.BHEditorForm_Shown);
- this.itemsTabControl.ResumeLayout(false);
- this.linksTabPage.ResumeLayout(false);
- this.skinTabPage.ResumeLayout(false);
this.propertiesPanel.ResumeLayout(false);
this.propertiesGroupBox.ResumeLayout(false);
this.propertiesGroupBox.PerformLayout();
@@ -1114,10 +1057,6 @@
#endregion
- private System.Windows.Forms.TabControl itemsTabControl;
- private System.Windows.Forms.TabPage linksTabPage;
- private System.Windows.Forms.TabPage skinTabPage;
- private System.Windows.Forms.ListBox skinFilesListBox;
private System.Windows.Forms.FolderBrowserDialog multiImageFolderBrowserDialog;
private System.Windows.Forms.OpenFileDialog singleImageOpenFileDialog;
private System.Windows.Forms.Panel propertiesPanel;
@@ -1176,7 +1115,6 @@
private System.Windows.Forms.CheckBox clearCacheCheckBox;
private System.Windows.Forms.Timer backgroundImageTimer;
private System.Windows.Forms.PictureBox fanartHandlerPictureBox;
- private System.Windows.Forms.TreeView skinLinksTreeView;
private System.Windows.Forms.GroupBox iconGroupBox;
private System.Windows.Forms.PictureBox iconPictureBox;
private System.Windows.Forms.ComboBox iconComboBox;
@@ -1194,6 +1132,7 @@
private System.Windows.Forms.Panel defaultItemRightPanel;
private System.Windows.Forms.CheckBox showContextLabelCheckBox;
private System.Windows.Forms.CheckBox showSubItemBackgroundCheckBox;
+ private My.Common.SkinItems skinItems;
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2014-03-01 18:05:25 UTC (rev 4768)
@@ -34,6 +34,16 @@
private bool falseAddMenuItem; //Aggiunta virtuale elemento di menu (usata per editazione)
private string[] bgImages = new string[50]; //Array immagini di background da visualizzare (multi-immagine)
private int bgImageIndex = 0; //Indice immagine di background visualizzata (multi-immagine)
+
+
+ public enum ShowItemsType //Tipologie di azioni di modica stato
+ {
+ SkinLinks = 0, //--> reset blocco
+ SkinFiles = 1,
+ MenuItems = 2,
+ SubMenuItems //--> nessuna modifica (stato invariato)
+ }
+
#endregion
#region Costruttore
@@ -65,11 +75,7 @@
multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString();
clearCacheCheckBox.Checked = myMenu.EditorClearCache;
createBackupCheckBox.Checked = myMenu.EditorCreateBackup;
- skinFilesListBox.DataSource = myMediaPortal.SelectedSkin.SkinFiles;
- skinFilesListBox.SelectedIndex = 0;
- myMediaPortal.SelectedSkin.FillTreeViewSkinLinks(skinLinksTreeView);
- skinLinksTreeView.ExpandAll();
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0];
+ skinItems.Populate(myMediaPortal.SelectedSkin.SkinFiles, myMediaPortal.SelectedSkin.SkinLinks, true, false);
unsavedChanges = false; //--> necessario a fine aggiornamento controlli grafici
@@ -92,35 +98,22 @@
toolTip.SetToolTip(saveButton, "Save settings and create custom menu");
toolTip.SetToolTip(infoPictureBox, "Version information");
}
- private void ShowItemProperties(object listControl) //Visualizzazione proprietà elemento di menu/sotto-menu
+ private void ShowItemProperties(ShowItemsType itemType, int index, bool focused) //Visualizzazione proprietà elemento di skin/menu/sotto-menu
{
- Control itemsList = (Control)listControl; //Casting sender -> Control
- int selectedIndex; //Indice eventuale elemento selezionato
+ if (!focused || index < 0)
+ return; //Se controllo non attivo o indice invalido --> uscita dalla procedura
- if (itemsList is ListBox)
- {
- ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox
- selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato
- }
- else
- {
- TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView
- selectedIndex= myMediaPortal.SelectedSkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato
- }
-
- if (!itemsList.Focused || selectedIndex < 0)
- return; //Se controllo non attivo o indice invalido --> uscita dalla procedura
const string propBoxText = "Item Properties";
showingProperties = true; //--> inibizione eventi di rinfresco immagini
- switch (itemsList.Name)
+ switch (itemType)
{
- case "skinFilesListBox": //Lista files della skin
+ case ShowItemsType.SkinFiles: //Lista files della skin
propertiesGroupBox.Text = propBoxText + " (Skin Files)";
contextTextBox.Enabled= true;
contextTextBox.Text = "";
captionTextBox.Text = "";
- skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Name;
- windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Id.ToString();
+ skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Name;
+ windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[index].Id.ToString();
loadParameterTextBox.Text = "";
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
@@ -137,94 +130,92 @@
subMenuRowAddButton.Visible = true;
menuRowEditButton.Visible = false;
subMenuRowEditButton.Visible = false;
- skinFilesListBox.BackColor = Color.Aquamarine;
- skinLinksTreeView.BackColor = Color.FromArgb(213,220,227);
+ skinItems.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
subMenuListBox.BackColor = Color.White;
break;
- case "skinLinksTreeView": //Lista links predefiniti della skin
+ case ShowItemsType.SkinLinks: //Lista links predefiniti della skin
propertiesGroupBox.Text = propBoxText + " (Default Links)";
contextTextBox.Enabled= true;
- contextTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Context;
- captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Caption;
- skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].WindowID.ToString();
- loadParameterTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].LoadParameter;
+ contextTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].Context;
+ captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].Caption;
+ skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[index].XmlFile;
+ windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[index].WindowID.ToString();
+ loadParameterTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].LoadParameter;
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundImage.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundImage.Length > 0)
{
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundImage;
}
else
{
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundFolder.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundFolder.Length > 0)
{
multiImageRadioButton.Checked = true;
- multiImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].BackgroundFolder;
+ multiImageComboBox.Text = myMediaPortal.SelectedSkin.SkinLinks[index].BackgroundFolder;
}
else
{
- if (myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].FanartHandler.Length > 0)
+ if (myMediaPortal.SelectedSkin.SkinLinks[index].FanartHandler.Length > 0)
{
fanartRadioButton.Checked = true;
- fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].FanartHandler));
+ fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMediaPortal.SelectedSkin.SkinLinks[index].FanartHandler));
}
}
}
iconComboBox.Text = "";
overlayGroupBox.Enabled = true;
- overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay));
+ overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[index].Overlay));
propLeftPictureBox.Visible = true;
propRightPictureBox.Visible = false;
menuRowAddButton.Visible = true;
subMenuRowAddButton.Visible = true;
menuRowEditButton.Visible = false;
subMenuRowEditButton.Visible = false;
- skinLinksTreeView.BackColor = Color.Aquamarine;
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
subMenuListBox.BackColor = Color.White;
break;
- case "menuListBox": //Lista elementi di menu
+ case ShowItemsType.MenuItems: //Lista elementi di menu
propertiesGroupBox.Text = propBoxText + " (Menu)";
contextTextBox.Enabled= true;
- contextTextBox.Text = myMenu.Items[selectedIndex].Context;
- captionTextBox.Text = myMenu.Items[selectedIndex].Caption;
- skinFileShowLabel.Text = myMenu.Items[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMenu.Items[selectedIndex].Hyperlink.ToString();
- loadParameterTextBox.Text = myMenu.Items[selectedIndex].HyperlinkParameter;
+ contextTextBox.Text = myMenu.Items[index].Context;
+ captionTextBox.Text = myMenu.Items[index].Caption;
+ skinFileShowLabel.Text = myMenu.Items[index].XmlFile;
+ windowIdShowLabel.Text = myMenu.Items[index].Hyperlink.ToString();
+ loadParameterTextBox.Text = myMenu.Items[index].HyperlinkParameter;
multiImageRadioButton.Enabled = true;
fanartRadioButton.Enabled = true;
- if (myMenu.Items[selectedIndex].BackgroundImage.Length > 0)
+ if (myMenu.Items[index].BackgroundImage.Length > 0)
{
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMenu.Items[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMenu.Items[index].BackgroundImage;
}
else
{
- if (myMenu.Items[selectedIndex].BackgroundFolder.Length > 0)
+ if (myMenu.Items[index].BackgroundFolder.Length > 0)
{
multiImageRadioButton.Checked = true;
- multiImageComboBox.Text = myMenu.Items[selectedIndex].BackgroundFolder;
+ multiImageComboBox.Text = myMenu.Items[index].BackgroundFolder;
}
else
{
- if (myMenu.Items[selectedIndex].FanartHandler.Length > 0)
+ if (myMenu.Items[index].FanartHandler.Length > 0)
{
fanartRadioButton.Checked = true;
- fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMenu.Items[selectedIndex].FanartHandler));
+ fanartComboBox.SelectedIndex = fanartComboBox.FindStringExact(myMediaPortal.GetFanartDescription(myMenu.Items[index].FanartHandler));
}
}
}
- iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[selectedIndex].Icon);
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[index].Icon);
overlayGroupBox.Enabled = true;
- overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay));
+ overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[index].Overlay));
propLeftPictureBox.Visible = false;
propRightPictureBox.Visible = true;
menuRowAddButton.Visible = false;
@@ -233,27 +224,26 @@
subMenuRowEditButton.Visible = false;
menuListBox.BackColor = Color.Aquamarine;
subMenuListBox.BackColor = Color.White;
- skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227);
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.FromArgb(213, 220, 227);
break;
- case "subMenuListBox": //Lista elementi di sotto-menu
+ case ShowItemsType.SubMenuItems: //Lista elementi di sotto-menu
if (menuListBox.SelectedIndex < 0)
return;
propertiesGroupBox.Text = propBoxText + " (Sub Menu)";
contextTextBox.Enabled = false;
contextTextBox.Text = "";
- captionTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Caption;
- skinFileShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].XmlFile;
- windowIdShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Hyperlink.ToString();
- loadParameterTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].HyperlinkParameter;
+ captionTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Caption;
+ skinFileShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].XmlFile;
+ windowIdShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Hyperlink.ToString();
+ loadParameterTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].HyperlinkParameter;
singleImageRadioButton.Checked = true;
- singleImageComboBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].BackgroundImage;
+ singleImageComboBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].BackgroundImage;
multiImageComboBox.SelectedIndex = 0;
multiImageRadioButton.Enabled = false;
fanartComboBox.SelectedIndex = 0;
fanartRadioButton.Enabled = false;
- iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Icon);
+ iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index].Icon);
overlayGroupBox.Enabled = false;
overlayComboBox.SelectedIndex = 0;
propLeftPictureBox.Visible = false;
@@ -264,8 +254,7 @@
subMenuRowEditButton.Visible = true;
subMenuListBox.BackColor = Color.Aquamarine;
menuListBox.BackColor = Color.White;
- skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227);
- skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227);
+ skinItems.BackColor = Color.FromArgb(213, 220, 227);
break;
}
@@ -537,7 +526,7 @@
}
private void BHEditorForm_Shown(object sender, EventArgs e)
{
- skinLinksTreeView.Focus();
+ skinItems.Focus();
}
private void BHEditorForm_FormClosing(object sender, FormClosingEventArgs e)
{
@@ -552,36 +541,14 @@
}
#endregion
#region Eventi Liste Files & Links Skin
- private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e)
+ private void skinItems_Enter(object sender, EventArgs e)
{
- if (itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
+ ShowItemProperties((ShowItemsType)skinItems.SelectedTab, skinItems.SelectedIndex, skinItems.Focused);
}
- private void itemsTabControl_Click(object sender, EventArgs e)
+ private void skinItems_SelectedIndexChanged(object sender, EventArgs e)
{
- if (itemsTabControl.SelectedIndex == 0)
- skinLinksTreeView.Focus();
- else
- skinFilesListBox.Focus();
+ ShowItemProperties((ShowItemsType)skinItems.SelectedTab, skinItems.SelectedIndex, skinItems.Focused);
}
- private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinFilesListBox_Enter(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e)
- {
- ShowItemProperties(sender);
- }
- private void skinLinksTreeView_Enter(object sender, EventArgs e)
- {
- ShowItemProperties(sender);
- }
#endregion
#region Eventi Selezione Immagine(i) Background & Icona
private void singleImageRadioButton_CheckedChanged(object sender, EventArgs e)
@@ -736,7 +703,7 @@
{
subMenuArrowPictureBox.Top = 22 + ((menuListBox.SelectedIndex >= 0) ? menuListBox.SelectedIndex : 0) * menuListBox.ItemHeight;
ModifyMenuListButtonsEnable();
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
if (!movingItem)
{
updateNotifyTimer.Enabled = false;
@@ -745,12 +712,12 @@
}
private void menuListBox_Enter(object sender, EventArgs e)
{
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
}
private void subMenuListBox_SelectedIndexChanged(object sender, EventArgs e)
{
ModifyMenuListButtonsEnable();
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
if (!movingItem)
{
updateNotifyTimer.Enabled = false;
@@ -759,7 +726,7 @@
}
private void subMenuListBox_Enter(object sender, EventArgs e)
{
- ShowItemProperties(sender);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
}
#endregion
#region Eventi Modifica Impostazioni Generali Menu
@@ -814,7 +781,7 @@
myMenu.Items.RemoveAt(index);
menuListBox.Focus();
menuListBox.SelectedIndex = ((index < myMenu.Items.Count) ? index : index-1);
- ShowItemProperties(menuListBox);
+ ShowItemProperties(ShowItemsType.MenuItems, menuListBox.SelectedIndex, menuListBox.Focused);
ModifyMenuListButtonsEnable();
updateNotifyTimer.Enabled = false;
updateNotifyMenuPictureBox.Visible = false;
@@ -850,7 +817,7 @@
myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.RemoveAt(index);
subMenuListBox.Focus();
subMenuListBox.SelectedIndex = ((index < myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Count) ? index : index - 1);
- ShowItemProperties(subMenuListBox);
+ ShowItemProperties(ShowItemsType.SubMenuItems, subMenuListBox.SelectedIndex, subMenuListBox.Focused);
ModifyMenuListButtonsEnable();
if (myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Count == 0)
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2014-03-01 18:05:25 UTC (rev 4768)
@@ -117,21 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="itemsTabControl.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="linksTabPage.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinLinksTreeView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinTabPage.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="skinFilesListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="multiImageFolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>183, 2</value>
</metadata>
@@ -357,6 +342,9 @@
<metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
+ <metadata name="skinItems.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-02-28 16:54:44 UTC (rev 4767)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2014-03-01 18:05:25 UTC (rev 4768)
@@ -84,6 +84,14 @@
<Compile Include="..\Common\Skin.cs">
<Link>Skin.cs</Link>
</Compile>
+ <Compile Include="..\Common\SkinItems.cs">
+ <Link>SkinItems.cs</Link>
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="..\Common\SkinItems.designer.cs">
+ <Link>SkinItems.designer.cs</Link>
+ <DependentUpon>SkinItems.cs</DependentUpon>
+ </Compile>
<Compile Include="..\Common\Tools.cs">
<Link>Tools.cs</Link>
</Compile>
@@ -105,6 +113,10 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <EmbeddedResource Include="..\Common\SkinItems.resx">
+ <Link>SkinItems.resx</Link>
+ <DependentUpon>SkinItems.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="..\Common\VersionInfo.resx">
<Link>VersionInfo.resx</Link>
<DependentUpon>VersionInfo.cs</DependentUpon>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
