Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4664] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2013-10-20 20:06:58
|
Revision: 4664
http://sourceforge.net/p/mp-plugins/code/4664
Author: nicsergio
Date: 2013-10-20 20:06:54 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx
trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-20 18:55:48 UTC (rev 4663)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-20 20:06:54 UTC (rev 4664)
@@ -33,8 +33,8 @@
// È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build
// utilizzando l'asterisco (*) come descritto di seguito:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
//Importante per la compatibilità con MediaPortal
[assembly: CompatibleVersion("1.1.6.27644")]
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 18:55:48 UTC (rev 4663)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 20:06:54 UTC (rev 4664)
@@ -34,6 +34,7 @@
this.shortCutsDataGridView = new System.Windows.Forms.DataGridView();
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.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox();
@@ -52,7 +53,6 @@
this.rowRemoveButton = new System.Windows.Forms.Button();
this.rowAddButton = new System.Windows.Forms.Button();
this.propLeftPictureBox = new System.Windows.Forms.PictureBox();
- this.skinLinksTreeView = new System.Windows.Forms.TreeView();
((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit();
this.itemsTabControl.SuspendLayout();
this.linksTabPage.SuspendLayout();
@@ -116,6 +116,19 @@
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, 173);
+ this.skinLinksTreeView.TabIndex = 2;
+ this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
+ this.skinLinksTreeView.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
+ this.skinLinksTreeView.Enter += new System.EventHandler(this.skinLinksTreeView_Enter);
+ //
// skinTabPage
//
this.skinTabPage.Controls.Add(this.skinFilesListBox);
@@ -313,19 +326,6 @@
this.propLeftPictureBox.TabStop = false;
this.propLeftPictureBox.Visible = false;
//
- // 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, 173);
- this.skinLinksTreeView.TabIndex = 2;
- this.skinLinksTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.skinLinksTreeView_AfterSelect);
- this.skinLinksTreeView.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick);
- this.skinLinksTreeView.Enter += new System.EventHandler(this.skinLinksTreeView_Enter);
- //
// ShortCuterForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 18:55:48 UTC (rev 4663)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 20:06:54 UTC (rev 4664)
@@ -80,12 +80,12 @@
shiftColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
shiftColumn.DefaultCellStyle.BackColor = Color.LightCyan;
- DataGridViewTextBoxColumn windowIDColumn = new DataGridViewTextBoxColumn();
- windowIDColumn.DataPropertyName = "WindowID";
- windowIDColumn.HeaderText = "Window ID";
- windowIDColumn.Width = 70;
- windowIDColumn.MaxInputLength = 10;
- windowIDColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
+ DataGridViewTextBoxColumn windowIdColumn = new DataGridViewTextBoxColumn();
+ windowIdColumn.DataPropertyName = "WindowID";
+ windowIdColumn.HeaderText = "Window ID";
+ windowIdColumn.Width = 70;
+ windowIdColumn.MaxInputLength = 10;
+ windowIdColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
DataGridViewTextBoxColumn loadParameterColumn = new DataGridViewTextBoxColumn();
loadParameterColumn.DataPropertyName = "LoadParameter";
@@ -107,7 +107,7 @@
shortCutsDataGridView.Columns.Add(ctrlColumn);
shortCutsDataGridView.Columns.Add(altColumn);
shortCutsDataGridView.Columns.Add(shiftColumn);
- shortCutsDataGridView.Columns.Add(windowIDColumn);
+ shortCutsDataGridView.Columns.Add(windowIdColumn);
shortCutsDataGridView.Columns.Add(loadParameterColumn);
shortCutsDataGridView.Columns.Add(soundEffectColumn);
@@ -115,9 +115,22 @@
}
private void ShowLinkProperties(object listControl) //Visualizzazione proprietà link
{
- ListBox itemsList = (ListBox)listControl; //Casting oggetto -> ListBox
- if (itemsList.SelectedIndex < 0) //Se indice invalido --> reset proprietà
+ Control itemsList = (Control)listControl; //Casting sender -> Control
+ int selectedIndex; //Indice eventuale elemento selezionato
+
+ 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= mySkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato
+ }
+
+ if (selectedIndex < 0) //Se indice invalido --> reset proprietà
+ {
skinFileLabel.Text = "-";
windowIdLabel.Text = "-";
loadParameterLabel.Text = "-";
@@ -127,15 +140,15 @@
switch (itemsList.Name)
{
case "skinFilesListBox": //Lista files della skin
- skinFileLabel.Text = mySkin.SkinFiles[itemsList.SelectedIndex].Name;
- windowIdLabel.Text = mySkin.SkinFiles[itemsList.SelectedIndex].Id.ToString();
+ skinFileLabel.Text = mySkin.SkinFiles[selectedIndex].Name;
+ windowIdLabel.Text = mySkin.SkinFiles[selectedIndex].Id.ToString();
loadParameterLabel.Text = "-";
break;
- case "skinLinksListBox": //Lista links predefiniti della skin
- skinFileLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].XmlFile;
- windowIdLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].WindowID.ToString();
- loadParameterLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].LoadParameter;
+ case "skinLinksTreeView": //Lista links predefiniti della skin
+ skinFileLabel.Text = mySkin.SkinLinks[selectedIndex].XmlFile;
+ windowIdLabel.Text = mySkin.SkinLinks[selectedIndex].WindowID.ToString();
+ loadParameterLabel.Text = mySkin.SkinLinks[selectedIndex].LoadParameter;
break;
}
}
@@ -154,9 +167,8 @@
{
string loadParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value);
showIndex = mySkin.SkinLinks.FindIndex(x => x.WindowID == windowID && x.LoadParameter == loadParameter);
-
- //--> selezione eventuale link corrispondente a WindowID & HyperlinkParameter
- skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes.Find(showIndex.ToString(), true)[0];
+ //Selezione eventuale link corrispondente a WindowID & LoadParameter
+ skinLinksTreeView.SelectedNode = ((showIndex >= 0) ? skinLinksTreeView.Nodes.Find(showIndex.ToString(), true)[0] : null);
}
else
{
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 18:55:48 UTC (rev 4663)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 20:06:54 UTC (rev 4664)
@@ -117,9 +117,75 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="shortCutsDataGridView.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <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="linkPropertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="loadParameterGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="windowIdGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinFileGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>4, 2</value>
</metadata>
+ <metadata name="updateButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="resetButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="rowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="rowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="infoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="rowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="rowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>True</value>
+ </metadata>
+ <metadata name="propLeftPictureBox.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>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value>
</metadata>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 18:55:48 UTC (rev 4663)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 20:06:54 UTC (rev 4664)
@@ -71,12 +71,12 @@
if (itemsList is ListBox)
{
- ListBox listBox = (ListBox)itemsList; //Casting oggetto -> ListBox
+ ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox
selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato
}
else
{
- TreeView treeView = (TreeView)itemsList; //Casting oggetto -> TreeView
+ TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView
selectedIndex= myMediaPortal.SelectedSkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
