Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4735] trunk/plugins/ShortCuter&SkinEditor/Source
|
From: <nic...@us...> - 2014-01-17 10:56:38
|
Revision: 4735
http://sourceforge.net/p/mp-plugins/code/4735
Author: nicsergio
Date: 2014-01-17 10:56:34 +0000 (Fri, 17 Jan 2014)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/KeyboardHook.cs
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/Resources/XmlFiles/DefaultConfig.xml
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
Added Paths:
-----------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png
Removed Paths:
-------------
trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowsCopy.png
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2014-01-17 10:56:34 UTC (rev 4735)
@@ -63,7 +63,7 @@
<Content Include="Resources\Images\RowEdit.png" />
<Content Include="Resources\Images\RowRemove.png" />
<Content Include="Resources\Images\Rows.png" />
- <Content Include="Resources\Images\RowsCopy.png" />
+ <Content Include="Resources\Images\RowCopy.png" />
<Content Include="Resources\Images\RowUp.png" />
<Content Include="Resources\Images\TreeViewIcons\BasicHome.png" />
<Content Include="Resources\Images\TreeViewIcons\BD.png" />
Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png
===================================================================
(Binary files differ)
Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png 2014-01-17 10:56:34 UTC (rev 4735)
Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowCopy.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowsCopy.png
===================================================================
(Binary files differ)
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/KeyboardHook.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/KeyboardHook.cs 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/KeyboardHook.cs 2014-01-17 10:56:34 UTC (rev 4735)
@@ -37,6 +37,7 @@
public List<Keys> HookedKeys = new List<Keys>(); //Eventuale lista dei tasti da monitorare/intercettare
private IntPtr hHook = IntPtr.Zero; //Handle dell'hook
private IntPtr hInstance = IntPtr.Zero; //Handle dell'istanza della libreria esterna
+ private bool _hooked = false; //Hook attivato
#endregion
#region Costruttore/Distruttore
@@ -78,12 +79,17 @@
#region Metodi Pubblici
public void hook() //Installazione dell'hook di sistema
{
- hHook = SetWindowsHookEx(WH_KEYBOARD_LL, hookProc, hInstance, 0);
+ unhook(); //--> eventuale disinstallazione hook
+ hHook = SetWindowsHookEx(WH_KEYBOARD_LL, hookProc, hInstance, 0); //--> installazione hook
+ _hooked = true; //--> memorizzazione hook attivo
}
public void unhook() //Disinstallazione dell'hook di sistema
{
- try { UnhookWindowsHookEx(hHook); }
- catch { }
+ if (_hooked) //Se hook attivo
+ {
+ UnhookWindowsHookEx(hHook); //--> disinstallazione hook
+ _hooked = false; //--> memorizzazione hook disattivo
+ }
}
#endregion
@@ -92,7 +98,11 @@
public event KeyEventHandler KeyUp; //Evento di rilascio di uno dei tasti da monitorare
#endregion
- #region Importazione DLL
+ #region Propriet\xE0
+ public bool Hooked { get { return this._hooked; } }
+ #endregion
+
+ #region Importazione DLL
//Installazione dell'hook, esecuzione dell'evento desiderato [uno dei parametri hInstance o threadId deve essere valorizzato]
[DllImport("user32.dll")]
static extern IntPtr SetWindowsHookEx(int idHook, HookProc callback, IntPtr hInstance, uint threadId);
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2014-01-17 10:56:34 UTC (rev 4735)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.17929
+// Versione runtime:4.0.30319.18052
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
@@ -103,9 +103,9 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap RowDown {
+ internal static System.Drawing.Bitmap RowCopy {
get {
- object obj = ResourceManager.GetObject("RowDown", resourceCulture);
+ object obj = ResourceManager.GetObject("RowCopy", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -113,9 +113,9 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap RowRemove {
+ internal static System.Drawing.Bitmap RowDown {
get {
- object obj = ResourceManager.GetObject("RowRemove", resourceCulture);
+ object obj = ResourceManager.GetObject("RowDown", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@@ -123,9 +123,9 @@
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
- internal static System.Drawing.Bitmap RowsCopy {
+ internal static System.Drawing.Bitmap RowRemove {
get {
- object obj = ResourceManager.GetObject("RowsCopy", resourceCulture);
+ object obj = ResourceManager.GetObject("RowRemove", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2014-01-17 10:56:34 UTC (rev 4735)
@@ -136,14 +136,14 @@
<data name="RowRemove" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\rowremove.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="RowsCopy" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\..\common\resources\images\rowscopy.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
<data name="RowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\..\common\resources\images\rowup.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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>
</root>
\ No newline at end of file
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2014-01-17 10:56:34 UTC (rev 4735)
@@ -11,8 +11,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>35</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>35</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>back.wav</SoundEffect>
</Item>
@@ -22,8 +22,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>0</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>0</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>back.wav</SoundEffect>
</Item>
@@ -33,30 +33,30 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>1</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>1</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
<Item>
<Caption>TV Fullscreen</Caption>
- <Key>L</Key>
+ <Key>T</Key>
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>602</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>602</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
<Item>
<Caption>TV Guide</Caption>
- <Key>G</Key>
+ <Key>T</Key>
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>600</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>600</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -66,8 +66,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>7700</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>7700</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -77,8 +77,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>7701</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>7701</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -88,8 +88,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>6</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>6</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -99,8 +99,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>2005</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>2005</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -110,8 +110,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>30</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>30</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -121,8 +121,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>501</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>501</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -132,8 +132,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>2</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>2</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -143,8 +143,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>7977</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>7977</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -154,8 +154,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>9811</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>9811</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -165,8 +165,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>96742</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>96742</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
@@ -176,8 +176,8 @@
<Ctrl>1</Ctrl>
<Alt>0</Alt>
<Shift>1</Shift>
- <Hyperlink>3001</Hyperlink>
- <HyperlinkParameter />
+ <WindowID>3001</WindowID>
+ <LoadParameter />
<Return>0</Return>
<SoundEffect>click.wav</SoundEffect>
</Item>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-01-17 10:56:34 UTC (rev 4735)
@@ -165,15 +165,15 @@
<Content Include="..\Common\Resources\Images\RowAdd.png">
<Link>Resources\Images\RowAdd.png</Link>
</Content>
+ <Content Include="..\Common\Resources\Images\RowCopy.png">
+ <Link>Resources\Images\RowCopy.png</Link>
+ </Content>
<Content Include="..\Common\Resources\Images\RowDown.png">
<Link>Resources\Images\RowDown.png</Link>
</Content>
<Content Include="..\Common\Resources\Images\RowRemove.png">
<Link>Resources\Images\RowRemove.png</Link>
</Content>
- <Content Include="..\Common\Resources\Images\RowsCopy.png">
- <Link>Resources\Images\RowsCopy.png</Link>
- </Content>
<Content Include="..\Common\Resources\Images\RowUp.png">
<Link>Resources\Images\RowUp.png</Link>
</Content>
Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs
===================================================================
--- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-01-17 10:55:53 UTC (rev 4734)
+++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterConfig.Designer.cs 2014-01-17 10:56:34 UTC (rev 4735)
@@ -410,7 +410,7 @@
//
this.rowCopyButton.AutoSize = true;
this.rowCopyButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
- this.rowCopyButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowsCopy;
+ this.rowCopyButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowCopy;
this.rowCopyButton.Location = new System.Drawing.Point(94, 264);
this.rowCopyButton.Name = "rowCopyButton";
this.rowCopyButton.Size = new System.Drawing.Size(38, 38);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
