From: <nic...@us...> - 2014-01-18 16:35:40
|
Revision: 4740 http://sourceforge.net/p/mp-plugins/code/4740 Author: nicsergio Date: 2014-01-18 16:35:35 +0000 (Sat, 18 Jan 2014) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-18 16:35:35 UTC (rev 4740) @@ -55,6 +55,7 @@ <Content Include="Resources\Images\ArrowLeft.png" /> <Content Include="Resources\Images\ArrowRight.png" /> <Content Include="Resources\Images\ArrowUp.png" /> + <Content Include="Resources\Images\Error.png" /> <Content Include="Resources\Images\Info.png" /> <Content Include="Resources\Images\Internet.png" /> <Content Include="Resources\Images\Ok.png" /> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png 2014-01-18 16:35:35 UTC (rev 4740) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Error.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-18 16:35:35 UTC (rev 4740) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.18052 +// Versione runtime:4.0.30319.17929 // // Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se // il codice viene rigenerato. @@ -73,6 +73,16 @@ /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap Error { + get { + object obj = ResourceManager.GetObject("Error", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap Info { get { object obj = ResourceManager.GetObject("Info", resourceCulture); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-18 16:35:35 UTC (rev 4740) @@ -142,8 +142,11 @@ <data name="ShortCuter" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\resources\images\shortcuterenable.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="RowCopy" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\rowcopy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <data name="Error" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\..\common\resources\images\error.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-18 16:35:35 UTC (rev 4740) @@ -156,6 +156,9 @@ <Content Include="..\Common\Resources\Images\ArrowDown.png"> <Link>Resources\Images\ArrowDown.png</Link> </Content> + <Content Include="..\Common\Resources\Images\Error.png"> + <Link>Resources\Images\Error.png</Link> + </Content> <Content Include="..\Common\Resources\Images\Info.png"> <Link>Resources\Images\Info.png</Link> </Content> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.Designer.cs 2014-01-18 16:35:35 UTC (rev 4740) @@ -28,9 +28,11 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); this.keyGroupBox = new System.Windows.Forms.GroupBox(); this.keyLabel = new System.Windows.Forms.Label(); this.okPictureBox = new System.Windows.Forms.PictureBox(); + this.errorImageTimer = new System.Windows.Forms.Timer(this.components); this.keyGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).BeginInit(); this.SuspendLayout(); @@ -66,6 +68,11 @@ this.okPictureBox.TabStop = false; this.okPictureBox.Click += new System.EventHandler(this.okPictureBox_Click); // + // errorImageTimer + // + this.errorImageTimer.Interval = 500; + this.errorImageTimer.Tick += new System.EventHandler(this.errorImageTimer_Tick); + // // ShortCuterKeyConfig // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -94,5 +101,6 @@ private System.Windows.Forms.GroupBox keyGroupBox; private System.Windows.Forms.Label keyLabel; private System.Windows.Forms.PictureBox okPictureBox; + private System.Windows.Forms.Timer errorImageTimer; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.cs 2014-01-18 16:35:35 UTC (rev 4740) @@ -39,10 +39,21 @@ mySc.Key = keyLabel.Text; //--> memorizzazione tasto assegnato allo shortcut this.Close(); //--> chiusura form } + private void errorImageTimer_Tick(object sender, EventArgs e) + { + okPictureBox.Image = ProcessPlugins.ShortCuter.Properties.Resources.Ok; //--> ripristino immagine "ok" + errorImageTimer.Enabled = false; + } private void keyboardHook_KeyDown(object sender, KeyEventArgs e) //Evento KeyDown intercettato dall'hook { - if (!ShortCut.ModifierKeys.Contains(e.KeyCode)) + if (ShortCut.ModifierKeys.Contains(e.KeyCode)) //Se premuto un modificatore + { + okPictureBox.Image = ProcessPlugins.ShortCuter.Properties.Resources.Error; //--> visualizzazione temporanea immagine "error" + errorImageTimer.Enabled = true; //--> attivazione timer per ripristino immagine + } + else keyLabel.Text = e.KeyCode.ToString(); //--> visualizzazione tasto premuto, se non corrisponde ad un modificatore + e.Handled = true; //--> il tasto premuto viene ignorato } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx 2014-01-17 13:15:18 UTC (rev 4739) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterKeyConfig.resx 2014-01-18 16:35:35 UTC (rev 4740) @@ -123,13 +123,16 @@ <metadata name="keyLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="keyLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="okPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="errorImageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>9, 6</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>36</value> + </metadata> </root> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |