From: <nic...@us...> - 2015-02-01 11:26:11
|
Revision: 4937 http://sourceforge.net/p/mp-plugins/code/4937 Author: nicsergio Date: 2015-02-01 11:26:02 +0000 (Sun, 01 Feb 2015) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/ShortCuter.dll trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1 trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/ShortCuter.dll =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.xmp2 2015-02-01 11:26:02 UTC (rev 4937) @@ -2263,22 +2263,22 @@ <Version> <Major>2</Major> <Minor>1</Minor> - <Build>1</Build> + <Build>2</Build> <Revision>0</Revision> </Version> - <ExtensionDescription>ShortCut'er let you create keyboard shortcuts to any MP screen, like TV, Videos, Music, etc.. - -For each shortcut you can define a keystroke combination such as: - -<CTRL> + <ALT> + <SHIFT> + <KEY> - + <ExtensionDescription>ShortCut'er let you create keyboard shortcuts to any MP screen, like TV, Videos, Music, etc.. + +For each shortcut you can define a keystroke combination such as: + +<CTRL> + <ALT> + <SHIFT> + <KEY> + The plugin also integrates the function 'Skin Navigator', which allows you to configure a dialog box with the most used links.</ExtensionDescription> - <VersionDescription> - removed Visual Basic Power Pack controls - - small graphical improvements - </VersionDescription> + <VersionDescription> - stop RawInput message only if event is handled + (needed for compatibility with generic HID) +</VersionDescription> <DevelopmentStatus>Stable</DevelopmentStatus> <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1</OnlineLocation> - <ReleaseDate>2014-01-17T23:10:13</ReleaseDate> + <ReleaseDate>2015-02-01T23:10:13</ReleaseDate> <Tags>shortcut,keys,keyboard,imon,remote,skin,navigator</Tags> <Location>..\ShortCuter.mpe1</Location> <Params> @@ -2301,7 +2301,7 @@ If it has .dll extension it's started like MP plugin configuration.</Description> </SectionParam> <SectionParam Name="Online Screenshots"> - <Value>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Config.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/KeyAssign.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/SkinNavConfig.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/BlackGlassNovaHD - CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan - CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan - CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme - CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme - CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/DefaulWide - DefaultDialog.png</Value> + <Value>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Config.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/KeyAssign.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/SkinNavConfig.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/BlackGlassNovaHD-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan-CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme-CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/DefaulWide-DefaultDialog.png</Value> <ValueType>String</ValueType> <Description>Online stored screenshot urls separated by ; </Description> </SectionParam> @@ -2669,21 +2669,21 @@ <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>ShortCuterInstall.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{605b4c5d-3b72-48d6-835c-ae67116add2e}-ShortCuterInstall.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{abf8d654-3759-40db-986d-b13625e3a6f5}-ShortCuterInstall.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>ShortCuterProgress.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{78a6c812-a407-4db4-a151-035f5dec18ba}-ShortCuterProgress.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{f9e26b83-4b31-4b0c-9e8f-34082ae5d49c}-ShortCuterProgress.png</ZipFileName> <DestinationFilename /> </FileItem> <FileItem InstallType="CopyFile" SystemFile="true" Modified="true"> <Param1 /> <UpdateOption>OverwriteIfOlder</UpdateOption> <LocalFileName>ShortCuter.png</LocalFileName> - <ZipFileName>Installer{CopyFile}\{63215c65-6df0-437f-bcdd-ec2318d099e7}-ShortCuter.png</ZipFileName> + <ZipFileName>Installer{CopyFile}\{c684826a-f0b2-418d-be42-c0b25ef457ea}-ShortCuter.png</ZipFileName> <DestinationFilename /> </FileItem> </Items> Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.ChangeLog.txt 2015-02-01 11:26:02 UTC (rev 4937) @@ -1,3 +1,9 @@ +- V2.1.2 (02/01/2015) + + > stop RawInput message only if event is handled + (needed for compatibility with generic HID) + + - V2.1.1 (01/12/2015) > removed Visual Basic Power Pack controls Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml 2015-02-01 11:26:02 UTC (rev 4937) @@ -1151,5 +1151,167 @@ </ProjectSettings> <IsSkin>false</IsSkin> </PackageClass> + <PackageClass> + <Version>2.0</Version> + <Groups> + <Items> + <GroupItem Name="Binaries"> + <DisplayName>Binaries</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Binaries</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="Configuration"> + <DisplayName>Configuration</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>Configuration</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="DefaultSkin"> + <DisplayName>DefaultSkin</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>DefaultSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="DefaultWideSkin"> + <DisplayName>DefaultWideSkin</DisplayName> + <DefaulChecked>true</DefaulChecked> + <Description>DefaultWideSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="TitanSkin"> + <DisplayName>TitanSkin</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>TitanSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="StreamedMPSkin"> + <DisplayName>StreamedMPSkin</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>StreamedMPSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="BlackGlassNovaHDSkin"> + <DisplayName>BlackGlassNovaHDSkin</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>BlackGlassNovaHDSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + <GroupItem Name="XtremeSkin"> + <DisplayName>XtremeSkin</DisplayName> + <DefaulChecked>false</DefaulChecked> + <Description>XtremeSkin</Description> + <Files> + <Items /> + </Files> + </GroupItem> + </Items> + </Groups> + <Sections> + <Items /> + </Sections> + <Dependencies> + <Items> + <DependencyItem> + <Type>MediaPortal</Type> + <Id /> + <MinVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MinVersion> + <MaxVersion> + <Major>1</Major> + <Minor>1</Minor> + <Build>6</Build> + <Revision>27644</Revision> + </MaxVersion> + <WarnOnly>false</WarnOnly> + <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message> + <Name>MediaPortal</Name> + </DependencyItem> + </Items> + </Dependencies> + <PluginDependencies> + <Items /> + </PluginDependencies> + <GeneralInfo> + <Name>ShortCut'er</Name> + <Id>8f7a9dd8-c238-4d3d-b50d-20b7ca8d296e</Id> + <Author>nicsergio</Author> + <HomePage>http://www.team-mediaportal.com/extensions/input-output/shortcuter</HomePage> + <ForumPage>http://forum.team-mediaportal.com/threads/shortcuter-plugin-v2.121721/</ForumPage> + <UpdateUrl>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.Update.xml</UpdateUrl> + <Version> + <Major>2</Major> + <Minor>1</Minor> + <Build>2</Build> + <Revision>0</Revision> + </Version> + <ExtensionDescription>ShortCut'er let you create keyboard shortcuts to any MP screen, like TV, Videos, Music, etc.. + +For each shortcut you can define a keystroke combination such as: + +<CTRL> + <ALT> + <SHIFT> + <KEY> + +The plugin also integrates the function 'Skin Navigator', which allows you to configure a dialog box with the most used links.</ExtensionDescription> + <VersionDescription> - stop RawInput message only if event is handled + (needed for compatibility with generic HID) +</VersionDescription> + <DevelopmentStatus>Stable</DevelopmentStatus> + <OnlineLocation>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1</OnlineLocation> + <ReleaseDate>2015-02-01T23:10:13</ReleaseDate> + <Tags>shortcut,keys,keyboard,imon,remote,skin,navigator</Tags> + <Location>..\ShortCuter.mpe1</Location> + <Params> + <Items> + <SectionParam Name="Online Icon"> + <Value>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/ShortCuter.png</Value> + <ValueType>String</ValueType> + <Description>The icon file of the package stored online (jpg,png,bmp)</Description> + </SectionParam> + <SectionParam Name="Configuration file"> + <Value>%Plugins%\windows\ShortCuter.dll</Value> + <ValueType>Template</ValueType> + <Description>The file used to configure the extension. + If it has .exe extension the will be executed. + If it has .dll extension it's started like MP plugin configuration.</Description> + </SectionParam> + <SectionParam Name="Online Screenshots"> + <Value>https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Config.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/KeyAssign.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/SkinNavConfig.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/BlackGlassNovaHD-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Titan-CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme-CustomList.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/Xtreme-CustomPanel.png;https://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/Screenshots/Skin/DefaulWide-DefaultDialog.png</Value> + <ValueType>String</ValueType> + <Description>Online stored screenshot urls separated by ; </Description> + </SectionParam> + <SectionParam Name="Force to uninstall on update"> + <Value>YES</Value> + <ValueType>Bool</ValueType> + <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description> + </SectionParam> + </Items> + </Params> + </GeneralInfo> + <UniqueFileList> + <Items /> + </UniqueFileList> + <ProjectSettings> + <FolderGroups /> + </ProjectSettings> + <IsSkin>false</IsSkin> + </PackageClass> </Items> </ExtensionCollection> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/ShortCuter.mpe1 =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2015-02-01 11:26:02 UTC (rev 4937) @@ -27,16 +27,9 @@ public bool PreFilterMessage(ref Message m) //Ricezione del messaggio di Windows { if (m.Msg == WM_INPUT) //Se messaggio per eventi RawInput - { if (m.WParam == (IntPtr)0 || _backgroundInput) //Verifica se applicazione in primo piano o abilitazione anche in background - { if (KeyDown != null) //Se evento sottoscritto - { - ProcessRawInput(m.LParam); //--> processazione evento - return true; //--> stop del messaggio - } - } - } + return ProcessRawInput(m.LParam); //--> processazione evento return false; //--> altrimenti messaggio gestito dal sistema } #endregion @@ -57,7 +50,7 @@ RAWINPUTDEVICE[] d = devices.ToArray(); return RegisterRawInputDevices(d, devices.Count, Marshal.SizeOf(typeof(RAWINPUTDEVICE))); } - private void ProcessRawInput(IntPtr hRawInput) //Processazione RawInput + private bool ProcessRawInput(IntPtr hRawInput) //Processazione RawInput { RAWINPUT pData = new RAWINPUT(); int pcbSize = Marshal.SizeOf(typeof(RAWINPUT)); @@ -89,11 +82,14 @@ KeyEventArgs kea = new KeyEventArgs(key); //--> generazione argomenti per evento KeyEvent KeyDown(this, kea); //--> richiamo dell'evento KeyDown + if (kea.Handled) //Se l'evento è stato gestito + return true; //--> il messaggio non viene passato ai filtri successivi } catch { } } } } + return false; //--> il messaggio viene passato ad eventuali filtri successivi } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2015-02-01 11:26:02 UTC (rev 4937) @@ -33,8 +33,8 @@ // È possibile specificare tutti i valori oppure impostare valori predefiniti per i numeri relativi alla revisione e alla build // utilizzando l'asterisco (*) come descritto di seguito: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.1.1.0")] -[assembly: AssemblyFileVersion("2.1.1.0")] +[assembly: AssemblyVersion("2.1.2.0")] +[assembly: AssemblyFileVersion("2.1.2.0")] //Importante per la compatibilità con MediaPortal [assembly: CompatibleVersion("1.1.6.27644")] \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2015-01-28 21:41:03 UTC (rev 4936) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2015-02-01 11:26:02 UTC (rev 4937) @@ -1049,6 +1049,7 @@ List<ShortCut> scList = GetShortCutsGroup(k); //--> raccolta lista shortcut associati alla combinazione di tasti attuale if (scList != null && scList.Count > 0) //Se trovato almeno uno shortcut { + keyData.Handled = true; //--> evento gestito ShortCut sc = scList.Find(x => x.IsNavigator); //Ricerca eventuali corrispondenze a Skin Navigator if (sc != null) //Se combinazione di tasti corrispondente a Skin Navigator { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |