Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4767] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-02-28 16:54:49
|
Revision: 4767
http://sourceforge.net/p/mp-plugins/code/4767
Author: nicsergio
Date: 2014-02-28 16:54:44 +0000 (Fri, 28 Feb 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
-using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
-using System.Windows.Forms;
using System.Xml;
namespace My.Common
@@ -46,7 +44,6 @@
protected Folders _paths = new Folders(); //Percorsi
protected List<SkinFile> _skinFiles = new List<SkinFile>(); //Lista file della skin (con ID)
protected List<SkinLink> _skinLinks = new List<SkinLink>(); //Lista link predefiniti per la skin
- protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview)
protected bool _initialized; //Classe inizializzata
#endregion
@@ -61,23 +58,6 @@
_paths.Icons = _paths.Media + @"Icons\"; //--> eventuale percorso icone di menu della skin
_paths.Sounds = _paths.Skin + @"Sounds\"; //--> percorso effetto sonori skin
- //Lettura nomi delle immagini per il treeview dei link della skin incapsulate nell'eseguibile
- var resNames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains(".Resources.Images.TreeViewIcons."));
-
- _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
- {
- //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)));
- }
- catch { }
- }
-
_initialized = GetSkinFiles(onlyMenuItems) && GetSkinLinks(onlyMenuItems); //--> raccolta file della skin (con ID) e link
}
#endregion
@@ -210,45 +190,7 @@
}
}
#endregion
-
- #region Metodi Pubblici
- public void FillTreeViewSkinLinks(TreeView treeView) //Riempimento treeview dei links per la skin
- {
- int i = 0;
- treeView.Nodes.Clear();
- treeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview
-
- TreeNode node = new TreeNode();
- foreach (SkinLink skLink in _skinLinks) //Iterazione di popolazione treeview
- {
- if (skLink.IsFather) //--> nodo padre
- node = treeView.Nodes.Add(i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- else //--> nodo figlio
- node.Nodes.Add( i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList);
- i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks
- }
- }
- public int GetSkinLinkIndex(TreeView treeView) //Ottenimento indice link per la skin corrispondente a nodo selezionato nel treeview
- {
- if (treeView.SelectedNode != null)
- return Convert.ToInt32(treeView.SelectedNode.Name); //<-- indice nodo selezionato (chiave)
- else
- return -1; //<-- nessun nodo selezionato
-
- }
- public void SetSkinLinkIndex(TreeView treeView, int linkIndex) //Selezione nodo treeview corrispondente ad indice link per la skin
- {
- try
- {
- treeView.SelectedNode = ((linkIndex >= 0) ? treeView.Nodes.Find(linkIndex.ToString(), true)[0] : null);
- }
- catch
- {
- treeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
- }
- #endregion
-
+
#region Proprietà
public bool Initialized { get { return this._initialized; } }
public string SkinPath { get { return this._paths.Skin; } }
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -1,10 +1,7 @@
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Drawing;
-using System.Data;
using System.Linq;
-using System.Text;
using System.Windows.Forms;
using System.Reflection;
@@ -86,16 +83,16 @@
internal void SetIndex(int index)
{
if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links)
+ {
+ try
{
- try
- {
- skinLinksTreeView.SelectedNode = ((index >= 0) ? skinLinksTreeView.Nodes.Find(index.ToString(), true)[0] : null);
- }
- catch
- {
- skinLinksTreeView.SelectedNode = null; //--> in caso di errore: nessun nodo selezionato
- }
+ 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
}
@@ -162,5 +159,9 @@
//Indice nodo selezionato TreeView --> corrispondente a chiave)
DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1));
}
+
+
+ public SkinItemsType SelectedTab { get { return (SkinItemsType)itemsTabControl.SelectedIndex; } }
+
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-27 16:42:14 UTC (rev 4766)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-28 16:54:44 UTC (rev 4767)
@@ -176,21 +176,20 @@
{
if (!forceCell) //Non nel caso di forzatura valore cella WindowID (doppio click da lista links)
{
- /*
int showIndex;
int windowID = Convert.ToInt32(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value);
- if (itemsTabControl.SelectedIndex == 0)
+
+ if (skinItems.SelectedTab == SkinItems.SkinItemsType.Links)
{
+ //Selezione eventuale link corrispondente a WindowID & LoadParameter
string loadParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value);
showIndex = mySkin.SkinLinks.FindIndex(x => x.WindowID == windowID && x.LoadParameter == loadParameter);
- mySkin.SetSkinLinkIndex(skinLinksTreeView, showIndex); //--> selezione eventuale link corrispondente a WindowID & LoadParameter
}
else
- {
+ //Selezione eventuale file corrispondente a WindowID
showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID);
- skinFilesListBox.SelectedIndex = showIndex; //--> selezione eventuale file corrispondente a WindowID
- }
- */
+
+ skinItems.SetIndex(showIndex);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
