From: <nic...@us...> - 2014-02-24 17:06:26
|
Revision: 4762 http://sourceforge.net/p/mp-plugins/code/4762 Author: nicsergio Date: 2014-02-24 17:06:22 +0000 (Mon, 24 Feb 2014) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-02-24 17:06:22 UTC (rev 4762) @@ -35,17 +35,11 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="Form1.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Form1.Designer.cs"> - <DependentUpon>Form1.cs</DependentUpon> - </Compile> - <Compile Include="SkinItemsControl.cs"> + <Compile Include="SkinItems.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="SkinItemsControl.Designer.cs"> - <DependentUpon>SkinItemsControl.cs</DependentUpon> + <Compile Include="SkinItems.Designer.cs"> + <DependentUpon>SkinItems.cs</DependentUpon> </Compile> <Compile Include="VersionInfo.cs"> <SubType>Form</SubType> @@ -125,15 +119,12 @@ </Content> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="Form1.resx"> - <DependentUpon>Form1.cs</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> - <EmbeddedResource Include="SkinItemsControl.resx"> - <DependentUpon>SkinItemsControl.cs</DependentUpon> + <EmbeddedResource Include="SkinItems.resx"> + <DependentUpon>SkinItems.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="VersionInfo.resx"> <DependentUpon>VersionInfo.cs</DependentUpon> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762) @@ -0,0 +1,125 @@ +namespace My.Common +{ + partial class SkinItems + { + /// <summary> + /// Variabile di progettazione necessaria. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Liberare le risorse in uso. + /// </summary> + /// <param name="disposing">ha valore true se le risorse gestite devono essere eliminate, false in caso contrario.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Codice generato da Progettazione componenti + + /// <summary> + /// Metodo necessario per il supporto della finestra di progettazione. Non modificare + /// il contenuto del metodo con l'editor di codice. + /// </summary> + private void InitializeComponent() + { + 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.itemsTabControl.SuspendLayout(); + this.linksTabPage.SuspendLayout(); + this.skinTabPage.SuspendLayout(); + 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(0, 0); + this.itemsTabControl.Name = "itemsTabControl"; + this.itemsTabControl.SelectedIndex = 0; + this.itemsTabControl.Size = new System.Drawing.Size(247, 573); + this.itemsTabControl.TabIndex = 1; + 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.DoubleClick += new System.EventHandler(this.skinLinksTreeView_DoubleClick); + 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.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick); + this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter); + // + // SkinItems + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + 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); + this.skinTabPage.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl itemsTabControl; + private System.Windows.Forms.TabPage linksTabPage; + private System.Windows.Forms.TreeView skinLinksTreeView; + private System.Windows.Forms.TabPage skinTabPage; + private System.Windows.Forms.ListBox skinFilesListBox; + } +} Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.cs 2014-02-24 17:06:22 UTC (rev 4762) @@ -0,0 +1,148 @@ +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; + +namespace My.Common +{ + public partial class SkinItems : UserControl + { + public SkinItems() + { + 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 new event ItemChanged Enter; + public event ItemChanged Changed; + public new event ItemChanged DoubleClick; + + + protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview) + + public enum SkinItemsType //Tipologie di azioni di modica stato + { + Links = 0, //--> reset blocco + Files = 1 //--> nessuna modifica (stato invariato) + } + //public event + + + internal void Populate(List<MediaPortalSkin.SkinFile> skinFiles, List<MediaPortalSkin.SkinLink> skinLinks, bool selectFirst, bool collapseTreeView) + { + + skinFilesListBox.DataSource = skinFiles; + + int i = 0; + skinLinksTreeView.Nodes.Clear(); + skinLinksTreeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview + TreeNode node = new TreeNode(); + foreach (MediaPortalSkin.SkinLink skLink in skinLinks) //Iterazione di popolazione treeview + { + if (skLink.IsFather) //--> nodo padre + node = skinLinksTreeView.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 + } + + skinFilesListBox.SelectedIndex = (selectFirst ? 0 : -1); + if (selectFirst) + skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes[0]; + + if (collapseTreeView) + skinLinksTreeView.CollapseAll(); + else + skinLinksTreeView.ExpandAll(); + + } + private void SkinItemsControl_Load(object sender, EventArgs e) + { + + } + private void SwitchFocus() + { + if (itemsTabControl.SelectedIndex == (int)SkinItemsType.Links) + skinLinksTreeView.Focus(); + else + skinFilesListBox.Focus(); + } + + private void SkinItemsControl_SizeChanged(object sender, EventArgs e) + { + itemsTabControl.Size = this.Size; + skinLinksTreeView.Size = new Size(this.Size.Width - 12, this.Size.Height - 35); + skinFilesListBox.Size = new Size(this.Size.Width - 12, this.Size.Height - 35); + + } + + private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e) + { + SwitchFocus(); + } + + private void itemsTabControl_Click(object sender, EventArgs e) + { + SwitchFocus(); + } + + private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e) + { + Changed(SkinItemsType.Files, skinFilesListBox.SelectedIndex); + } + + private void skinFilesListBox_Enter(object sender, EventArgs e) + { + Enter(SkinItemsType.Files, skinFilesListBox.SelectedIndex); + } + + private void skinFilesListBox_DoubleClick(object sender, EventArgs e) + { + DoubleClick(SkinItemsType.Files, skinFilesListBox.SelectedIndex); + } + + 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)); + } + + private void skinLinksTreeView_Enter(object sender, EventArgs e) + { + //Indice nodo selezionato TreeView --> corrispondente a chiave) + Enter(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1)); + } + + private void skinLinksTreeView_DoubleClick(object sender, EventArgs e) + { + //Indice nodo selezionato TreeView --> corrispondente a chiave) + DoubleClick(SkinItemsType.Links, ((skinLinksTreeView.SelectedNode != null) ? Convert.ToInt32(skinLinksTreeView.SelectedNode.Name) : -1)); + } + } +} Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/SkinItems.resx 2014-02-24 17:06:22 UTC (rev 4762) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <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="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> +</root> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2014-02-24 17:06:22 UTC (rev 4762) @@ -34,7 +34,6 @@ {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Release|Any CPU {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.Build.0 = Release|Any CPU {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU - {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Mixed Platforms.Build.0 = Release|Any CPU {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|x86.ActiveCfg = Release|Any CPU {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Release|Any CPU.Build.0 = Release|Any CPU Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-02-24 17:06:22 UTC (rev 4762) @@ -70,6 +70,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> @@ -113,6 +121,10 @@ <Compile Include="SkinWithSounds.cs" /> </ItemGroup> <ItemGroup> + <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> @@ -317,7 +329,12 @@ <EmbeddedResource Include="Resources\Images\ShortCuterDisable.png" /> <EmbeddedResource Include="Resources\Images\ShortCuterEnable.png" /> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <ProjectReference Include="..\Common\My.Common.csproj"> + <Project>{4D76B200-01C9-48C6-BA04-DAF0845D56B0}</Project> + <Name>My.Common</Name> + </ProjectReference> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-02-24 17:06:22 UTC (rev 4762) @@ -32,11 +32,6 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterConfig)); 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(); this.loadParameterGroupBox = new System.Windows.Forms.GroupBox(); this.loadParameterTextBox = new System.Windows.Forms.TextBox(); @@ -61,9 +56,6 @@ this.capsLockComboBox = new System.Windows.Forms.ComboBox(); this.rowCopyButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); - this.itemsTabControl.SuspendLayout(); - this.linksTabPage.SuspendLayout(); - this.skinTabPage.SuspendLayout(); this.linkPropertiesGroupBox.SuspendLayout(); this.loadParameterGroupBox.SuspendLayout(); this.windowIdGroupBox.SuspendLayout(); @@ -106,66 +98,6 @@ this.shortCutsDataGridView.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.shortCutsDataGridView_EditingControlShowing); this.shortCutsDataGridView.Enter += new System.EventHandler(this.shortCutsDataGridView_Enter); // - // 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(266, 8); - this.itemsTabControl.Name = "itemsTabControl"; - this.itemsTabControl.SelectedIndex = 0; - this.itemsTabControl.Size = new System.Drawing.Size(330, 260); - this.itemsTabControl.TabIndex = 1; - 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(322, 234); - 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(318, 225); - 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); - 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(322, 234); - 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(318, 225); - this.skinFilesListBox.TabIndex = 0; - this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged); - this.skinFilesListBox.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick); - this.skinFilesListBox.Enter += new System.EventHandler(this.skinFilesListBox_Enter); - // // linkPropertiesGroupBox // this.linkPropertiesGroupBox.Controls.Add(this.loadParameterGroupBox); @@ -434,7 +366,6 @@ this.Controls.Add(this.infoPictureBox); this.Controls.Add(this.rowRemoveButton); this.Controls.Add(this.rowAddButton); - this.Controls.Add(this.itemsTabControl); this.Controls.Add(this.shortCutsDataGridView); this.Controls.Add(this.propLeftPictureBox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; @@ -447,9 +378,6 @@ this.Load += new System.EventHandler(this.ShortCuterConfig_Load); this.Shown += new System.EventHandler(this.ShortCuterConfig_Shown); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).EndInit(); - this.itemsTabControl.ResumeLayout(false); - this.linksTabPage.ResumeLayout(false); - this.skinTabPage.ResumeLayout(false); this.linkPropertiesGroupBox.ResumeLayout(false); this.loadParameterGroupBox.ResumeLayout(false); this.loadParameterGroupBox.PerformLayout(); @@ -468,10 +396,6 @@ #endregion private System.Windows.Forms.DataGridView shortCutsDataGridView; - 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.PictureBox propLeftPictureBox; private System.Windows.Forms.Button rowAddButton; private System.Windows.Forms.Button rowRemoveButton; @@ -487,7 +411,6 @@ private System.Windows.Forms.GroupBox skinFileGroupBox; private System.Windows.Forms.Label skinFileLabel; private System.Windows.Forms.GroupBox loadParameterGroupBox; - private System.Windows.Forms.TreeView skinLinksTreeView; private System.Windows.Forms.Button saveButton; private System.Windows.Forms.TextBox loadParameterTextBox; private System.Windows.Forms.GroupBox overridesGroupBox; @@ -496,6 +419,5 @@ private System.Windows.Forms.ComboBox capsLockComboBox; private System.Windows.Forms.ComboBox numLockComboBox; private System.Windows.Forms.Button rowCopyButton; - } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.cs 2014-02-24 17:06:22 UTC (rev 4762) @@ -521,5 +521,12 @@ return false; } #endregion + + + + private void skinItems_DoubleClick(SkinItems.SkinItemsType itemType, int index) + { + + } } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-23 16:48:11 UTC (rev 4761) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.resx 2014-02-24 17:06:22 UTC (rev 4762) @@ -120,21 +120,6 @@ <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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |