From: <nic...@us...> - 2014-02-23 16:48:15
|
Revision: 4761 http://sourceforge.net/p/mp-plugins/code/4761 Author: nicsergio Date: 2014-02-23 16:48:11 +0000 (Sun, 23 Feb 2014) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-21 16:11:41 UTC (rev 4760) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2014-02-23 16:48:11 UTC (rev 4761) @@ -13,8 +13,6 @@ { #region Dati protected readonly string Name; //Nome della skin - protected readonly string DefaultNamespace; //Spazio dei nomi predefinito - protected struct Folders //Struttura di memorizzazione cartelle { public string Skin; //Percorso della skin @@ -45,7 +43,6 @@ public bool IsFather = false; //Il link è un nodo padre (visualizzazione a treeview) public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl } - 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 @@ -66,8 +63,6 @@ //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.")); - //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; @@ -130,7 +125,8 @@ XmlDocument xmlFile = new XmlDocument(); try { - using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream(DefaultNamespace + ".Resources.XmlFiles.PopularSkinLinks.xml")) + using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream( + Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.Contains("PopularSkinLinks.xml")).ElementAt(0).ToString())) { xmlFile.Load(streamFile); //Links skin disponibili --> lettura file xml incapsulato } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-21 16:11:41 UTC (rev 4760) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItemsControl.cs 2014-02-23 16:48:11 UTC (rev 4761) @@ -6,6 +6,8 @@ using System.Linq; using System.Text; using System.Windows.Forms; +using System.Linq; +using System.Reflection; namespace My.Common { @@ -14,11 +16,33 @@ public SkinItemsControl() { InitializeComponent(); + + + + //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.")); + //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; + 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 { } + } } public delegate void ItemChanged(SkinItemsType itemType, int index); public event ItemChanged Enter; public event ItemChanged Changed; + protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview) public enum SkinItemsType //Tipologie di azioni di modica stato { @@ -74,7 +98,7 @@ private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e) { - Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex); + //Changed(SkinItemsType.Links, skinLinksTreeView.SelectedIndex); } private void skinLinksTreeView_Enter(object sender, EventArgs e) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |