From: <nic...@us...> - 2014-12-21 16:57:06
|
Revision: 4898 http://sourceforge.net/p/mp-plugins/code/4898 Author: nicsergio Date: 2014-12-21 16:56:52 +0000 (Sun, 21 Dec 2014) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Default/ShortCuter.Navigator.DialogMenu.xml trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/DefaultWide/ShortCuter.Navigator.DialogMenu.xml trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Default/ShortCuter.Navigator.DialogMenu.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Default/ShortCuter.Navigator.DialogMenu.xml 2014-12-19 15:46:45 UTC (rev 4897) +++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/Default/ShortCuter.Navigator.DialogMenu.xml 2014-12-21 16:56:52 UTC (rev 4898) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <!--version="1.0" encoding="utf-8" standalone="yes"--> <window> - <id>2012</id> - <defaultcontrol>3</defaultcontrol> + <id>2821976</id> + <defaultcontrol>0</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> <control> @@ -20,7 +20,7 @@ <posX>192</posX> <posY>80</posY> <width>615</width> - <height>500</height> + <height>530</height> <texture>context_background.png</texture> <colordiffuse>ffffffff</colordiffuse> <visible>!window.isvisible(602)+!window.isvisible(2005)</visible> @@ -31,7 +31,7 @@ <posX>192</posX> <posY>80</posY> <width>615</width> - <height>500</height> + <height>530</height> <texture>context_background.png</texture> <colordiffuse>bbffffff</colordiffuse> <visible>window.isvisible(602)|window.isvisible(2005)</visible> @@ -40,23 +40,23 @@ <description>Heading text label</description> <type>label</type> <id>4</id> - <posX>231</posX> - <posY>104</posY> + <posX>275</posX> + <posY>120</posY> <label>181</label> <width>555</width> - <font>font14</font> + <font>font16</font> <textcolor>FFFFFFFF</textcolor> </control> <control> <description>GFX-Heading "menu" text label</description> <type>label</type> <id>5</id> - <posX>1718</posX> - <posY>110</posY> + <posX>275</posX> + <posY>105</posY> <width>319</width> <label>924</label> - <font>font14</font> - <textcolor>Black</textcolor> + <font>font9</font> + <textcolor>90ffffff</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="250">WindowClose</animation> </control> @@ -71,23 +71,91 @@ <textureFocus>top_exit_enabled.png</textureFocus> <textureNoFocus>top_exit_disabled.png</textureNoFocus> <label>-</label> - <onleft>3</onleft> - <onright>3</onright> - <onup>3</onup> - <ondown>3</ondown> </control> + <control> - <description>options listcontrol</description> - <type>listcontrol</type> - <id>3</id> - <posX>240</posX> - <posY>150</posY> - <width>510</width> - <height>420</height> - <onleft>2</onleft> - <onright>2</onright> - <spinPosX>2195</spinPosX> - <spinPosY>510</spinPosY> + <type>group</type> + <description>list view group</description> + <visible>string.equals(#ShortCuter.Navigator.DialogView,List)</visible> + + <control> + <description>links list</description> + <type>listcontrol</type> + <id>3</id> + <posX>340</posX> + <posY>170</posY> + <width>410</width> + <height>420</height> + <onleft>2</onleft> + <onright>2</onright> + <spinCanFocus>no</spinCanFocus> + <spinPosX>705</spinPosX> + <spinPosY>550</spinPosY> + </control> + <control> + <description>selected icon</description> + <type>image</type> + <id>0</id> + <posX>220</posX> + <posY>280</posY> + <width>100</width> + <height>100</height> + <texture>#ShortCuter.Navigator.SelectedIcon</texture> + </control> </control> + + <control> + <type>group</type> + <description>panel view group</description> + <visible>string.equals(#ShortCuter.Navigator.DialogView,Panel)</visible> + <control> + <description>links panel</description> + <type>thumbnailpanel</type> + <id>6</id> + <posX>220</posX> + <posY>175</posY> + <width>580</width> + <height>420</height> + <scrollOffset>1</scrollOffset> + <onup>2</onup> + <ondown>2</ondown> + <onleft>2</onleft> + <onright>2</onright> + <itemWidthBig>115</itemWidthBig> + <itemHeightBig>130</itemHeightBig> + <thumbWidthBig>80</thumbWidthBig> + <thumbHeightBig>80</thumbHeightBig> + <textureWidthBig>90</textureWidthBig> + <textureHeightBig>90</textureHeightBig> + <thumbPosXBig>3</thumbPosXBig> + <thumbPosYBig>3</thumbPosYBig> + <unfocusedAlpha>120</unfocusedAlpha> + <hideUnfocusTexture>no</hideUnfocusTexture> + <renderFocusText>yes</renderFocusText> + <renderUnfocusText>yes</renderUnfocusText> + <imageFolder>-</imageFolder> + <imageFolderFocus>-</imageFolderFocus> + <textXOff>3</textXOff> + <textYOff>5</textYOff> + <showFrame>true</showFrame> + <frameNoFocus>-</frameNoFocus> + <frameFocus>cdthumbframe.png</frameFocus> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <spinCanFocus>no</spinCanFocus> + <spinPosX>705</spinPosX> + <spinPosY>550</spinPosY> + </control> + </control> + + <control> + <description>skin navigator logo</description> + <type>image</type> + <id>10</id> + <posX>210</posX> + <posY>100</posY> + <width>60</width> + <height>60</height> + </control> </controls> </window> Modified: trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/DefaultWide/ShortCuter.Navigator.DialogMenu.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/DefaultWide/ShortCuter.Navigator.DialogMenu.xml 2014-12-19 15:46:45 UTC (rev 4897) +++ trunk/plugins/ShortCuter&SkinEditor/Release/ShortCuter/MpeProject/Files/Skin/DefaultWide/ShortCuter.Navigator.DialogMenu.xml 2014-12-21 16:56:52 UTC (rev 4898) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> - <id>2012</id> - <defaultcontrol>3</defaultcontrol> + <id>2821976</id> + <defaultcontrol>0</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> <control> @@ -19,7 +19,7 @@ <posX>256</posX> <posY>80</posY> <width>820</width> - <height>500</height> + <height>530</height> <texture>context_background.png</texture> <colordiffuse>ffffffff</colordiffuse> <visible>!window.isvisible(602)+!window.isvisible(2005)</visible> @@ -30,7 +30,7 @@ <posX>256</posX> <posY>80</posY> <width>820</width> - <height>500</height> + <height>530</height> <texture>context_background.png</texture> <colordiffuse>bbffffff</colordiffuse> <visible>window.isvisible(602)|window.isvisible(2005)</visible> @@ -39,23 +39,23 @@ <description>Heading text label</description> <type>label</type> <id>4</id> - <posX>308</posX> - <posY>104</posY> + <posX>360</posX> + <posY>120</posY> <label>181</label> <width>740</width> - <font>font14</font> + <font>font16</font> <textcolor>FFFFFFFF</textcolor> </control> <control> <description>GFX-Heading "menu" text label</description> <type>label</type> <id>5</id> - <posX>2291</posX> - <posY>110</posY> + <posX>360</posX> + <posY>105</posY> <width>426</width> <label>924</label> - <font>font14</font> - <textcolor>Black</textcolor> + <font>font9</font> + <textcolor>90ffffff</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="250">WindowClose</animation> </control> @@ -70,25 +70,91 @@ <textureFocus>top_exit_enabled.png</textureFocus> <textureNoFocus>top_exit_disabled.png</textureNoFocus> <label>-</label> - <onleft>3</onleft> - <onright>3</onright> - <onup>3</onup> - <ondown>3</ondown> </control> + <control> - <description>options listcontrol</description> - <type>listcontrol</type> - <id>3</id> - <posX>320</posX> - <posY>150</posY> - <width>680</width> - <height>420</height> - <onleft>2</onleft> - <onright>2</onright> - <spinPosX>2927</spinPosX> - <spinPosY>510</spinPosY> - - + <type>group</type> + <description>list view group</description> + <visible>string.equals(#ShortCuter.Navigator.DialogView,List)</visible> + + <control> + <description>links list</description> + <type>listcontrol</type> + <id>3</id> + <posX>420</posX> + <posY>160</posY> + <width>580</width> + <height>420</height> + <onleft>2</onleft> + <onright>2</onright> + <spinCanFocus>no</spinCanFocus> + <spinPosX>940</spinPosX> + <spinPosY>550</spinPosY> + </control> + <control> + <description>selected icon</description> + <type>image</type> + <id>0</id> + <posX>295</posX> + <posY>280</posY> + <width>100</width> + <height>100</height> + <texture>#ShortCuter.Navigator.SelectedIcon</texture> + </control> </control> + + <control> + <type>group</type> + <description>panel view group</description> + <visible>string.equals(#ShortCuter.Navigator.DialogView,Panel)</visible> + <control> + <description>links panel</description> + <type>thumbnailpanel</type> + <id>6</id> + <posX>320</posX> + <posY>165</posY> + <width>780</width> + <height>450</height> + <scrollOffset>1</scrollOffset> + <onup>2</onup> + <ondown>2</ondown> + <onleft>2</onleft> + <onright>2</onright> + <itemWidthBig>145</itemWidthBig> + <itemHeightBig>130</itemHeightBig> + <thumbWidthBig>90</thumbWidthBig> + <thumbHeightBig>90</thumbHeightBig> + <textureWidthBig>100</textureWidthBig> + <textureHeightBig>100</textureHeightBig> + <thumbPosXBig>3</thumbPosXBig> + <thumbPosYBig>3</thumbPosYBig> + <unfocusedAlpha>120</unfocusedAlpha> + <hideUnfocusTexture>no</hideUnfocusTexture> + <renderFocusText>yes</renderFocusText> + <renderUnfocusText>yes</renderUnfocusText> + <imageFolder>-</imageFolder> + <imageFolderFocus>-</imageFolderFocus> + <textXOff>3</textXOff> + <textYOff>5</textYOff> + <showFrame>true</showFrame> + <frameNoFocus>-</frameNoFocus> + <frameFocus>cdthumbframe.png</frameFocus> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <spinCanFocus>no</spinCanFocus> + <spinPosX>940</spinPosX> + <spinPosY>550</spinPosY> + </control> + </control> + + <control> + <description>skin navigator logo</description> + <type>image</type> + <id>10</id> + <posX>287</posX> + <posY>100</posY> + <width>60</width> + <height>60</height> + </control> </controls> </window> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2014-12-19 15:46:45 UTC (rev 4897) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Plugin/RawInputHook.cs 2014-12-21 16:56:52 UTC (rev 4898) @@ -74,13 +74,18 @@ { Keys key = (Keys)pData.Keyboard.VirtualKey; //KeyCode del tasto premuto - //GetAsyncKeyState sembra più sicuro di Control.ModifierKeys + #region Metodo con GetAsyncKeyState (non funziona con applicazioni come HIP) + /* if ((GetAsyncKeyState(Keys.ControlKey) & 0x8000) != 0) key = key | Keys.Control; //--> aggiunta eventuale modificatore CTRL if ((GetAsyncKeyState(Keys.Menu) & 0x8000) != 0) key = key | Keys.Alt; //--> aggiunta eventuale modificatore ALT if ((GetAsyncKeyState(Keys.ShiftKey) & 0x8000) != 0) key = key | Keys.Shift; //--> aggiunta eventuale modificatore SHIFT + */ + #endregion + + key = key | Control.ModifierKeys; //--> aggiunta di eventuali modificatori KeyEventArgs kea = new KeyEventArgs(key); //--> generazione argomenti per evento KeyEvent KeyDown(this, kea); //--> richiamo dell'evento KeyDown Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-12-19 15:46:45 UTC (rev 4897) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2014-12-21 16:56:52 UTC (rev 4898) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ShortCuter</RootNamespace> <AssemblyName>ShortCuter</AssemblyName> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |