From: <nic...@us...> - 2013-10-19 20:37:12
|
Revision: 4656 http://sourceforge.net/p/mp-plugins/code/4656 Author: nicsergio Date: 2013-10-19 20:37:07 +0000 (Sat, 19 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 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/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/ShortCuter.ico trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/ShortCuterDisable.png trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/Images/ShortCuterEnable.png trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/ArrowDoubleDown.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.ico trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Error.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/FanartHandler.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowLeft.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowRight.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowAdd.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowEdit.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowRemove.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRows.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/TreeViewIcons/ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/FanartList.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/OverlayList.xml Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-19 20:37:07 UTC (rev 4656) @@ -30,6 +30,9 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> + <PropertyGroup> + <StartupObject /> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -46,11 +49,25 @@ <Compile Include="Tools.cs" /> </ItemGroup> <ItemGroup> - <Content Include="XmlFiles\PopularSkinLinks.xml" /> + <Content Include="Resources\Images\ArrowDown.png" /> + <Content Include="Resources\Images\ArrowLeft.png" /> + <Content Include="Resources\Images\ArrowRight.png" /> + <Content Include="Resources\Images\ArrowUp.png" /> + <Content Include="Resources\Images\Info.png" /> + <Content Include="Resources\Images\RowAdd.png" /> + <Content Include="Resources\Images\RowDown.png" /> + <Content Include="Resources\Images\RowEdit.png" /> + <Content Include="Resources\Images\RowRemove.png" /> + <Content Include="Resources\Images\Rows.png" /> + <Content Include="Resources\Images\RowUp.png" /> + <Content Include="Resources\Images\TreeViewIcons\Movies.png" /> + <Content Include="Resources\Images\TreeViewIcons\Music.png" /> + <Content Include="Resources\Images\TreeViewIcons\TV.png" /> + <Content Include="Resources\XmlFiles\PopularSkinLinks.xml"> + <SubType>Designer</SubType> + </Content> </ItemGroup> - <ItemGroup> - <Folder Include="Resources\" /> - </ItemGroup> + <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. Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png 2013-10-19 20:37:07 UTC (rev 4656) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-19 20:37:07 UTC (rev 4656) @@ -0,0 +1,623 @@ +<?xml version="1.0" encoding="utf-8"?> +<Items> + <Item> + <Context>GO TO</Context> + <Caption>BASIC HOME</Caption> + <XmlFile>BasicHome</XmlFile> + <WindowID>35</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>GO TO</Context> + <Caption>HOME</Caption> + <XmlFile>myHome</XmlFile> + <WindowID>0</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>WATCH</Context> + <Caption>TV</Caption> + <XmlFile>mytvhomeServer</XmlFile> + <WindowID>1</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>TV</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>SERIES</Caption> + <XmlFile>TVSeries</XmlFile> + <WindowID>9811</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>TVSeries</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>TV RECS</Caption> + <XmlFile>mytvrecordedtv</XmlFile> + <WindowID>603</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my tv.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CHECK</Context> + <Caption>TV GUIDE</Caption> + <XmlFile>mytvguide</XmlFile> + <WindowID>600</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my tv.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>TELETEXT</Caption> + <XmlFile>myteletext</XmlFile> + <WindowID>7700</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my tv.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>TV FULLSCREEN</Caption> + <XmlFile>mytvFullScreen</XmlFile> + <WindowID>602</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my tv.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CONFIGURE</Context> + <Caption>TV SETTINGS</Caption> + <XmlFile>settings_tv</XmlFile> + <WindowID>700</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>settings</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>WATCH YOUR</Context> + <Caption>VIDEOS</Caption> + <XmlFile>myvideo</XmlFile> + <WindowID>6</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>movies</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>MOVIES</Caption> + <XmlFile>movingpictures</XmlFile> + <WindowID>96742</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>Film</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>FILMS</Caption> + <XmlFile>MyFilms</XmlFile> + <WindowID>7986</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>movies</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>TRAILERS (iTunes)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:iTunes Movie Trailers|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>Trailers</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>TRAILERS (IMDb)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:IMDb Movie Trailers|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>Trailers</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>VIDEOS (DB)</Caption> + <XmlFile>myvideoTitle</XmlFile> + <WindowID>25</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.movie.scraper</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>PLAY</Context> + <Caption>DVD</Caption> + <XmlFile>-</XmlFile> + <WindowID>3001</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>PLAY</Context> + <Caption>BLU-RAY</Caption> + <XmlFile>BluRayPlayerLauncher</XmlFile> + <WindowID>8080</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CHECK</Context> + <Caption>SHOWTIMES</Caption> + <XmlFile>ShowTimesGUI</XmlFile> + <WindowID>7111992</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>Film</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>VIEW</Context> + <Caption>TRAKT</Caption> + <XmlFile>Trakt</XmlFile> + <WindowID>87258</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_trakt.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>VIDEOS FULLSCREEN</Caption> + <XmlFile>videoFullScreen</XmlFile> + <WindowID>2005</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>movies</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CONFIGURE</Context> + <Caption>VIDEO SETTINGS</Caption> + <XmlFile>settings_MyVideos</XmlFile> + <WindowID>703</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>settings</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>LISTEN TO</Context> + <Caption>MUSIC</Caption> + <XmlFile>mymusicsongs</XmlFile> + <WindowID>501</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>music</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>LISTEN TO</Context> + <Caption>PLAYLISTS</Caption> + <XmlFile>mymusicplaylist</XmlFile> + <WindowID>500</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>MUSIC</Context> + <Caption>PLAYING NOW</Caption> + <XmlFile>MyMusicPlayingNow</XmlFile> + <WindowID>510</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my music.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>LYRICS</Caption> + <XmlFile>myLyrics</XmlFile> + <WindowID>90478</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my lyrics.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>LISTEN TO</Context> + <Caption>MUSIC (DB)</Caption> + <XmlFile>mymusicgenres</XmlFile> + <WindowID>504</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.music.scraper</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>LISTEN TO</Context> + <Caption>RADIO</Caption> + <XmlFile>myradio</XmlFile> + <WindowID>30</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_my radio.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>LISTEN TO</Context> + <Caption>LAST.FM</Caption> + <XmlFile>MyRadioLastFM</XmlFile> + <WindowID>7890</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>MVCENTRAL</Caption> + <XmlFile>mvCentral</XmlFile> + <WindowID>112011</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>music</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CONFIGURE</Context> + <Caption>MUSIC SETTINGS</Caption> + <XmlFile>settings_MyMusic</XmlFile> + <WindowID>14</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>settings</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>VIEW YOUR</Context> + <Caption>PICTURES</Caption> + <XmlFile>mypics</XmlFile> + <WindowID>2</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>pictures</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>CONFIGURE</Context> + <Caption>PICTURE SETTINGS</Caption> + <XmlFile>settings_MyPictures</XmlFile> + <WindowID>12</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>settings</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>CHECK THE</Context> + <Caption>WEATHER</Caption> + <XmlFile>WorldWeather</XmlFile> + <WindowID>7977</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>weatherbg</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay>weather</Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>CHECK THE</Context> + <Caption>WEATHER (LITE)</Caption> + <XmlFile>WorldWeatherLite</XmlFile> + <WindowID>79770</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>weatherbg</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay>weather</Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>CHECK</Context> + <Caption>INTERNET</Caption> + <XmlFile>WebBrowser</XmlFile> + <WindowID>16002</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_webbrowser.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>WATCH YOUR</Context> + <Caption>ONLINE VIDEOS</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_OnlineVideos.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>YOUTUBE</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:YouTube|return:Locked</LoadParameter> + <BackgroundImage>hover_OnlineVideos.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>SEARCH</Context> + <Caption>WIKIPEDIA</Caption> + <XmlFile>wikipedia</XmlFile> + <WindowID>4711</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_wikipedia.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>READ THE</Context> + <Caption>NEWS</Caption> + <XmlFile>infoservice.feeds</XmlFile> + <WindowID>16001</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_InfoService.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CHECK</Context> + <Caption>TWITTER</Caption> + <XmlFile>infoservice.twitter</XmlFile> + <WindowID>16003</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_InfoService.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> + + <Item> + <Context>BROWSE YOUR</Context> + <Caption>PLUGINS</Caption> + <XmlFile>myHomePlugIns</XmlFile> + <WindowID>34</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>plugins</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + <SubItems> + + <SubItem> + <Context>CHECK</Context> + <Caption>HTPC INFO</Caption> + <XmlFile>HTPCInfo</XmlFile> + <WindowID>7972</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_htpcinfo.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>PLAY YOUR</Context> + <Caption>GAMES</Caption> + <XmlFile>myEmulators</XmlFile> + <WindowID>2497</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_tetris.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context></Context> + <Caption>FILE EXPLORER</Caption> + <XmlFile>File Explorer_main</XmlFile> + <WindowID>557311</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage>hover_File Explorer.png</BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + <SubItem> + <Context>CONFIGURE</Context> + <Caption>SETTINGS</Caption> + <XmlFile>settings</XmlFile> + <WindowID>4</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>settings</BackgroundFolder> + <FanartHandler></FanartHandler> + <Overlay></Overlay> + <IconList></IconList> + </SubItem> + + </SubItems> + </Item> +</Items> + + + + + + + + + + + + Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-19 20:37:07 UTC (rev 4656) @@ -1,6 +1,9 @@ using System; using System.Collections.Generic; +using System.Drawing; using System.IO; +using System.Reflection; +using System.Windows.Forms; using System.Xml; @@ -10,6 +13,8 @@ { #region Dati protected readonly string Name; //Nome della skin + protected readonly string DefaultNamespace; //Spazio dei nomi predefinito + protected struct Folders //Struttura di memorizzazione cartelle { public string Skin; //Percorso della skin @@ -18,32 +23,51 @@ public string Animations; //Percorso animazioni della skin public string Sounds; //Percorso effetti sonori } - public struct SkinFile //Struttura dati file della skin (con ID) + public class SkinFile //Classe file della skin (con ID) { - public string Name; //Nome del file - public int Id; //Id del file (link da MediaPortal) + public string Name = ""; //Nome del file + public int Id = 0; //WindowID del file (link da MediaPortal) public override string ToString() { return Name; } //Override metodo ToString per riempire classi ListControl } - protected Folders _paths = new Folders(); //Percorsi - protected List<SkinFile> _skinFiles = new List<SkinFile>(); //Lista file della skin (con ID) - protected bool _initialized; //Classe inizializzata + public class SkinLink //Classe link per la skin + { + public string Context = ""; //Eventuale testo aggiuntivo ("guarda"-"ascolta"-ecc.) + public string Caption = ""; //Titolo + public string XmlFile = ""; //Nome del file xml della skin + public int WindowID = 0; //Id finestra per visualizzazione in MediaPortal + public string LoadParameter = ""; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.) + public string BackgroundImage = ""; //File immagine di background + public string BackgroundFolder = ""; //Cartella per multi-image di background + public string FanartHandler = ""; //Tipologia di fanart per background + public string Overlay = ""; //Eventuale riquadro visualizzato in sovrapposizione all'immagine di background + public string IconList = ""; //Eventuale icona per rappresentazione in lista/treeview + public bool IsFather = false; //Il link è un nodo padre (visualizzazione a treeview) + public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl + } + + protected Folders _paths = new Folders(); //Percorsi + protected List<SkinFile> _skinFiles = new List<SkinFile>(); //Lista file della skin (con ID) + protected List<SkinLink> _skinLinks = new List<SkinLink>(); //Lista link predefiniti per la skin + protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin + protected bool _initialized; //Classe inizializzata #endregion #region Costruttore - public MediaPortalSkin(string skinName, string skinsPath, string cachesPath, bool excludeHome) + public MediaPortalSkin(string defaultNamespace, string skinName, string skinsPath, string cachesPath, bool excludeHome, bool excludeFS) { //Costruttore Name = skinName; //--> nome della skin + DefaultNamespace = defaultNamespace; //--> spazio dei nomi predefinito _paths.Skin = skinsPath + Name + @"\"; //--> percorso skin _paths.Cache = cachesPath + Name + @"\"; //--> percorso cache skin _paths.Media = _paths.Skin + @"Media\"; //--> percorso file multimediali skin _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multiimage) skin _paths.Sounds = _paths.Skin + @"Sounds\"; //--> percorso effetto sonori skin - _initialized = GetSkinFiles(excludeHome); //--> raccolta file della skin (con ID) + _initialized = GetSkinFiles(excludeHome, excludeFS) && GetSkinLinks(); //--> raccolta file della skin (con ID) e link } #endregion #region MetodiPrivati - private bool GetSkinFiles(bool excludeHome) //Raccolta dei file della skin + private bool GetSkinFiles(bool excludeHome, bool excludeFS) //Raccolta dei file della skin { if (!Directory.Exists(_paths.Skin)) { @@ -55,7 +79,7 @@ { try { - if (file.ToLower().StartsWith("common") == false && file.ToLower().Contains("dialog") == false && file.ToLower().Contains("wizard") == false && ((file.ToLower().Contains("myhome") == false && file.ToLower().Contains("basichome") == false) || !excludeHome) && file.ToLower().Contains("overlay") == false && file.ToLower().Contains("xml.backup") == false) + if (!file.ToLower().StartsWith("common") && !file.ToLower().Contains("dialog") && !file.ToLower().Contains("wizard") && !file.ToLower().Contains("overlay") && ((!file.ToLower().EndsWith("myhome.xml") && !file.ToLower().EndsWith("basichome.xml")) || !excludeHome) && (!file.ToLower().Contains("fullscreen") || !excludeFS) && file.ToLower().EndsWith(".xml")) { XmlDocument xmlFile = new XmlDocument(); xmlFile.Load(file); @@ -80,8 +104,131 @@ return false; } } + private bool GetSkinLinks() //Raccolta dei link predefiniti per la skin + { + XmlDocument xmlFile = new XmlDocument(); + try + { + using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream(DefaultNamespace + ".Resources.XmlFiles.PopularSkinLinks.xml")) + { + xmlFile.Load(streamFile); //Links skin disponibili --> lettura file xml incapsulato + } + } + catch (Exception e) + { + Tools.ErrorMessage("Error loading PopularSkinLinks.xml.", e.Message); + return false; + } + + XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/Items/Item"); + foreach (XmlNode node in nodeList) //Iterazione per memorizzazione links + { + if (AddLink(node, true)) //Se nodo padre aggiunto + { + XmlNodeList subNodeList = node.SelectNodes("SubItems/SubItem"); + foreach (XmlNode subNode in subNodeList) //Iterazione per memorizzazione links figli + AddLink(subNode, false); //--> aggiunta nodi figli + } + } + if (_skinLinks.Count > 0) + return true; //--> raccolta links effettuata + else + { + Tools.ErrorMessage("No skin links found loading PopularSkinLinks.xml."); + return false; + } + } + private bool AddLink(XmlNode node, bool isFather) //Aggiunta link + { + SkinLink popularLink = new SkinLink(); + XmlNode innerNode = node.SelectSingleNode("Context"); + if (innerNode != null) + popularLink.Context = innerNode.InnerText; + innerNode = node.SelectSingleNode("Caption"); + if (innerNode != null) + popularLink.Caption = innerNode.InnerText; + innerNode = node.SelectSingleNode("XmlFile"); + if (innerNode != null) + popularLink.XmlFile = innerNode.InnerText; + innerNode = node.SelectSingleNode("WindowID"); + if (innerNode != null) + popularLink.WindowID = Convert.ToInt32(innerNode.InnerText); + innerNode = node.SelectSingleNode("LoadParameter"); + if (innerNode != null) + popularLink.LoadParameter = innerNode.InnerText; + innerNode = node.SelectSingleNode("BackgroundImage"); + if (innerNode != null) + popularLink.BackgroundImage = innerNode.InnerText; + innerNode = node.SelectSingleNode("BackgroundFolder"); + if (innerNode != null) + popularLink.BackgroundFolder = innerNode.InnerText; + innerNode = node.SelectSingleNode("FanartHandler"); + if (innerNode != null) + popularLink.FanartHandler = innerNode.InnerText; + innerNode = node.SelectSingleNode("Overlay"); + if (innerNode != null) + popularLink.Overlay = innerNode.InnerText; + innerNode = node.SelectSingleNode("IconList"); + if (innerNode != null) + popularLink.IconList = innerNode.InnerText; + popularLink.IsFather = isFather; + try + { + SkinFile skF = _skinFiles.Find(x => x.Id == popularLink.WindowID); + if (skF.ToString() != null || popularLink.XmlFile == "-") //Verifica se WindowID disponibile nei files della skin (o se non specificato file xml - link di sistema) + { + _skinLinks.Add(popularLink); //--> aggiunta link nella lista + return true; //--> link aggiunto + } + else + return false; //--> link non aggiunto + } + catch + { + return false; //--> link non aggiunto (errore nella verifica esistenza WindowID) + } + } #endregion + #region Metodi Pubblici + public void FillTreeViewSkinLinks(TreeView treeView) //Riempimento treeview dei links per la skin + { + _skinLinksImgs.ImageSize = new Size(24, 24); + _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit; + _skinLinksImgs.Images.Clear(); + try + { + string[] filenames = Assembly.GetExecutingAssembly().GetManifestResourceNames(); //. .Where(name => name.StartsWith(prefix)); + + _skinLinksImgs.Images.Add("Movies", Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(DefaultNamespace + ".Resources.Images.TreeViewIcons.Movies.png"))); + + } + catch { } + + int ii = 0; + treeView.Nodes.Clear(); + treeView.ImageList = _skinLinksImgs; + + TreeNode node = new TreeNode(); + foreach (SkinLink skLink in _skinLinks) + { + if (skLink.IsFather) //--> nodo padre + node = treeView.Nodes.Add(ii.ToString(), skLink.ToString(), skLink.IconList); + else //--> nodo figlio + node.Nodes.Add( ii.ToString(), skLink.ToString(), skLink.IconList); + ii++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks + } + } + public int GetSkinLinkIndex(TreeView treeView) //Ottenimento indice link per la skin selezionato nel treeview + { + if (treeView.SelectedNode != null) + return Convert.ToInt32(treeView.SelectedNode.Name); //<-- indice nodo selezionato (chiave) + else + return -1; //<-- nessun nodo selezionato + + } + #endregion + #region Proprietà public bool Initialized { get { return this._initialized; } } public string SkinPath { get { return this._paths.Skin; } } @@ -90,6 +237,7 @@ public string AnimationsPath { get { return this._paths.Animations; } } public string SoundsPath { get { return this._paths.Sounds; } } public List<SkinFile> SkinFiles { get { return this._skinFiles; } } + public List<SkinLink> SkinLinks { get { return this._skinLinks; } } #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-19 20:37:07 UTC (rev 4656) @@ -29,6 +29,7 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Debug|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -47,7 +48,6 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-10-19 20:37:07 UTC (rev 4656) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // Il codice è stato generato da uno strumento. -// Versione runtime:4.0.30319.1008 +// 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. @@ -60,6 +60,9 @@ } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap ArrowDown { get { object obj = ResourceManager.GetObject("ArrowDown", resourceCulture); @@ -67,6 +70,9 @@ } } + /// <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); @@ -74,6 +80,9 @@ } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap RowAdd { get { object obj = ResourceManager.GetObject("RowAdd", resourceCulture); @@ -81,6 +90,9 @@ } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap RowDown { get { object obj = ResourceManager.GetObject("RowDown", resourceCulture); @@ -88,6 +100,9 @@ } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap RowRemove { get { object obj = ResourceManager.GetObject("RowRemove", resourceCulture); @@ -95,6 +110,9 @@ } } + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap RowUp { get { object obj = ResourceManager.GetObject("RowUp", resourceCulture); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-10-19 20:35:08 UTC (rev 4655) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-10-19 20:37:07 UTC (rev 4656) @@ -117,24 +117,23 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c... [truncated message content] |
From: <nic...@us...> - 2013-10-19 21:09:58
|
Revision: 4657 http://sourceforge.net/p/mp-plugins/code/4657 Author: nicsergio Date: 2013-10-19 21:09:56 +0000 (Sat, 19 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-19 20:37:07 UTC (rev 4656) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-19 21:09:56 UTC (rev 4657) @@ -39,7 +39,7 @@ <BackgroundFolder>TV</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>TV</IconList> <SubItems> <SubItem> @@ -133,7 +133,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Movies</IconList> <SubItems> <SubItem> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-19 20:37:07 UTC (rev 4656) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-19 21:09:56 UTC (rev 4657) @@ -5,6 +5,7 @@ using System.Reflection; using System.Windows.Forms; using System.Xml; +using System.Linq; namespace My.Common @@ -196,15 +197,25 @@ _skinLinksImgs.ImageSize = new Size(24, 24); _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit; _skinLinksImgs.Images.Clear(); - try + + var filenames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.StartsWith(DefaultNamespace + ".Resources.Images.TreeViewIcons.")); + foreach (string fullResName in filenames) { - string[] filenames = Assembly.GetExecutingAssembly().GetManifestResourceNames(); //. .Where(name => name.StartsWith(prefix)); - - _skinLinksImgs.Images.Add("Movies", Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(DefaultNamespace + ".Resources.Images.TreeViewIcons.Movies.png"))); + try + { + string resName = fullResName.Remove(fullResName.LastIndexOf(".")); + resName = resName.Remove(0, resName.LastIndexOf(".") + 1); + _skinLinksImgs.Images.Add(resName, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(fullResName))); + + } + catch { } } - catch { } + + + + int ii = 0; treeView.Nodes.Clear(); treeView.ImageList = _skinLinksImgs; @@ -213,9 +224,9 @@ foreach (SkinLink skLink in _skinLinks) { if (skLink.IsFather) //--> nodo padre - node = treeView.Nodes.Add(ii.ToString(), skLink.ToString(), skLink.IconList); + node = treeView.Nodes.Add(ii.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); else //--> nodo figlio - node.Nodes.Add( ii.ToString(), skLink.ToString(), skLink.IconList); + node.Nodes.Add( ii.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); ii++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-19 20:37:07 UTC (rev 4656) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-19 21:09:56 UTC (rev 4657) @@ -165,15 +165,15 @@ <Content Include="..\Common\Resources\Images\RowUp.png"> <Link>Resources\Images\RowUp.png</Link> </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> <Link>Resources\Images\TreeViewIcons\Movies.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> <Link>Resources\Images\TreeViewIcons\Music.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> <Link>Resources\Images\TreeViewIcons\TV.png</Link> - </Content> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> </EmbeddedResource> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 11:10:28
|
Revision: 4658 http://sourceforge.net/p/mp-plugins/code/4658 Author: nicsergio Date: 2013-10-20 11:10:24 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-20 11:10:24 UTC (rev 4658) @@ -60,9 +60,32 @@ <Content Include="Resources\Images\RowRemove.png" /> <Content Include="Resources\Images\Rows.png" /> <Content Include="Resources\Images\RowUp.png" /> + <Content Include="Resources\Images\TreeViewIcons\BasicHome.png" /> + <Content Include="Resources\Images\TreeViewIcons\Fullscreen.png" /> + <Content Include="Resources\Images\TreeViewIcons\Games.png" /> + <Content Include="Resources\Images\TreeViewIcons\Home.png" /> + <Content Include="Resources\Images\TreeViewIcons\Htpcinfo.png" /> + <Content Include="Resources\Images\TreeViewIcons\Internet.png" /> <Content Include="Resources\Images\TreeViewIcons\Movies.png" /> + <Content Include="Resources\Images\TreeViewIcons\MovingPictures.png" /> <Content Include="Resources\Images\TreeViewIcons\Music.png" /> + <Content Include="Resources\Images\TreeViewIcons\MyFilms.png" /> + <Content Include="Resources\Images\TreeViewIcons\MyLyrics.png" /> + <Content Include="Resources\Images\TreeViewIcons\News.png" /> + <Content Include="Resources\Images\TreeViewIcons\OnlineVideos.png" /> + <Content Include="Resources\Images\TreeViewIcons\Pictures.png" /> + <Content Include="Resources\Images\TreeViewIcons\Plugins.png" /> + <Content Include="Resources\Images\TreeViewIcons\Settings.png" /> + <Content Include="Resources\Images\TreeViewIcons\ShowTimes.png" /> + <Content Include="Resources\Images\TreeViewIcons\Trakt.png" /> <Content Include="Resources\Images\TreeViewIcons\TV.png" /> + <Content Include="Resources\Images\TreeViewIcons\TvGuide.png" /> + <Content Include="Resources\Images\TreeViewIcons\TvRecs.png" /> + <Content Include="Resources\Images\TreeViewIcons\TvSeries.png" /> + <Content Include="Resources\Images\TreeViewIcons\Twitter.png" /> + <Content Include="Resources\Images\TreeViewIcons\Weather.png" /> + <Content Include="Resources\Images\TreeViewIcons\Wikipedia.png" /> + <Content Include="Resources\Images\TreeViewIcons\YouTube.png" /> <Content Include="Resources\XmlFiles\PopularSkinLinks.xml"> <SubType>Designer</SubType> </Content> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png 2013-10-20 11:10:24 UTC (rev 4658) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-20 11:10:24 UTC (rev 4658) @@ -10,7 +10,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>BasicHome</IconList> <SubItems> <SubItem> @@ -23,7 +23,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Home</IconList> </SubItem> </SubItems> @@ -52,7 +52,7 @@ <BackgroundFolder>TVSeries</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>TvSeries</IconList> </SubItem> <SubItem> @@ -65,7 +65,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>TvRecs</IconList> </SubItem> <SubItem> @@ -78,7 +78,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>TvGuide</IconList> </SubItem> <SubItem> @@ -104,7 +104,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Fullscreen</IconList> </SubItem> <SubItem> @@ -117,7 +117,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Settings</IconList> </SubItem> </SubItems> @@ -146,7 +146,7 @@ <BackgroundFolder>Film</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MovingPictures</IconList> </SubItem> <SubItem> @@ -159,7 +159,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MyFilms</IconList> </SubItem> <SubItem> @@ -237,7 +237,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>ShowTimes</IconList> </SubItem> <SubItem> @@ -250,7 +250,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Trakt</IconList> </SubItem> <SubItem> @@ -263,7 +263,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Fullscreen</IconList> </SubItem> <SubItem> @@ -276,7 +276,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Settings</IconList> </SubItem> </SubItems> @@ -292,7 +292,7 @@ <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Music</IconList> <SubItems> <SubItem> @@ -331,7 +331,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MyLyrics</IconList> </SubItem> <SubItem> @@ -412,7 +412,7 @@ <BackgroundFolder>pictures</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Pictures</IconList> <SubItems> <SubItem> @@ -425,7 +425,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Settings</IconList> </SubItem> </SubItems> @@ -441,7 +441,7 @@ <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay>weather</Overlay> - <IconList></IconList> + <IconList>Weather</IconList> <SubItems> <SubItem> @@ -454,7 +454,7 @@ <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay>weather</Overlay> - <IconList></IconList> + <IconList>Wheater</IconList> </SubItem> </SubItems> @@ -470,7 +470,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Internet</IconList> <SubItems> <SubItem> @@ -483,7 +483,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>OnlineVideos</IconList> </SubItem> <SubItem> @@ -496,7 +496,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>YouTube</IconList> </SubItem> <SubItem> @@ -509,7 +509,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Wikipedia</IconList> </SubItem> <SubItem> @@ -522,7 +522,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>News</IconList> </SubItem> <SubItem> @@ -535,7 +535,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Twitter</IconList> </SubItem> </SubItems> @@ -551,7 +551,7 @@ <BackgroundFolder>plugins</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Plugins</IconList> <SubItems> <SubItem> @@ -564,7 +564,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>HtpcInfo</IconList> </SubItem> <SubItem> @@ -577,7 +577,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Games</IconList> </SubItem> <SubItem> @@ -603,7 +603,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Settings</IconList> </SubItem> </SubItems> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-20 11:10:24 UTC (rev 4658) @@ -49,20 +49,38 @@ protected Folders _paths = new Folders(); //Percorsi protected List<SkinFile> _skinFiles = new List<SkinFile>(); //Lista file della skin (con ID) protected List<SkinLink> _skinLinks = new List<SkinLink>(); //Lista link predefiniti per la skin - protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin + protected ImageList _skinLinksImgs = new ImageList(); //Lista immagini per i link della skin (visualizzazione a treeview) protected bool _initialized; //Classe inizializzata #endregion #region Costruttore - public MediaPortalSkin(string defaultNamespace, string skinName, string skinsPath, string cachesPath, bool excludeHome, bool excludeFS) + public MediaPortalSkin(string skinName, string skinsPath, string cachesPath, bool excludeHome, bool excludeFS) { //Costruttore Name = skinName; //--> nome della skin - DefaultNamespace = defaultNamespace; //--> spazio dei nomi predefinito _paths.Skin = skinsPath + Name + @"\"; //--> percorso skin _paths.Cache = cachesPath + Name + @"\"; //--> percorso cache skin _paths.Media = _paths.Skin + @"Media\"; //--> percorso file multimediali skin _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multiimage) skin _paths.Sounds = _paths.Skin + @"Sounds\"; //--> percorso effetto sonori skin + + //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 + { + string resKey = resName.Remove(resName.LastIndexOf(".")); + resKey = resKey.Remove(0, resKey.LastIndexOf(".") + 1); //Chiave: nome immagine senza estensione + _skinLinksImgs.Images.Add(resKey, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(resName))); + } + catch { } + } + _initialized = GetSkinFiles(excludeHome, excludeFS) && GetSkinLinks(); //--> raccolta file della skin (con ID) e link } #endregion @@ -194,34 +212,12 @@ #region Metodi Pubblici public void FillTreeViewSkinLinks(TreeView treeView) //Riempimento treeview dei links per la skin { - _skinLinksImgs.ImageSize = new Size(24, 24); - _skinLinksImgs.ColorDepth = ColorDepth.Depth32Bit; - _skinLinksImgs.Images.Clear(); - - var filenames = Assembly.GetExecutingAssembly().GetManifestResourceNames().Where(name => name.StartsWith(DefaultNamespace + ".Resources.Images.TreeViewIcons.")); - foreach (string fullResName in filenames) - { - try - { - string resName = fullResName.Remove(fullResName.LastIndexOf(".")); - resName = resName.Remove(0, resName.LastIndexOf(".") + 1); - _skinLinksImgs.Images.Add(resName, Image.FromStream(Assembly.GetExecutingAssembly().GetManifestResourceStream(fullResName))); - - - } - catch { } - } - - - - - int ii = 0; treeView.Nodes.Clear(); - treeView.ImageList = _skinLinksImgs; + treeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview TreeNode node = new TreeNode(); - foreach (SkinLink skLink in _skinLinks) + foreach (SkinLink skLink in _skinLinks) //Iterazione di popolazione treeview { if (skLink.IsFather) //--> nodo padre node = treeView.Nodes.Add(ii.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 11:10:24 UTC (rev 4658) @@ -241,7 +241,7 @@ singleImageComboBox.Enabled = singleImageRadioButton.Checked; singleImageBrowseButton.Enabled = singleImageRadioButton.Checked; multiImageComboBox.Enabled = multiImageRadioButton.Checked; - multiImageBrowseButton.Enabled = multiImageRadioButton.Checked; + //multiImageBrowseButton.Enabled = multiImageRadioButton.Checked; //Problemi skin engine: disabilitata impostazione cartelle esterne per multi-image fanartComboBox.Enabled = fanartRadioButton.Checked; } private void ShowBackgroundImage() //Visualizzazione immagine(i) di sfondo selezionata per l'elemento @@ -474,7 +474,7 @@ private void BHEditorForm_Load(object sender, EventArgs e) { //Raccolta dati relativi all'installazione di MediaPortal ed alla skin - myMediaPortal = new MediaPortal("ProcessPlugins.XtremeMenuEditor", SkinName); + myMediaPortal = new MediaPortal(SkinName); if (myMediaPortal.Initialized) { string settingsFile = MediaPortal.ConfigPath + Assembly.GetExecutingAssembly().GetName().Name.ToString() + ".xml"; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-10-20 11:10:24 UTC (rev 4658) @@ -42,7 +42,7 @@ #endregion #region Costruttore - public Skin(string defaultNamespace, string skinName, string skinsPath, string cachesPath) : base(defaultNamespace, skinName, skinsPath, cachesPath, true, true) + public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, true, true) { //Costruttore sotto-classe Skin _initialized = _initialized && GetSkinBackgroundImages(false) && GetSkinMultiImageFolders(); //--> raccolta immagini di background ed animazioni della skin @@ -132,12 +132,11 @@ #endregion #region Costruttore - public MediaPortal(string defaultNamespace, string skinName) //Costruttore classe MediaPortal + public MediaPortal(string skinName) //Costruttore classe MediaPortal { if (GetInstallPath() && GetPaths() && GetFanarts() && GetOverlays()) //--> lettura percorso di installazione, percorsi di configurazione/skin/cache/.. e raccolta enumerativi per Fanart e Overlay { - SelectedSkin = new Skin(defaultNamespace, skinName, - _paths.Skins, _paths.Caches); //--> istanziazione classe skin + SelectedSkin = new Skin(skinName, _paths.Skins, _paths.Caches); //--> istanziazione classe skin _initialized = SelectedSkin.Initialized; //--> classe inizializzata } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-19 21:09:56 UTC (rev 4657) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-20 11:10:24 UTC (rev 4658) @@ -165,18 +165,88 @@ <Content Include="..\Common\Resources\Images\RowUp.png"> <Link>Resources\Images\RowUp.png</Link> </Content> + <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> + <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BasicHome.png"> + <Link>Resources\Images\TreeViewIcons\BasicHome.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Fullscreen.png"> + <Link>Resources\Images\TreeViewIcons\Fullscreen.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Games.png"> + <Link>Resources\Images\TreeViewIcons\Games.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Home.png"> + <Link>Resources\Images\TreeViewIcons\Home.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Htpcinfo.png"> + <Link>Resources\Images\TreeViewIcons\Htpcinfo.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Internet.png"> + <Link>Resources\Images\TreeViewIcons\Internet.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> <Link>Resources\Images\TreeViewIcons\Movies.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MovingPictures.png"> + <Link>Resources\Images\TreeViewIcons\MovingPictures.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> <Link>Resources\Images\TreeViewIcons\Music.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyFilms.png"> + <Link>Resources\Images\TreeViewIcons\MyFilms.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\News.png"> + <Link>Resources\Images\TreeViewIcons\News.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\OnlineVideos.png"> + <Link>Resources\Images\TreeViewIcons\OnlineVideos.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Pictures.png"> + <Link>Resources\Images\TreeViewIcons\Pictures.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Plugins.png"> + <Link>Resources\Images\TreeViewIcons\Plugins.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Settings.png"> + <Link>Resources\Images\TreeViewIcons\Settings.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\ShowTimes.png"> + <Link>Resources\Images\TreeViewIcons\ShowTimes.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trakt.png"> + <Link>Resources\Images\TreeViewIcons\Trakt.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> <Link>Resources\Images\TreeViewIcons\TV.png</Link> </EmbeddedResource> - <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> - <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvGuide.png"> + <Link>Resources\Images\TreeViewIcons\TvGuide.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvRecs.png"> + <Link>Resources\Images\TreeViewIcons\TvRecs.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvSeries.png"> + <Link>Resources\Images\TreeViewIcons\TvSeries.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Twitter.png"> + <Link>Resources\Images\TreeViewIcons\Twitter.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Weather.png"> + <Link>Resources\Images\TreeViewIcons\Weather.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Wikipedia.png"> + <Link>Resources\Images\TreeViewIcons\Wikipedia.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube.png"> + <Link>Resources\Images\TreeViewIcons\YouTube.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyLyrics.png"> + <Link>Resources\Images\TreeViewIcons\MyLyrics.png</Link> + </EmbeddedResource> <Content Include="Resources\Images\ArrowDoubleDown.png" /> <Content Include="Resources\Images\Editor.ico" /> <None Include="Resources\Images\Error.png" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 12:41:57
|
Revision: 4659 http://sourceforge.net/p/mp-plugins/code/4659 Author: nicsergio Date: 2013-10-20 12:41:54 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-20 12:41:54 UTC (rev 4659) @@ -61,22 +61,32 @@ <Content Include="Resources\Images\Rows.png" /> <Content Include="Resources\Images\RowUp.png" /> <Content Include="Resources\Images\TreeViewIcons\BasicHome.png" /> + <Content Include="Resources\Images\TreeViewIcons\BD.png" /> + <Content Include="Resources\Images\TreeViewIcons\DVD.png" /> + <Content Include="Resources\Images\TreeViewIcons\FileExplorer.png" /> <Content Include="Resources\Images\TreeViewIcons\Fullscreen.png" /> <Content Include="Resources\Images\TreeViewIcons\Games.png" /> <Content Include="Resources\Images\TreeViewIcons\Home.png" /> <Content Include="Resources\Images\TreeViewIcons\Htpcinfo.png" /> <Content Include="Resources\Images\TreeViewIcons\Internet.png" /> + <Content Include="Resources\Images\TreeViewIcons\LastFM.png" /> <Content Include="Resources\Images\TreeViewIcons\Movies.png" /> <Content Include="Resources\Images\TreeViewIcons\MovingPictures.png" /> <Content Include="Resources\Images\TreeViewIcons\Music.png" /> + <Content Include="Resources\Images\TreeViewIcons\MusicPlaying.png" /> + <Content Include="Resources\Images\TreeViewIcons\MusicPlaylists.png" /> + <Content Include="Resources\Images\TreeViewIcons\MusicVideos.png" /> <Content Include="Resources\Images\TreeViewIcons\MyFilms.png" /> <Content Include="Resources\Images\TreeViewIcons\MyLyrics.png" /> <Content Include="Resources\Images\TreeViewIcons\News.png" /> <Content Include="Resources\Images\TreeViewIcons\OnlineVideos.png" /> <Content Include="Resources\Images\TreeViewIcons\Pictures.png" /> <Content Include="Resources\Images\TreeViewIcons\Plugins.png" /> + <Content Include="Resources\Images\TreeViewIcons\Radio.png" /> <Content Include="Resources\Images\TreeViewIcons\Settings.png" /> <Content Include="Resources\Images\TreeViewIcons\ShowTimes.png" /> + <Content Include="Resources\Images\TreeViewIcons\Teletext.png" /> + <Content Include="Resources\Images\TreeViewIcons\Trailers.png" /> <Content Include="Resources\Images\TreeViewIcons\Trakt.png" /> <Content Include="Resources\Images\TreeViewIcons\TV.png" /> <Content Include="Resources\Images\TreeViewIcons\TvGuide.png" /> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png 2013-10-20 12:41:54 UTC (rev 4659) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-20 12:41:54 UTC (rev 4659) @@ -10,7 +10,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>BasicHome</IconList> + <IconList>BasicHome.png</IconList> <SubItems> <SubItem> @@ -23,7 +23,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Home</IconList> + <IconList>Home.png</IconList> </SubItem> </SubItems> @@ -39,7 +39,7 @@ <BackgroundFolder>TV</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>TV</IconList> + <IconList>TV.png</IconList> <SubItems> <SubItem> @@ -52,7 +52,7 @@ <BackgroundFolder>TVSeries</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>TvSeries</IconList> + <IconList>TvSeries.png</IconList> </SubItem> <SubItem> @@ -65,7 +65,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>TvRecs</IconList> + <IconList>TvRecs.png</IconList> </SubItem> <SubItem> @@ -78,7 +78,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>TvGuide</IconList> + <IconList>TvGuide.png</IconList> </SubItem> <SubItem> @@ -91,7 +91,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Teletext.png</IconList> </SubItem> <SubItem> @@ -104,7 +104,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Fullscreen</IconList> + <IconList>Fullscreen.png</IconList> </SubItem> <SubItem> @@ -117,7 +117,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Settings</IconList> + <IconList>Settings.png</IconList> </SubItem> </SubItems> @@ -133,7 +133,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Movies</IconList> + <IconList>Movies.png</IconList> <SubItems> <SubItem> @@ -146,7 +146,7 @@ <BackgroundFolder>Film</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>MovingPictures</IconList> + <IconList>MovingPictures.png</IconList> </SubItem> <SubItem> @@ -159,7 +159,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>MyFilms</IconList> + <IconList>MyFilms.png</IconList> </SubItem> <SubItem> @@ -172,7 +172,7 @@ <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Trailers.png</IconList> </SubItem> <SubItem> @@ -185,7 +185,7 @@ <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Trailers.png</IconList> </SubItem> <SubItem> @@ -198,7 +198,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.scraper</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Movies.png</IconList> </SubItem> <SubItem> @@ -211,7 +211,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>DVD.png</IconList> </SubItem> <SubItem> @@ -224,7 +224,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>BD.png</IconList> </SubItem> <SubItem> @@ -237,7 +237,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>ShowTimes</IconList> + <IconList>ShowTimes.png</IconList> </SubItem> <SubItem> @@ -250,7 +250,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Trakt</IconList> + <IconList>Trakt.png</IconList> </SubItem> <SubItem> @@ -263,7 +263,7 @@ <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Fullscreen</IconList> + <IconList>Fullscreen.png</IconList> </SubItem> <SubItem> @@ -276,7 +276,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Settings</IconList> + <IconList>Settings.png</IconList> </SubItem> </SubItems> @@ -292,7 +292,7 @@ <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Music</IconList> + <IconList>Music.png</IconList> <SubItems> <SubItem> @@ -305,7 +305,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.userdef</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MusicPlaylists.png</IconList> </SubItem> <SubItem> @@ -318,7 +318,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MusicPlaying.png</IconList> </SubItem> <SubItem> @@ -331,7 +331,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>MyLyrics</IconList> + <IconList>MyLyrics.png</IconList> </SubItem> <SubItem> @@ -344,7 +344,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.scraper</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Music.png</IconList> </SubItem> <SubItem> @@ -357,7 +357,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Radio.png</IconList> </SubItem> <SubItem> @@ -370,7 +370,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.userdef</FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>LastFM.png</IconList> </SubItem> <SubItem> @@ -383,7 +383,7 @@ <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>MusicVideos.png</IconList> </SubItem> <SubItem> @@ -396,7 +396,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>Settings.png</IconList> </SubItem> </SubItems> @@ -412,7 +412,7 @@ <BackgroundFolder>pictures</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Pictures</IconList> + <IconList>Pictures.png</IconList> <SubItems> <SubItem> @@ -425,7 +425,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Settings</IconList> + <IconList>Settings.png</IconList> </SubItem> </SubItems> @@ -441,7 +441,7 @@ <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay>weather</Overlay> - <IconList>Weather</IconList> + <IconList>Weather.png</IconList> <SubItems> <SubItem> @@ -454,7 +454,7 @@ <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay>weather</Overlay> - <IconList>Wheater</IconList> + <IconList>Weather.png</IconList> </SubItem> </SubItems> @@ -470,7 +470,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Internet</IconList> + <IconList>Internet.png</IconList> <SubItems> <SubItem> @@ -483,7 +483,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>OnlineVideos</IconList> + <IconList>OnlineVideos.png</IconList> </SubItem> <SubItem> @@ -496,7 +496,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>YouTube</IconList> + <IconList>YouTube.png</IconList> </SubItem> <SubItem> @@ -509,7 +509,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Wikipedia</IconList> + <IconList>Wikipedia.png</IconList> </SubItem> <SubItem> @@ -522,7 +522,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>News</IconList> + <IconList>News.png</IconList> </SubItem> <SubItem> @@ -535,7 +535,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Twitter</IconList> + <IconList>Twitter.png</IconList> </SubItem> </SubItems> @@ -551,7 +551,7 @@ <BackgroundFolder>plugins</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Plugins</IconList> + <IconList>Plugins.png</IconList> <SubItems> <SubItem> @@ -564,7 +564,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>HtpcInfo</IconList> + <IconList>HtpcInfo.png</IconList> </SubItem> <SubItem> @@ -577,7 +577,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Games</IconList> + <IconList>Games.png</IconList> </SubItem> <SubItem> @@ -590,7 +590,7 @@ <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList></IconList> + <IconList>FileExplorer.png</IconList> </SubItem> <SubItem> @@ -603,7 +603,7 @@ <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>Settings</IconList> + <IconList>Settings.png</IconList> </SubItem> </SubItems> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-20 12:41:54 UTC (rev 4659) @@ -74,8 +74,9 @@ { try { - string resKey = resName.Remove(resName.LastIndexOf(".")); - resKey = resKey.Remove(0, resKey.LastIndexOf(".") + 1); //Chiave: nome immagine senza estensione + //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 { } @@ -194,7 +195,7 @@ try { SkinFile skF = _skinFiles.Find(x => x.Id == popularLink.WindowID); - if (skF.ToString() != null || popularLink.XmlFile == "-") //Verifica se WindowID disponibile nei files della skin (o se non specificato file xml - link di sistema) + if (skF != null || popularLink.XmlFile == "-") //Verifica se WindowID disponibile nei files della skin (o se non specificato file xml - link di sistema) { _skinLinks.Add(popularLink); //--> aggiunta link nella lista return true; //--> link aggiunto Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-20 11:10:24 UTC (rev 4658) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-20 12:41:54 UTC (rev 4659) @@ -247,6 +247,36 @@ <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyLyrics.png"> <Link>Resources\Images\TreeViewIcons\MyLyrics.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaying.png"> + <Link>Resources\Images\TreeViewIcons\MusicPlaying.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaylists.png"> + <Link>Resources\Images\TreeViewIcons\MusicPlaylists.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Teletext.png"> + <Link>Resources\Images\TreeViewIcons\Teletext.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BD.png"> + <Link>Resources\Images\TreeViewIcons\BD.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\DVD.png"> + <Link>Resources\Images\TreeViewIcons\DVD.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\LastFM.png"> + <Link>Resources\Images\TreeViewIcons\LastFM.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Radio.png"> + <Link>Resources\Images\TreeViewIcons\Radio.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trailers.png"> + <Link>Resources\Images\TreeViewIcons\Trailers.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicVideos.png"> + <Link>Resources\Images\TreeViewIcons\MusicVideos.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\FileExplorer.png"> + <Link>Resources\Images\TreeViewIcons\FileExplorer.png</Link> + </EmbeddedResource> <Content Include="Resources\Images\ArrowDoubleDown.png" /> <Content Include="Resources\Images\Editor.ico" /> <None Include="Resources\Images\Error.png" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 16:54:46
|
Revision: 4660 http://sourceforge.net/p/mp-plugins/code/4660 Author: nicsergio Date: 2013-10-20 16:54:44 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-10-20 16:54:44 UTC (rev 4660) @@ -75,7 +75,7 @@ <Content Include="Resources\Images\TreeViewIcons\Music.png" /> <Content Include="Resources\Images\TreeViewIcons\MusicPlaying.png" /> <Content Include="Resources\Images\TreeViewIcons\MusicPlaylists.png" /> - <Content Include="Resources\Images\TreeViewIcons\MusicVideos.png" /> + <Content Include="Resources\Images\TreeViewIcons\mvCentral.png" /> <Content Include="Resources\Images\TreeViewIcons\MyFilms.png" /> <Content Include="Resources\Images\TreeViewIcons\MyLyrics.png" /> <Content Include="Resources\Images\TreeViewIcons\News.png" /> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png 2013-10-20 16:54:44 UTC (rev 4660) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png 2013-10-20 16:54:44 UTC (rev 4660) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-10-20 16:54:44 UTC (rev 4660) @@ -383,7 +383,7 @@ <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> <Overlay></Overlay> - <IconList>MusicVideos.png</IconList> + <IconList>mvCentral.png</IconList> </SubItem> <SubItem> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-10-20 16:54:44 UTC (rev 4660) @@ -213,7 +213,7 @@ #region Metodi Pubblici public void FillTreeViewSkinLinks(TreeView treeView) //Riempimento treeview dei links per la skin { - int ii = 0; + int i = 0; treeView.Nodes.Clear(); treeView.ImageList = _skinLinksImgs; //--> aggancio a lista immagini per treeview @@ -221,10 +221,10 @@ foreach (SkinLink skLink in _skinLinks) //Iterazione di popolazione treeview { if (skLink.IsFather) //--> nodo padre - node = treeView.Nodes.Add(ii.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); + node = treeView.Nodes.Add(i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); else //--> nodo figlio - node.Nodes.Add( ii.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); - ii++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks + node.Nodes.Add( i.ToString(), skLink.ToString(), skLink.IconList, skLink.IconList); + i++; //La chiave (Name) dei nodi corrisponde all'indice della lista _skinLinks } } public int GetSkinLinkIndex(TreeView treeView) //Ottenimento indice link per la skin selezionato nel treeview Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 16:54:44 UTC (rev 4660) @@ -12,7 +12,7 @@ namespace ProcessPlugins.XtremeMenuEditor { - [PluginIcons("ProcessPlugins.XtremeMenuEditor.Resources.Editor.png", "ProcessPlugins.XtremeMenuEditor.Resources.Editor.png")] + [PluginIcons("ProcessPlugins.XtremeMenuEditor.Resources.Images.Editor.png", "ProcessPlugins.XtremeMenuEditor.Resources.Images.Editor.png")] public partial class BHEditorForm : Form, ISetupForm //Form principale progetto, con implementazione interfaccia ISetupForm (per lancio da configurazione MediaPortal) { #region Dati @@ -751,6 +751,5 @@ return false; } #endregion - } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-10-20 16:54:44 UTC (rev 4660) @@ -123,27 +123,15 @@ <metadata name="linksTabPage.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="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="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="skinFilesListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="multiImageFolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>183, 2</value> </metadata> @@ -156,9 +144,6 @@ <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="loadParameterTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -174,42 +159,6 @@ <metadata name="backgroundGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="overlayGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="captionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="labelLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="loadParameterTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="captionTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="backgroundGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="fanartHandlerPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -240,36 +189,6 @@ <metadata name="singleImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="fanartHandlerPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="backgroundPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fanartComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fanartRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="overlayGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -279,12 +198,6 @@ <metadata name="overlayComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="overlayLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="overlayComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -309,21 +222,6 @@ <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -333,36 +231,15 @@ <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="clearCacheCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="showRssCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -384,18 +261,6 @@ <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="subMenuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -411,18 +276,6 @@ <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="menuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-10-20 16:54:44 UTC (rev 4660) @@ -241,35 +241,36 @@ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.ShowRSS", Convert.ToInt16(_general.ShowRSS).ToString()); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.BackgroundAnimated", Convert.ToInt16(_general.BackgroundAnimated).ToString()); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.DefaultItemIndex", _general.DefaultItemIndex.ToString()); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.General.DefaultItemIndex", "1"); //(_general.DefaultItemIndex + 1).ToString()); - int itemIndex = 1; + /* Problema nello skin engine: non si riesce a specifica l'elemento di default in maniera parametrica: viene quindi fissato il primo + e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */ + int itemIndex = _general.DefaultItemIndex; XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Count", _items.Count.ToString()); - foreach (MenuItem mItem in _items) //Iterazione per scrittura elementi di menu + for (int i = 1; i <= _items.Count; i++) //Iterazione per scrittura elementi di menu { - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".Context", mItem.Context); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".Caption", mItem.Caption); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".XmlFile", mItem.XmlFile); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".Hyperlink", mItem.Hyperlink.ToString()); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".HyperlinkParameter", mItem.HyperlinkParameter); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".BackgroundImage", mItem.BackgroundImage); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".BackgroundFolder", mItem.BackgroundFolder); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".FanartHandler", mItem.FanartHandler); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".Overlay", mItem.Overlay); - int subItemIndex = 1; - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.Count", mItem.SubMenuItems.Count.ToString()); - foreach (SubMenuItem smItem in mItem.SubMenuItems) //Iterazione per scrittura elementi di sotto-menu + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Context", _items[itemIndex].Context); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Caption", _items[itemIndex].Caption); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".XmlFile", _items[itemIndex].XmlFile); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Hyperlink", _items[itemIndex].Hyperlink.ToString()); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".HyperlinkParameter", _items[itemIndex].HyperlinkParameter); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundImage", _items[itemIndex].BackgroundImage); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundFolder", _items[itemIndex].BackgroundFolder); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".FanartHandler", _items[itemIndex].FanartHandler); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Overlay", _items[itemIndex].Overlay); + + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.Count", _items[itemIndex].SubMenuItems.Count.ToString()); + for (int ii = 1; ii <= _items[itemIndex].SubMenuItems.Count; ii++) //Iterazione per scrittura elementi di sotto-menu { - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".Caption", smItem.Caption); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".XmlFile", smItem.XmlFile); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".Hyperlink", smItem.Hyperlink.ToString()); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".HyperlinkParameter", smItem.HyperlinkParameter); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".BackgroundImage", smItem.BackgroundImage); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".BackgroundFolder", smItem.BackgroundFolder); - XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + itemIndex.ToString() + ".SubItems.SubItem" + subItemIndex.ToString() + ".FanartHandler", smItem.FanartHandler); - subItemIndex++; + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".Caption", _items[itemIndex].SubMenuItems[ii-1].Caption); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".XmlFile", _items[itemIndex].SubMenuItems[ii-1].XmlFile); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".Hyperlink", _items[itemIndex].SubMenuItems[ii-1].Hyperlink.ToString()); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".HyperlinkParameter", _items[itemIndex].SubMenuItems[ii-1].HyperlinkParameter); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundImage", _items[itemIndex].SubMenuItems[ii-1].BackgroundImage); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundFolder", _items[itemIndex].SubMenuItems[ii-1].BackgroundFolder); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".FanartHandler", _items[itemIndex].SubMenuItems[ii-1].FanartHandler); } - itemIndex++; + itemIndex = (itemIndex + 1) % _items.Count; } skinSettings = new FileStream(skinMenuFile, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2013-10-20 16:54:44 UTC (rev 4660) @@ -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("0.1.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] +[assembly: AssemblyVersion("0.2.0.0")] +[assembly: AssemblyFileVersion("0.2.0.0")] //Importante per la compatibilità con MediaPortal (se usato come PlugIn - dll) [assembly: CompatibleVersion("1.1.6.27644")] \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-20 12:41:54 UTC (rev 4659) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-20 16:54:44 UTC (rev 4660) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> @@ -48,7 +48,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <StartupObject>ProcessPlugins.XtremeMenuEditor.Program</StartupObject> + <StartupObject> + </StartupObject> </PropertyGroup> <PropertyGroup> <ApplicationIcon>Resources\Images\Editor.ico</ApplicationIcon> @@ -271,12 +272,12 @@ <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trailers.png"> <Link>Resources\Images\TreeViewIcons\Trailers.png</Link> </EmbeddedResource> - <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicVideos.png"> - <Link>Resources\Images\TreeViewIcons\MusicVideos.png</Link> - </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\FileExplorer.png"> <Link>Resources\Images\TreeViewIcons\FileExplorer.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\mvCentral.png"> + <Link>Resources\Images\TreeViewIcons\mvCentral.png</Link> + </EmbeddedResource> <Content Include="Resources\Images\ArrowDoubleDown.png" /> <Content Include="Resources\Images\Editor.ico" /> <None Include="Resources\Images\Error.png" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 17:52:00
|
Revision: 4661 http://sourceforge.net/p/mp-plugins/code/4661 Author: nicsergio Date: 2013-10-20 17:51:55 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/ArrowDoubleDown.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.ico trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Error.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/FanartHandler.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowLeft.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowRight.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowAdd.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowDown.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowEdit.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowRemove.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowUp.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRows.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowDown.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowLeft.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowRight.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/ArrowUp.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowAdd.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowDown.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowEdit.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowRemove.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/RowUp.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Rows.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BD.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/BasicHome.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/DVD.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/FileExplorer.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Fullscreen.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Games.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Home.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Htpcinfo.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Internet.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/LastFM.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MovingPictures.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Music.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaying.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MusicPlaylists.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyFilms.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/MyLyrics.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/News.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/OnlineVideos.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Pictures.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Plugins.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Radio.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Settings.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/ShowTimes.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TV.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Teletext.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trakt.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvGuide.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvRecs.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/TvSeries.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Twitter.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Weather.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Wikipedia.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/mvCentral.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/ArrowDoubleDown.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.ico =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Editor.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/Error.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/FanartHandler.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowLeft.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/MiniArrowRight.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowAdd.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowDown.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowEdit.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowRemove.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRowUp.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/SubRows.png =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 18:54:28
|
Revision: 4662 http://sourceforge.net/p/mp-plugins/code/4662 Author: nicsergio Date: 2013-10-20 18:54:25 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs Removed Paths: ------------- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinLinks.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-20 18:54:25 UTC (rev 4662) @@ -29,7 +29,6 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Debug|x86 - {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -48,6 +47,7 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -65,11 +65,11 @@ if (sc.SoundEffect.Length > 0) Utils.PlaySound(sc.SoundEffect, false, true); //--> eventuale effetto sonoro - if (sc.HyperlinkParameter.Length > 0) //Richiamo schermata con parametri di caricamento - GUIWindowManager.ActivateWindow(sc.Hyperlink, sc.HyperlinkParameter, true); + if (sc.LoadParameter.Length > 0) //Richiamo schermata con parametri di caricamento + GUIWindowManager.ActivateWindow(sc.WindowID, sc.LoadParameter, true); else //Richiamo schermata senza parametri di caricamento { - GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, sc.Hyperlink, 0, null); + GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, sc.WindowID, 0, null); GUIWindowManager.SendMessage(msg); //GUIGraphicsContext.SendMessage(msg); //Metodo usato dal vecchio plugin } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-10-20 18:54:25 UTC (rev 4662) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.ShortCuter</RootNamespace> <AssemblyName>ShortCuter</AssemblyName> @@ -106,7 +106,7 @@ <DependentUpon>ShortCuterForm.cs</DependentUpon> </Compile> <Compile Include="ShortCuts.cs" /> - <Compile Include="SkinLinks.cs" /> + <Compile Include="SkinWithSounds.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\Resources.resx"> @@ -163,6 +163,114 @@ <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BasicHome.png"> + <Link>Resources\Images\TreeViewIcons\BasicHome.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BD.png"> + <Link>Resources\Images\TreeViewIcons\BD.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\DVD.png"> + <Link>Resources\Images\TreeViewIcons\DVD.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\FileExplorer.png"> + <Link>Resources\Images\TreeViewIcons\FileExplorer.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Fullscreen.png"> + <Link>Resources\Images\TreeViewIcons\Fullscreen.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Games.png"> + <Link>Resources\Images\TreeViewIcons\Games.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Home.png"> + <Link>Resources\Images\TreeViewIcons\Home.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Htpcinfo.png"> + <Link>Resources\Images\TreeViewIcons\Htpcinfo.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Internet.png"> + <Link>Resources\Images\TreeViewIcons\Internet.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\LastFM.png"> + <Link>Resources\Images\TreeViewIcons\LastFM.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> + <Link>Resources\Images\TreeViewIcons\Movies.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MovingPictures.png"> + <Link>Resources\Images\TreeViewIcons\MovingPictures.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> + <Link>Resources\Images\TreeViewIcons\Music.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaying.png"> + <Link>Resources\Images\TreeViewIcons\MusicPlaying.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaylists.png"> + <Link>Resources\Images\TreeViewIcons\MusicPlaylists.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\mvCentral.png"> + <Link>Resources\Images\TreeViewIcons\mvCentral.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyFilms.png"> + <Link>Resources\Images\TreeViewIcons\MyFilms.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyLyrics.png"> + <Link>Resources\Images\TreeViewIcons\MyLyrics.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\News.png"> + <Link>Resources\Images\TreeViewIcons\News.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\OnlineVideos.png"> + <Link>Resources\Images\TreeViewIcons\OnlineVideos.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Pictures.png"> + <Link>Resources\Images\TreeViewIcons\Pictures.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Plugins.png"> + <Link>Resources\Images\TreeViewIcons\Plugins.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Radio.png"> + <Link>Resources\Images\TreeViewIcons\Radio.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Settings.png"> + <Link>Resources\Images\TreeViewIcons\Settings.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\ShowTimes.png"> + <Link>Resources\Images\TreeViewIcons\ShowTimes.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Teletext.png"> + <Link>Resources\Images\TreeViewIcons\Teletext.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trailers.png"> + <Link>Resources\Images\TreeViewIcons\Trailers.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trakt.png"> + <Link>Resources\Images\TreeViewIcons\Trakt.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> + <Link>Resources\Images\TreeViewIcons\TV.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvGuide.png"> + <Link>Resources\Images\TreeViewIcons\TvGuide.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvRecs.png"> + <Link>Resources\Images\TreeViewIcons\TvRecs.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvSeries.png"> + <Link>Resources\Images\TreeViewIcons\TvSeries.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Twitter.png"> + <Link>Resources\Images\TreeViewIcons\Twitter.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Weather.png"> + <Link>Resources\Images\TreeViewIcons\Weather.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Wikipedia.png"> + <Link>Resources\Images\TreeViewIcons\Wikipedia.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube.png"> + <Link>Resources\Images\TreeViewIcons\YouTube.png</Link> + </EmbeddedResource> <Content Include="Resources\Images\ShortCuter.ico" /> <EmbeddedResource Include="Resources\Images\ShortCuterDisable.png" /> <EmbeddedResource Include="Resources\Images\ShortCuterEnable.png" /> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -34,7 +34,6 @@ this.shortCutsDataGridView = new System.Windows.Forms.DataGridView(); this.itemsTabControl = new System.Windows.Forms.TabControl(); this.linksTabPage = new System.Windows.Forms.TabPage(); - this.skinLinksListBox = new System.Windows.Forms.ListBox(); this.skinTabPage = new System.Windows.Forms.TabPage(); this.skinFilesListBox = new System.Windows.Forms.ListBox(); this.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox(); @@ -53,6 +52,7 @@ this.rowRemoveButton = new System.Windows.Forms.Button(); this.rowAddButton = new System.Windows.Forms.Button(); this.propLeftPictureBox = new System.Windows.Forms.PictureBox(); + this.skinLinksTreeView = new System.Windows.Forms.TreeView(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); @@ -107,7 +107,7 @@ // // linksTabPage // - this.linksTabPage.Controls.Add(this.skinLinksListBox); + 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); @@ -116,18 +116,6 @@ this.linksTabPage.Text = "Default Links"; this.linksTabPage.UseVisualStyleBackColor = true; // - // skinLinksListBox - // - this.skinLinksListBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); - this.skinLinksListBox.FormattingEnabled = true; - this.skinLinksListBox.Location = new System.Drawing.Point(1, 5); - this.skinLinksListBox.Name = "skinLinksListBox"; - this.skinLinksListBox.Size = new System.Drawing.Size(235, 173); - this.skinLinksListBox.TabIndex = 0; - this.skinLinksListBox.SelectedIndexChanged += new System.EventHandler(this.skinLinksListBox_SelectedIndexChanged); - this.skinLinksListBox.DoubleClick += new System.EventHandler(this.skinLinksListBox_DoubleClick); - this.skinLinksListBox.Enter += new System.EventHandler(this.skinLinksListBox_Enter); - // // skinTabPage // this.skinTabPage.Controls.Add(this.skinFilesListBox); @@ -325,6 +313,19 @@ this.propLeftPictureBox.TabStop = false; this.propLeftPictureBox.Visible = false; // + // 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, 173); + 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); + // // ShortCuterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -370,7 +371,6 @@ private System.Windows.Forms.DataGridView shortCutsDataGridView; private System.Windows.Forms.TabControl itemsTabControl; private System.Windows.Forms.TabPage linksTabPage; - private System.Windows.Forms.ListBox skinLinksListBox; private System.Windows.Forms.TabPage skinTabPage; private System.Windows.Forms.ListBox skinFilesListBox; private System.Windows.Forms.PictureBox propLeftPictureBox; @@ -389,6 +389,7 @@ private System.Windows.Forms.Label skinFileLabel; private System.Windows.Forms.GroupBox loadParameterGroupBox; private System.Windows.Forms.Label loadParameterLabel; + private System.Windows.Forms.TreeView skinLinksTreeView; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -10,7 +10,7 @@ namespace ProcessPlugins.ShortCuter { - [PluginIcons("ProcessPlugins.ShortCuter.Resources.ShortCuterEnable.png", "ProcessPlugins.ShortCuter.Resources.ShortCuterDisable.png")] + [PluginIcons("ProcessPlugins.ShortCuter.Resources.Images.ShortCuterEnable.png", "ProcessPlugins.ShortCuter.Resources.Images.ShortCuterDisable.png")] public partial class ShortCuterForm : Form, ISetupForm //Form per la configurazione del plugin, con implementazione interfaccia ISetupForm (per lancio da configurazione MediaPortal) { #region Dati @@ -33,9 +33,9 @@ skinFilesListBox.DataSource = mySkin.SkinFiles; skinFilesListBox.SelectedIndex = -1; toolTip.SetToolTip(skinFilesListBox, "Double Click to Set the Link's Parameter to ShortCut"); - skinLinksListBox.DataSource = mySkin.SkinLinks; - skinLinksListBox.SelectedIndex = -1; - toolTip.SetToolTip(skinLinksListBox, "Double Click to Set the Link's Parameter to ShortCut"); + mySkin.FillTreeViewSkinLinks(skinLinksTreeView); + skinLinksTreeView.CollapseAll(); + toolTip.SetToolTip(skinLinksTreeView, "Double Click to Set the Link's Parameter to ShortCut"); FormatShortCutsGrid(); } private void FormatShortCutsGrid() //Formattazione (e popolazione) tabella shortcuts @@ -80,20 +80,20 @@ shiftColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; shiftColumn.DefaultCellStyle.BackColor = Color.LightCyan; - DataGridViewTextBoxColumn hyperlinkColumn = new DataGridViewTextBoxColumn(); - hyperlinkColumn.DataPropertyName = "Hyperlink"; - hyperlinkColumn.HeaderText = "Window ID"; - hyperlinkColumn.Width = 70; - hyperlinkColumn.MaxInputLength = 10; - hyperlinkColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + DataGridViewTextBoxColumn windowIDColumn = new DataGridViewTextBoxColumn(); + windowIDColumn.DataPropertyName = "WindowID"; + windowIDColumn.HeaderText = "Window ID"; + windowIDColumn.Width = 70; + windowIDColumn.MaxInputLength = 10; + windowIDColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; - DataGridViewTextBoxColumn hyperlinkParameterColumn = new DataGridViewTextBoxColumn(); - hyperlinkParameterColumn.DataPropertyName = "HyperlinkParameter"; - hyperlinkParameterColumn.HeaderText = "Load Parameter"; - hyperlinkParameterColumn.Width = 200; - hyperlinkParameterColumn.MaxInputLength = 100; - hyperlinkParameterColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; - hyperlinkParameterColumn.DefaultCellStyle.Font = new Font("Microsoft Sans Serif", 7, FontStyle.Regular); + DataGridViewTextBoxColumn loadParameterColumn = new DataGridViewTextBoxColumn(); + loadParameterColumn.DataPropertyName = "LoadParameter"; + loadParameterColumn.HeaderText = "Load Parameter"; + loadParameterColumn.Width = 200; + loadParameterColumn.MaxInputLength = 100; + loadParameterColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + loadParameterColumn.DefaultCellStyle.Font = new Font("Microsoft Sans Serif", 7, FontStyle.Regular); DataGridViewComboBoxColumn soundEffectColumn = new DataGridViewComboBoxColumn(); soundEffectColumn.DataPropertyName = "SoundEffect"; @@ -107,8 +107,8 @@ shortCutsDataGridView.Columns.Add(ctrlColumn); shortCutsDataGridView.Columns.Add(altColumn); shortCutsDataGridView.Columns.Add(shiftColumn); - shortCutsDataGridView.Columns.Add(hyperlinkColumn); - shortCutsDataGridView.Columns.Add(hyperlinkParameterColumn); + shortCutsDataGridView.Columns.Add(windowIDColumn); + shortCutsDataGridView.Columns.Add(loadParameterColumn); shortCutsDataGridView.Columns.Add(soundEffectColumn); shortCutsDataGridView.DataSource = myShortCuts.Items; @@ -134,8 +134,8 @@ case "skinLinksListBox": //Lista links predefiniti della skin skinFileLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].XmlFile; - windowIdLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].Hyperlink.ToString(); - loadParameterLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].HyperlinkParameter; + windowIdLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].WindowID.ToString(); + loadParameterLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].LoadParameter; break; } } @@ -148,18 +148,19 @@ propLeftPictureBox.Visible = true; //--> visualizzazione freccia grafica if (!forceCell) //Non nel caso di forzatura valore cella WindowID (doppio click da lista links) { - int showIndex; int hyperlink; + int showIndex; + int windowID = Convert.ToInt32(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value); if (itemsTabControl.SelectedIndex == 0) { - hyperlink = Convert.ToInt32(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value); - string hyperlinkParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value); - showIndex = mySkin.SkinLinks.FindIndex(x => x.Hyperlink == hyperlink && x.HyperlinkParameter == hyperlinkParameter); - skinLinksListBox.SelectedIndex = showIndex; //--> selezione eventuale link corrispondente a WindowID & HyperlinkParameter + string loadParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value); + showIndex = mySkin.SkinLinks.FindIndex(x => x.WindowID == windowID && x.LoadParameter == loadParameter); + + //--> selezione eventuale link corrispondente a WindowID & HyperlinkParameter + skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes.Find(showIndex.ToString(), true)[0]; } else { - hyperlink = Convert.ToInt32(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value); - showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == hyperlink); + showIndex = mySkin.SkinFiles.FindLastIndex(x => x.Id == windowID); skinFilesListBox.SelectedIndex = showIndex; //--> selezione eventuale file corrispondente a WindowID } } @@ -342,11 +343,17 @@ #region Eventi Liste Files & Links Skin private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e) { - ((itemsTabControl.SelectedIndex == 0) ? skinLinksListBox : skinFilesListBox).Focus(); + if(itemsTabControl.SelectedIndex == 0) + skinLinksTreeView.Focus(); + else + skinFilesListBox.Focus(); } private void itemsTabControl_Click(object sender, EventArgs e) { - ((itemsTabControl.SelectedIndex == 0) ? skinLinksListBox : skinFilesListBox).Focus(); + if (itemsTabControl.SelectedIndex == 0) + skinLinksTreeView.Focus(); + else + skinFilesListBox.Focus(); } private void skinFilesListBox_SelectedIndexChanged(object sender, EventArgs e) { @@ -368,21 +375,22 @@ forceCell = false; } } - private void skinLinksListBox_SelectedIndexChanged(object sender, EventArgs e) + private void skinLinksTreeView_AfterSelect(object sender, TreeViewEventArgs e) { ShowLinkProperties(sender); } - private void skinLinksListBox_Enter(object sender, EventArgs e) + private void skinLinksTreeView_Enter(object sender, EventArgs e) { ShowLinkItem(); ShowLinkProperties(sender); } - private void skinLinksListBox_DoubleClick(object sender, EventArgs e) + private void skinLinksTreeView_DoubleClick(object sender, EventArgs e) { - if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0) + int skinLinkIndex = mySkin.GetSkinLinkIndex(skinLinksTreeView); + if (shortCutsDataGridView.CurrentRow != null && shortCutsDataGridView.RowCount > 0 && skinLinkIndex >= 0) { - shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[skinLinksListBox.SelectedIndex].Hyperlink.ToString(); - shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[skinLinksListBox.SelectedIndex].HyperlinkParameter; + shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[5].Value = mySkin.SkinLinks[skinLinkIndex].WindowID.ToString(); + shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value = mySkin.SkinLinks[skinLinkIndex].LoadParameter; forceCell = true; shortCutsDataGridView.CurrentCell = shortCutsDataGridView[5, shortCutsDataGridView.CurrentRow.Index]; forceCell = false; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 18:54:25 UTC (rev 4662) @@ -117,75 +117,9 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <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="skinLinksListBox.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> - <metadata name="loadParameterGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>4, 2</value> </metadata> - <metadata name="updateButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="resetButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="rowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="rowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="infoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="rowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="rowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="propLeftPictureBox.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> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>25</value> </metadata> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -19,8 +19,8 @@ private bool _ctrl; //Utilizzo del modificatore "Ctrl" - combinazione di tasti private bool _alt; //Utilizzo del modificatore "Alt" - combinazione di tasti private bool _shift; //Utilizzo del modificatore "Shift" - combinazione di tasti - private int _hyperlink; //Id finestra per visualizzazione in MediaPortal - private string _hyperlinkParameter; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.) + private int _windowID; //Id finestra per visualizzazione in MediaPortal + private string _loadParameter; //Eventuali parametri di caricamento per visualizzazione (sotto-categorie, ecc.) private string _soundEffect; //File relativo all'eventuale effetto sonoro public static readonly List<Keys> ModifierKeys = new List<Keys>(); //Lista dei tasti modificatori @@ -41,14 +41,14 @@ } public ShortCut() //Costruttore classe ShortCut { - _caption = "ShortCutXX"; //--> inizializzazione titolo - _key = "A"; //--> inizializzazione tasto - _ctrl = true; //--> inizializzazione utilizzo del modificatore "Ctrl" - _alt = false; //--> inizializzazione utilizzo del modificatore "Alt" - _shift = true; //--> inizializzazione utilizzo del modificatore "Shift" - _hyperlink = 0; //--> inizializzazione hyperlink - _hyperlinkParameter = ""; //--> inizializzazione parametri aggiuntivi per visualizzazione - _soundEffect = "click.wav"; //--> inizializzazione effetto sonoro + _caption = "ShortCut"; //--> inizializzazione titolo + _key = "A"; //--> inizializzazione tasto + _ctrl = true; //--> inizializzazione utilizzo del modificatore "Ctrl" + _alt = false; //--> inizializzazione utilizzo del modificatore "Alt" + _shift = true; //--> inizializzazione utilizzo del modificatore "Shift" + _windowID = 0; //--> inizializzazione window ID + _loadParameter = ""; //--> inizializzazione parametri di caricamento per visualizzazione + _soundEffect = "click.wav"; //--> inizializzazione effetto sonoro } #endregion @@ -63,7 +63,7 @@ #region Metodi Pubblici & Eventi public bool IsValid() //Verifica validità dello shortcut { - if ((_ctrl || _alt || _shift) && _hyperlink >= 0) //Per validare lo shortcut deve esserci almeno un modificatore nella combinazione di tasti e l'ID della finestra di MediaPortal deve essere valido + if ((_ctrl || _alt || _shift) && _windowID >= 0) //Per validare lo shortcut deve esserci almeno un modificatore nella combinazione di tasti e l'ID della finestra di MediaPortal deve essere valido { KeysConverter kc = new KeysConverter(); Keys key = new Keys(); @@ -84,9 +84,9 @@ ret += "<ALT>"; if (_shift) ret += "<SHIFT>"; - ret += "<" + _key + ">" + " --> Hyperlink=" + _hyperlink.ToString(); - if (_hyperlinkParameter.Length > 0) - ret += " HyperlinkParameter=[" + _hyperlinkParameter + "]"; + ret += "<" + _key + ">" + " --> WindowID=" + _windowID.ToString(); + if (_loadParameter.Length > 0) + ret += " LoadParameter=[" + _loadParameter + "]"; if (_soundEffect.Length > 0) ret += " SoundEffect=" + _soundEffect; return ret; @@ -95,14 +95,14 @@ #endregion #region Proprietà - public string Caption { get { return this._caption; } set { this._caption = value; this.NotifyPropertyChanged("Caption"); } } - public string Key { get { return this._key; } set { this._key = value; this.NotifyPropertyChanged("Key"); } } - public bool Ctrl { get { return this._ctrl; } set { this._ctrl = value; this.NotifyPropertyChanged("Ctrl"); } } - public bool Alt { get { return this._alt; } set { this._alt = value; this.NotifyPropertyChanged("Alt"); } } - public bool Shift { get { return this._shift; } set { this._shift = value; this.NotifyPropertyChanged("Shift"); } } - public int Hyperlink { get { return this._hyperlink; } set { this._hyperlink = value; this.NotifyPropertyChanged("Hyperlink"); } } - public string HyperlinkParameter { get { return this._hyperlinkParameter; } set { this._hyperlinkParameter = value; this.NotifyPropertyChanged("HyperlinkParameter"); } } - public string SoundEffect { get { return this._soundEffect; } set { this._soundEffect = value; this.NotifyPropertyChanged("SoundEffect"); } } + public string Caption { get { return this._caption; } set { this._caption = value; this.NotifyPropertyChanged("Caption"); } } + public string Key { get { return this._key; } set { this._key = value; this.NotifyPropertyChanged("Key"); } } + public bool Ctrl { get { return this._ctrl; } set { this._ctrl = value; this.NotifyPropertyChanged("Ctrl"); } } + public bool Alt { get { return this._alt; } set { this._alt = value; this.NotifyPropertyChanged("Alt"); } } + public bool Shift { get { return this._shift; } set { this._shift = value; this.NotifyPropertyChanged("Shift"); } } + public int WindowID { get { return this._windowID; } set { this._windowID = value; this.NotifyPropertyChanged("WindowID"); } } + public string LoadParameter { get { return this._loadParameter; } set { this._loadParameter = value; this.NotifyPropertyChanged("LoadParameter"); } } + public string SoundEffect { get { return this._soundEffect; } set { this._soundEffect = value; this.NotifyPropertyChanged("SoundEffect"); } } #endregion } internal class ShortCuts //Classe di gestione degli shortcuts configurati @@ -153,12 +153,12 @@ for (int i = 1; i <= 20; i++) //Iterazione di lettura shortcut { ShortCut sc = new ShortCut(); - sc.Caption = confReader.GetValueAsString(sectionName, capPrefix + string.Format("{0:00}", i), ""); - sc.Key = confReader.GetValueAsString(sectionName, keyPrefix + string.Format("{0:00}", i), "").ToUpper(); - sc.Hyperlink = confReader.GetValueAsInt(sectionName, widPrefix + string.Format("{0:00}", i), -1); - sc.Ctrl = ctrl; - sc.Alt = false; - sc.Shift = shift; + sc.Caption = confReader.GetValueAsString(sectionName, capPrefix + string.Format("{0:00}", i), ""); + sc.Key = confReader.GetValueAsString(sectionName, keyPrefix + string.Format("{0:00}", i), "").ToUpper(); + sc.WindowID = confReader.GetValueAsInt(sectionName, widPrefix + string.Format("{0:00}", i), -1); + sc.Ctrl = ctrl; + sc.Alt = false; + sc.Shift = shift; if (sc.IsValid()) //Se shortcut valido _items.Add(sc); //--> aggiunta dello shortcut nella lista } @@ -219,12 +219,24 @@ innerNode = node.SelectSingleNode("Shift"); if (innerNode != null) sc.Shift = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText)); - innerNode = node.SelectSingleNode("Hyperlink"); + innerNode = node.SelectSingleNode("WindowID"); if (innerNode != null) - sc.Hyperlink = Convert.ToInt32(innerNode.InnerText); - innerNode = node.SelectSingleNode("HyperlinkParameter"); + sc.WindowID = Convert.ToInt32(innerNode.InnerText); + else + { + innerNode = node.SelectSingleNode("Hyperlink"); //Necessario per compatibilità con file di configurazione V2.0.0.0 + if (innerNode != null) + sc.WindowID = Convert.ToInt32(innerNode.InnerText); + } + innerNode = node.SelectSingleNode("LoadParameter"); if (innerNode != null) - sc.HyperlinkParameter = innerNode.InnerText; + sc.LoadParameter = innerNode.InnerText; + else + { + innerNode = node.SelectSingleNode("HyperlinkParameter"); //Necessario per compatibilità con file di configurazione V2.0.0.0 + if (innerNode != null) + sc.LoadParameter = innerNode.InnerText; + } innerNode = node.SelectSingleNode("SoundEffect"); if (innerNode != null) sc.SoundEffect = innerNode.InnerText; @@ -272,14 +284,14 @@ foreach (ShortCut sc in _items) //Iterazione per salvataggio sortcuts { xmlSettings.WriteStartElement("Item"); - xmlSettings.WriteElementString("Caption", sc.Caption); - xmlSettings.WriteElementString("Key", sc.Key); - xmlSettings.WriteElementString("Ctrl", Convert.ToInt16(sc.Ctrl).ToString()); - xmlSettings.WriteElementString("Alt", Convert.ToInt16(sc.Alt).ToString()); - xmlSettings.WriteElementString("Shift", Convert.ToInt16(sc.Shift).ToString()); - xmlSettings.WriteElementString("Hyperlink", sc.Hyperlink.ToString()); - xmlSettings.WriteElementString("HyperlinkParameter", sc.HyperlinkParameter); - xmlSettings.WriteElementString("SoundEffect", sc.SoundEffect); + xmlSettings.WriteElementString("Caption", sc.Caption); + xmlSettings.WriteElementString("Key", sc.Key); + xmlSettings.WriteElementString("Ctrl", Convert.ToInt16(sc.Ctrl).ToString()); + xmlSettings.WriteElementString("Alt", Convert.ToInt16(sc.Alt).ToString()); + xmlSettings.WriteElementString("Shift", Convert.ToInt16(sc.Shift).ToString()); + xmlSettings.WriteElementString("WindowID", sc.WindowID.ToString()); + xmlSettings.WriteElementString("LoadParameter", sc.LoadParameter); + xmlSettings.WriteElementString("SoundEffect", sc.SoundEffect); xmlSettings.WriteEndElement(); } xmlSettings.WriteEndElement(); Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinLinks.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinLinks.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinLinks.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -1,112 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Xml; -using My.Common; - -namespace ProcessPlugins.ShortCuter -{ - internal class Skin : MediaPortalSkin //Classe per gestione skin di MediaPortal - { - #region Dati - public struct SkinLink //Struttura dati link della skin - { - public string Caption; //Titolo - public string XmlFile; //Nome del file xml della skin - public int Hyperlink; //Id finestra per visualizzazione in MediaPortal - public string HyperlinkParameter; //Eventuali parametri aggiuntivi per visualizzazione (sotto-categorie, ecc.) - public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl - } - private List<SkinLink> _skinLinks = new List<SkinLink>(); //Lista link più popolari disponibili per la skin - private List<string> _skinSounds = new List<string>(); //Lista effetti sonori della skin - #endregion - - #region Costruttore - public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, false) - { //Costruttore classe Skin - _initialized = _initialized && GetSkinLinks() && GetSkinSounds(); //--> raccolta link ed effetti sonori della skin - } - #endregion - - #region MetodiPrivati - private bool GetSkinLinks() //Raccolta dei link più popolari disponibili per la skin - { - XmlDocument xmlFile = new XmlDocument(); - try - { - using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream("ProcessPlugins.ShortCuter.XmlFiles.PopularSkinLinks.xml")) - { - xmlFile.Load(streamFile); //Links skin disponibili --> lettura file xml incapsulato - } - } - catch (Exception e) - { - Tools.ErrorMessage("Error loading PopularSkinLinks.xml.", e.Message); - return false; - } - XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/Items/Item"); - foreach (XmlNode node in nodeList) //Iterazione per memorizzazione dati - { - SkinLink skL = new SkinLink(); - XmlNode innerNode = node.SelectSingleNode("Caption"); - if (innerNode != null) - skL.Caption = innerNode.InnerText; - innerNode = node.SelectSingleNode("XmlFile"); - if (innerNode != null) - skL.XmlFile = innerNode.InnerText; - innerNode = node.SelectSingleNode("Hyperlink"); - if (innerNode != null) - skL.Hyperlink = Convert.ToInt32(innerNode.InnerText); - innerNode = node.SelectSingleNode("HyperlinkParameter"); - if (innerNode != null) - skL.HyperlinkParameter = innerNode.InnerText; - - try - { - SkinFile skF = _skinFiles.Find(x => x.Id == skL.Hyperlink); - if (skF.ToString() != null || skL.XmlFile == "-") //Verifica se Hyperlink disponibile negli Ids della skin (o se non specificato file xml - link di sistema) - _skinLinks.Add(skL); //--> aggiunta link nella lista - } - catch { } - } - if (_skinLinks.Count > 0) - return true; //--> raccolta links effettuata - else - { - Tools.ErrorMessage("No skin links found loading PopularSkinLinks.xml."); - return false; - } - } - private bool GetSkinSounds() //Raccolta effetti sonori della skin - { - DirectoryInfo dInfo = new DirectoryInfo(_paths.Sounds); - if (!dInfo.Exists) - { - Tools.ErrorMessage("Skin sounds folder not found!", _paths.Sounds); - return false; - } - foreach (FileInfo fInfo in dInfo.GetFiles()) //Iterazione per applicazione filtro e memorizzazione dati - { - if (fInfo.Extension.ToLower() == ".wav") - _skinSounds.Add(fInfo.Name); //--> aggiunta effetto sonoro nella lista - } - if (_skinSounds.Count > 0) - { - _skinSounds.Insert(0, ""); //--> aggiunta della selezione per nessun effetto sonoro - return true; //--> raccolta effetti sonori effettuata - } - else - { - Tools.ErrorMessage("No sounds found.", _paths.Sounds); - return false; - } - } - #endregion - - #region Proprietà - public List<SkinLink> SkinLinks { get { return this._skinLinks; } } - public List<string> SkinSounds { get { return this._skinSounds; } } - #endregion - } -} Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Xml; +using My.Common; + +namespace ProcessPlugins.ShortCuter +{ + internal class Skin : MediaPortalSkin //Classe per gestione skin di MediaPortal + { + #region Dati + private List<string> _skinSounds = new List<string>(); //Lista effetti sonori della skin + #endregion + + #region Costruttore + public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, false, false) + { //Costruttore classe Skin + _initialized = _initialized && GetSkinSounds(); //--> raccolta effetti sonori della skin + } + #endregion + + #region MetodiPrivati + private bool GetSkinSounds() //Raccolta effetti sonori della skin + { + DirectoryInfo dInfo = new DirectoryInfo(_paths.Sounds); + if (!dInfo.Exists) + { + Tools.ErrorMessage("Skin sounds folder not found!", _paths.Sounds); + return false; + } + foreach (FileInfo fInfo in dInfo.GetFiles()) //Iterazione per applicazione filtro e memorizzazione dati + { + if (fInfo.Extension.ToLower() == ".wav") + _skinSounds.Add(fInfo.Name); //--> aggiunta effetto sonoro nella lista + } + if (_skinSounds.Count > 0) + { + _skinSounds.Insert(0, ""); //--> aggiunta della selezione per nessun effetto sonoro + return true; //--> raccolta effetti sonori effettuata + } + else + { + Tools.ErrorMessage("No sounds found.", _paths.Sounds); + return false; + } + } + #endregion + + #region Proprietà + public List<string> SkinSounds { get { return this._skinSounds; } } + #endregion + } +} Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 17:51:55 UTC (rev 4661) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 18:54:25 UTC (rev 4662) @@ -110,7 +110,6 @@ case "skinLinksTreeView": //Lista links predefiniti della skin propertiesGroupBox.Text = propBoxText + " (Default Links)"; labelTextBox.Enabled= true; - labelTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Context; captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Caption; skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].XmlFile; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-20 20:06:58
|
Revision: 4664 http://sourceforge.net/p/mp-plugins/code/4664 Author: nicsergio Date: 2013-10-20 20:06:54 +0000 (Sun, 20 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-20 18:55:48 UTC (rev 4663) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-20 20:06:54 UTC (rev 4664) @@ -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.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.0.1.0")] +[assembly: AssemblyFileVersion("2.0.1.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/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 18:55:48 UTC (rev 4663) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-10-20 20:06:54 UTC (rev 4664) @@ -34,6 +34,7 @@ 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(); @@ -52,7 +53,6 @@ this.rowRemoveButton = new System.Windows.Forms.Button(); this.rowAddButton = new System.Windows.Forms.Button(); this.propLeftPictureBox = new System.Windows.Forms.PictureBox(); - this.skinLinksTreeView = new System.Windows.Forms.TreeView(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); @@ -116,6 +116,19 @@ 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, 173); + 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); @@ -313,19 +326,6 @@ this.propLeftPictureBox.TabStop = false; this.propLeftPictureBox.Visible = false; // - // 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, 173); - 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); - // // ShortCuterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 18:55:48 UTC (rev 4663) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-10-20 20:06:54 UTC (rev 4664) @@ -80,12 +80,12 @@ shiftColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; shiftColumn.DefaultCellStyle.BackColor = Color.LightCyan; - DataGridViewTextBoxColumn windowIDColumn = new DataGridViewTextBoxColumn(); - windowIDColumn.DataPropertyName = "WindowID"; - windowIDColumn.HeaderText = "Window ID"; - windowIDColumn.Width = 70; - windowIDColumn.MaxInputLength = 10; - windowIDColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; + DataGridViewTextBoxColumn windowIdColumn = new DataGridViewTextBoxColumn(); + windowIdColumn.DataPropertyName = "WindowID"; + windowIdColumn.HeaderText = "Window ID"; + windowIdColumn.Width = 70; + windowIdColumn.MaxInputLength = 10; + windowIdColumn.DefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter; DataGridViewTextBoxColumn loadParameterColumn = new DataGridViewTextBoxColumn(); loadParameterColumn.DataPropertyName = "LoadParameter"; @@ -107,7 +107,7 @@ shortCutsDataGridView.Columns.Add(ctrlColumn); shortCutsDataGridView.Columns.Add(altColumn); shortCutsDataGridView.Columns.Add(shiftColumn); - shortCutsDataGridView.Columns.Add(windowIDColumn); + shortCutsDataGridView.Columns.Add(windowIdColumn); shortCutsDataGridView.Columns.Add(loadParameterColumn); shortCutsDataGridView.Columns.Add(soundEffectColumn); @@ -115,9 +115,22 @@ } private void ShowLinkProperties(object listControl) //Visualizzazione proprietà link { - ListBox itemsList = (ListBox)listControl; //Casting oggetto -> ListBox - if (itemsList.SelectedIndex < 0) //Se indice invalido --> reset proprietà + Control itemsList = (Control)listControl; //Casting sender -> Control + int selectedIndex; //Indice eventuale elemento selezionato + + if (itemsList is ListBox) { + ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox + selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato + } + else + { + TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView + selectedIndex= mySkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato + } + + if (selectedIndex < 0) //Se indice invalido --> reset proprietà + { skinFileLabel.Text = "-"; windowIdLabel.Text = "-"; loadParameterLabel.Text = "-"; @@ -127,15 +140,15 @@ switch (itemsList.Name) { case "skinFilesListBox": //Lista files della skin - skinFileLabel.Text = mySkin.SkinFiles[itemsList.SelectedIndex].Name; - windowIdLabel.Text = mySkin.SkinFiles[itemsList.SelectedIndex].Id.ToString(); + skinFileLabel.Text = mySkin.SkinFiles[selectedIndex].Name; + windowIdLabel.Text = mySkin.SkinFiles[selectedIndex].Id.ToString(); loadParameterLabel.Text = "-"; break; - case "skinLinksListBox": //Lista links predefiniti della skin - skinFileLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].XmlFile; - windowIdLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].WindowID.ToString(); - loadParameterLabel.Text = mySkin.SkinLinks[itemsList.SelectedIndex].LoadParameter; + case "skinLinksTreeView": //Lista links predefiniti della skin + skinFileLabel.Text = mySkin.SkinLinks[selectedIndex].XmlFile; + windowIdLabel.Text = mySkin.SkinLinks[selectedIndex].WindowID.ToString(); + loadParameterLabel.Text = mySkin.SkinLinks[selectedIndex].LoadParameter; break; } } @@ -154,9 +167,8 @@ { string loadParameter = Convert.ToString(shortCutsDataGridView.Rows[shortCutsDataGridView.CurrentRow.Index].Cells[6].Value); showIndex = mySkin.SkinLinks.FindIndex(x => x.WindowID == windowID && x.LoadParameter == loadParameter); - - //--> selezione eventuale link corrispondente a WindowID & HyperlinkParameter - skinLinksTreeView.SelectedNode = skinLinksTreeView.Nodes.Find(showIndex.ToString(), true)[0]; + //Selezione eventuale link corrispondente a WindowID & LoadParameter + skinLinksTreeView.SelectedNode = ((showIndex >= 0) ? skinLinksTreeView.Nodes.Find(showIndex.ToString(), true)[0] : null); } else { Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 18:55:48 UTC (rev 4663) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-10-20 20:06:54 UTC (rev 4664) @@ -117,9 +117,75 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <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> + <metadata name="loadParameterGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="windowIdGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="skinFileGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>4, 2</value> </metadata> + <metadata name="updateButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="resetButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="rowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="rowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="infoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="rowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="rowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="propLeftPictureBox.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> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>25</value> </metadata> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 18:55:48 UTC (rev 4663) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-10-20 20:06:54 UTC (rev 4664) @@ -71,12 +71,12 @@ if (itemsList is ListBox) { - ListBox listBox = (ListBox)itemsList; //Casting oggetto -> ListBox + ListBox listBox = (ListBox)itemsList; //Casting Control -> ListBox selectedIndex = listBox.SelectedIndex; //<-- indice lista selezionato } else { - TreeView treeView = (TreeView)itemsList; //Casting oggetto -> TreeView + TreeView treeView = (TreeView)itemsList; //Casting Control -> TreeView selectedIndex= myMediaPortal.SelectedSkin.GetSkinLinkIndex(treeView); //<-- indice nodo selezionato } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-10-29 17:00:04
|
Revision: 4668 http://sourceforge.net/p/mp-plugins/code/4668 Author: nicsergio Date: 2013-10-29 17:00:00 +0000 (Tue, 29 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-24 16:30:20 UTC (rev 4667) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-10-29 17:00:00 UTC (rev 4668) @@ -47,6 +47,7 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-24 16:30:20 UTC (rev 4667) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-10-29 17:00:00 UTC (rev 4668) @@ -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.0.1.0")] -[assembly: AssemblyFileVersion("2.0.1.0")] +[assembly: AssemblyVersion("2.0.1.1")] +[assembly: AssemblyFileVersion("2.0.1.1")] //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 2013-10-24 16:30:20 UTC (rev 4667) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-10-29 17:00:00 UTC (rev 4668) @@ -63,7 +63,8 @@ #region Metodi Pubblici & Eventi public bool IsValid() //Verifica validità dello shortcut { - if ((_ctrl || _alt || _shift) && _windowID >= 0) //Per validare lo shortcut deve esserci almeno un modificatore nella combinazione di tasti e l'ID della finestra di MediaPortal deve essere valido + //if ((_ctrl || _alt || _shift) && _windowID >= 0) //(fino a V2.0.1) Per validare lo shortcut deve esserci almeno un modificatore nella combinazione di tasti e l'ID della finestra di MediaPortal deve essere valido + if (_windowID >= 0) //Per validare lo shortcut l'ID della finestra di MediaPortal deve essere valido { KeysConverter kc = new KeysConverter(); Keys key = new Keys(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-24 16:30:20 UTC (rev 4667) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-10-29 17:00:00 UTC (rev 4668) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-07 16:35:17
|
Revision: 4670 http://sourceforge.net/p/mp-plugins/code/4670 Author: nicsergio Date: 2013-11-07 16:35:13 +0000 (Thu, 07 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Removed Paths: ------------- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/OverlayList.xml Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-07 16:35:13 UTC (rev 4670) @@ -9,6 +9,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>BasicHome.png</IconList> <SubItems> @@ -22,6 +23,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Home.png</IconList> </SubItem> @@ -38,6 +40,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>TV</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>TV.png</IconList> <SubItems> @@ -51,6 +54,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>TVSeries</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>TvSeries.png</IconList> </SubItem> @@ -64,6 +68,7 @@ <BackgroundImage>hover_my tv.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>TvRecs.png</IconList> </SubItem> @@ -77,6 +82,7 @@ <BackgroundImage>hover_my tv.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>TvGuide.png</IconList> </SubItem> @@ -90,6 +96,7 @@ <BackgroundImage>hover_my tv.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Teletext.png</IconList> </SubItem> @@ -103,6 +110,7 @@ <BackgroundImage>hover_my tv.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Fullscreen.png</IconList> </SubItem> @@ -116,6 +124,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> </SubItem> @@ -132,6 +141,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Movies.png</IconList> <SubItems> @@ -145,6 +155,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>Film</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>MovingPictures.png</IconList> </SubItem> @@ -158,6 +169,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>MyFilms.png</IconList> </SubItem> @@ -171,6 +183,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Trailers.png</IconList> </SubItem> @@ -184,6 +197,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Trailers.png</IconList> </SubItem> @@ -197,6 +211,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.scraper</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Movies.png</IconList> </SubItem> @@ -210,6 +225,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>DVD.png</IconList> </SubItem> @@ -223,6 +239,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>BD.png</IconList> </SubItem> @@ -236,6 +253,7 @@ <BackgroundImage>Film</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>ShowTimes.png</IconList> </SubItem> @@ -249,6 +267,7 @@ <BackgroundImage>hover_trakt.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Trakt.png</IconList> </SubItem> @@ -262,6 +281,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>movies</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Fullscreen.png</IconList> </SubItem> @@ -275,6 +295,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> </SubItem> @@ -291,6 +312,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Music.png</IconList> <SubItems> @@ -304,6 +326,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>MusicPlaylists.png</IconList> </SubItem> @@ -317,6 +340,7 @@ <BackgroundImage>hover_my music.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>MusicPlaying.png</IconList> </SubItem> @@ -330,6 +354,7 @@ <BackgroundImage>hover_my lyrics.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>MyLyrics.png</IconList> </SubItem> @@ -343,6 +368,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.scraper</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Music.png</IconList> </SubItem> @@ -356,6 +382,7 @@ <BackgroundImage>hover_my radio.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Radio.png</IconList> </SubItem> @@ -369,6 +396,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>LastFM.png</IconList> </SubItem> @@ -382,6 +410,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>music</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>mvCentral.png</IconList> </SubItem> @@ -395,6 +424,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> </SubItem> @@ -411,6 +441,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>pictures</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Pictures.png</IconList> <SubItems> @@ -424,6 +455,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> </SubItem> @@ -440,7 +472,8 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> - <Overlay>weather</Overlay> + <Icon></Icon> + <Overlay>WeatherPanelBig</Overlay> <IconList>Weather.png</IconList> <SubItems> @@ -453,7 +486,8 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler></FanartHandler> - <Overlay>weather</Overlay> + <Icon></Icon> + <Overlay>WeatherPanelBig</Overlay> <IconList>Weather.png</IconList> </SubItem> @@ -469,6 +503,7 @@ <BackgroundImage>hover_webbrowser.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Internet.png</IconList> <SubItems> @@ -482,6 +517,7 @@ <BackgroundImage>hover_OnlineVideos.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>OnlineVideos.png</IconList> </SubItem> @@ -495,6 +531,7 @@ <BackgroundImage>hover_OnlineVideos.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>YouTube.png</IconList> </SubItem> @@ -508,6 +545,7 @@ <BackgroundImage>hover_wikipedia.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Wikipedia.png</IconList> </SubItem> @@ -521,6 +559,7 @@ <BackgroundImage>hover_InfoService.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>News.png</IconList> </SubItem> @@ -534,6 +573,7 @@ <BackgroundImage>hover_InfoService.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Twitter.png</IconList> </SubItem> @@ -550,6 +590,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>plugins</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Plugins.png</IconList> <SubItems> @@ -563,6 +604,7 @@ <BackgroundImage>hover_htpcinfo.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>HtpcInfo.png</IconList> </SubItem> @@ -576,6 +618,7 @@ <BackgroundImage>hover_tetris.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Games.png</IconList> </SubItem> @@ -589,6 +632,7 @@ <BackgroundImage>hover_File Explorer.png</BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>FileExplorer.png</IconList> </SubItem> @@ -602,6 +646,7 @@ <BackgroundImage></BackgroundImage> <BackgroundFolder>settings</BackgroundFolder> <FanartHandler></FanartHandler> + <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> </SubItem> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-11-07 16:35:13 UTC (rev 4670) @@ -28,7 +28,8 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.ActiveCfg = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 - {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Debug|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -47,7 +48,6 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-07 16:35:13 UTC (rev 4670) @@ -43,7 +43,7 @@ singleImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgImages; multiImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgFolders; fanartComboBox.DataSource = myMediaPortal.FanartTypes; - overlayComboBox.DataSource = myMediaPortal.OverlayTypes; + overlayComboBox.DataSource = myMediaPortal.SelectedSkin.SkinOverlays; menuListBox.DataSource = myMenu.Items; menuListBox.SelectedIndex = 0; ModifyMenuListButtonsEnable(); @@ -138,7 +138,7 @@ } } overlayGroupBox.Enabled = true; - overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay)); + overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay)); propLeftPictureBox.Visible = true; propRightPictureBox.Visible = false; menuRowAddButton.Visible = true; @@ -178,7 +178,7 @@ } } overlayGroupBox.Enabled = true; - overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay)); + overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay)); propLeftPictureBox.Visible = false; propRightPictureBox.Visible = true; menuRowAddButton.Visible = false; @@ -377,7 +377,7 @@ else if (fanartRadioButton.Checked) mItem.FanartHandler = myMediaPortal.GetFanartValue(fanartComboBox.Text); - mItem.Overlay = myMediaPortal.GetOverlayValue(overlayComboBox.Text); + mItem.Overlay = myMediaPortal.SelectedSkin.GetOverlayValue(overlayComboBox.Text); if (edit) //Caso di editazione: rimozione ed re-inserimento elemento { int index = menuListBox.SelectedIndex; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-07 16:35:13 UTC (rev 4670) @@ -21,12 +21,6 @@ public string Thumbs; //Percorso generico thumbnails public string Caches; //Percorso cache delle skin } - public struct OptEnum //Struttura dati enumerativi per opzioni - { - public string Value; //Valore enumerativo - public string Description; //Descrizione enumerativo - public override string ToString() { return Description; } //Override metodo ToString per riempire classi ListControl - } public struct FanartType //Struttura dato tipologia di Fanart { public string SettingValue; //Valore per impostazioni @@ -37,15 +31,23 @@ public class Skin : MediaPortalSkin //Sotto-classe Skin (classe derivata da MediaPortalSkin) { #region Dati - private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media) - private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations) + public struct Overlay //Struttura elementi di overlay per BasicHome + { + public string Value; //Valore proprietà + public string Description; //Descrizione overlay + public override string ToString() { return Description; } //Override metodo ToString per riempire classi ListControl + } + private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media) + private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations) + private List<Overlay> _skinOverlays = new List<Overlay>(); //Lista overlay disponibili per BasicHome della skin #endregion #region Costruttore public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, true, true) { //Costruttore sotto-classe Skin _initialized = _initialized && GetSkinBackgroundImages(false) - && GetSkinMultiImageFolders(); //--> raccolta immagini di background ed animazioni della skin + && GetSkinMultiImageFolders() + && GetSkinOverlays(); //--> raccolta immagini di background, animazioni ed overlays della skin } #endregion @@ -114,19 +116,75 @@ return false; } } + private bool GetSkinOverlays() //Raccolta degli overlay per BasicHome della skin + { + const string OverlayPrefix = "BasicHome.Overlay."; //Prefisso nomi file identificativi degli overlays per BasicHome + + string[] files = Directory.GetFiles(_paths.Skin); //--> lettura file da disco + foreach (string file in files) //Iterazione per applicazione filtro e memorizzazione dati + { + try + { + if (file.StartsWith(_paths.Skin + OverlayPrefix) && file.ToLower().EndsWith(".xml")) + { + XmlDocument xmlFile = new XmlDocument(); + xmlFile.Load(file); + XmlNode node = xmlFile.DocumentElement.SelectSingleNode("/window/comment()"); + if (node.InnerText.Length > 0) + { + if (node.InnerText.Contains("OverlayLabel")) + { + Overlay ovl = new Overlay(); + ovl.Description = node.InnerText.Remove(0, node.InnerText.IndexOf("\"") + 1).Replace("\"","").Trim(); + ovl.Value = file.Remove(0, file.IndexOf(OverlayPrefix) + OverlayPrefix.Length).Replace(".xml", ""); + if (ovl.Description.Length > 0 && ovl.Value.Length > 0) + _skinOverlays.Add(ovl); //--> aggiunta overlay nella lista + } + } + } + } + catch { } + } + if (_skinOverlays.Count > 0) + { + Overlay ovl = new Overlay(); + ovl.Description = "- None - "; + ovl.Value = ""; + _skinOverlays.Insert(0, ovl); //--> inserimento della scelta per "nessun overlay" + return true; //--> raccolta overlay effettuata + } + else + { + Tools.ErrorMessage("No BasicHome overlay found.", _paths.Skin); + return false; + } + } #endregion + #region Metodi Pubblici + public string GetOverlayDescription(string overlayValue) //Ottenimento descrizione corrispondente a valore overlay per BasicHome + { + Overlay ovl = _skinOverlays.Find(x => x.Value == overlayValue); + return ovl.Description; + } + public string GetOverlayValue(string overlayDescription) //Ottenimento valore corrispondente a descrizione overlay per BasicHome + { + Overlay ovl = _skinOverlays.Find(x => x.Description == overlayDescription); + return ovl.Value; + } + #endregion + #region Proprietà - public List<string> SkinBgImages { get { return this._skinBgImages; } } - public List<string> SkinBgFolders { get { return this._skinBgFolders; } } + public List<string> SkinBgImages { get { return this._skinBgImages; } } + public List<string> SkinBgFolders { get { return this._skinBgFolders; } } + public List<Overlay> SkinOverlays { get { return this._skinOverlays; } } #endregion } #endregion #region Dati - private static Folders _paths = new Folders(); //Percorsi - private List<FanartType> _fanartTypes = new List<FanartType>(); //Tipi relativi a Fanart Handler - private List<OptEnum> _overlayTypes = new List<OptEnum>(); //Tipi di overlay per BasicHome + private static Folders _paths = new Folders(); //Percorsi + private List<FanartType> _fanartTypes = new List<FanartType>(); //Tipi relativi a Fanart Handler public Skin SelectedSkin; //Sotto-classe skin private bool _initialized; //Classe inizializzata #endregion @@ -134,7 +192,7 @@ #region Costruttore public MediaPortal(string skinName) //Costruttore classe MediaPortal { - if (GetInstallPath() && GetPaths() && GetFanarts() && GetOverlays()) //--> lettura percorso di installazione, percorsi di configurazione/skin/cache/.. e raccolta enumerativi per Fanart e Overlay + if (GetInstallPath() && GetPaths() && GetFanarts()) //--> lettura percorso di installazione, percorsi di configurazione/skin/cache/.. e raccolta elementi di Fanart disponibili { SelectedSkin = new Skin(skinName, _paths.Skins, _paths.Caches); //--> istanziazione classe skin _initialized = SelectedSkin.Initialized; //--> classe inizializzata @@ -279,41 +337,6 @@ return false; } } - private bool GetOverlays() //Raccolta dei tipi di overlay per BasicHome - { - XmlDocument xmlFile = new XmlDocument(); - try - { - using (Stream streamFile = Assembly.GetExecutingAssembly().GetManifestResourceStream("ProcessPlugins.XtremeMenuEditor.Resources.XmlFiles.OverlayList.xml")) - { - xmlFile.Load(streamFile); //Overlay disponibili --> lettura file xml incapsulato - } - } - catch (Exception e) - { - Tools.ErrorMessage("Error loading OverlayList.xml.", e.Message); - return false; - } - XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/Items/Item"); - foreach (XmlNode node in nodeList) //Iterazione per memorizzazione dati - { - OptEnum oType = new OptEnum(); - XmlNode innerNode = node.SelectSingleNode("Description"); - if (innerNode != null) - oType.Description = innerNode.InnerText; - innerNode = node.SelectSingleNode("Value"); - if (innerNode != null) - oType.Value = innerNode.InnerText; - _overlayTypes.Add(oType); //--> aggiunta tipo nella lista - } - if (_overlayTypes.Count > 0) - return true; //--> raccolta effettuata - else - { - Tools.ErrorMessage("No overlay types found loading OverlayList.xml."); - return false; - } - } private string CompletePath(string incompletePath) //Procedura di completamento percorso { string commonAppData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData); @@ -346,16 +369,6 @@ FanartType fType = _fanartTypes.Find(x => x.Description == fanartDescription); return fType.ImagesPath; } - public string GetOverlayDescription(string overlayValue) //Ottenimento descrizione corrispondente a valore di tipo overlay per BasicHome - { - OptEnum oType = _overlayTypes.Find(x => x.Value == overlayValue); - return oType.Description; - } - public string GetOverlayValue(string overlayDescription) //Ottenimento valore corrispondente a descrizione di tipo overlay per BasicHome - { - OptEnum oType = _overlayTypes.Find(x => x.Description == overlayDescription); - return oType.Value; - } #endregion #region Proprietà @@ -365,7 +378,6 @@ public static string ThumbsPath { get { return _paths.Thumbs; } } public static string CachesPath { get { return _paths.Caches; } } public List<FanartType> FanartTypes { get { return this._fanartTypes; } } - public List<OptEnum> OverlayTypes { get { return this._overlayTypes; } } #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/AssemblyInfo.cs 2013-11-07 16:35:13 UTC (rev 4670) @@ -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("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.3.0.0")] +[assembly: AssemblyFileVersion("0.3.0.0")] //Importante per la compatibilità con MediaPortal (se usato come PlugIn - dll) [assembly: CompatibleVersion("1.1.6.27644")] \ No newline at end of file Deleted: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/OverlayList.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/OverlayList.xml 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/OverlayList.xml 2013-11-07 16:35:13 UTC (rev 4670) @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Items> - <Item> - <Description>- None -</Description> - <Value></Value> - </Item> - <Item> - <Description>Weather</Description> - <Value>weather</Value> - </Item> - <Item> - <Description>Latest Moving Pictures</Description> - <Value>#latestMediaHandler.movingpicture.latest</Value> - </Item> - <Item> - <Description>Latest TV Series</Description> - <Value>#latestMediaHandler.tvseries.latest</Value> - </Item> - <Item> - <Description>Latest MyFilms</Description> - <Value>#latestMediaHandler.myfilms.latest</Value> - </Item> - <Item> - <Description>Latest MyVideos</Description> - <Value>#latestMediaHandler.myvideo.latest</Value> - </Item> - <Item> - <Description>Latest Music</Description> - <Value>#latestMediaHandler.music.latest</Value> - </Item> - <Item> - <Description>Latest Picture</Description> - <Value>#latestMediaHandler.picture</Value> - </Item> - <Item> - <Description>Latest TV Recordings</Description> - <Value>#latestMediaHandler.tvrecordings.latest</Value> - </Item> - <Item> - <Description>Active TV Recordings</Description> - <Value>#latestMediaHandler.tvrecordings.active</Value> - </Item> - <Item> - <Description>Scheduled TV Recordings</Description> - <Value>#latestMediaHandler.tvrecordings.scheduled1</Value> - </Item> - <Item> - <Description>Latest mvCentral</Description> - <Value>#latestMediaHandler.mvcentral.latest</Value> - </Item> - <Item> - <Description>HTPC Info</Description> - <Value>htpcinfo</Value> - </Item> -</Items> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-01 10:36:40 UTC (rev 4669) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-07 16:35:13 UTC (rev 4670) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> @@ -293,7 +293,6 @@ <EmbeddedResource Include="Resources\XmlFiles\DefaultMenu.xml"> <SubType>Designer</SubType> </EmbeddedResource> - <EmbeddedResource Include="Resources\XmlFiles\OverlayList.xml" /> <EmbeddedResource Include="Resources\XmlFiles\FanartList.xml" /> <EmbeddedResource Include="Resources\Images\Editor.png" /> </ItemGroup> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-09 19:35:45
|
Revision: 4673 http://sourceforge.net/p/mp-plugins/code/4673 Author: nicsergio Date: 2013-11-09 19:35:41 +0000 (Sat, 09 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -20,8 +20,9 @@ { public string Skin; //Percorso della skin public string Cache; //Percorso cache della skin - public string Media; //Percorso dati multimediali della skin - public string Animations; //Percorso animazioni della skin + public string Media; //Percorso file multimediali della skin + public string Animations; //Percorso per animazioni (multi-image) della skin + public string Icons; //Eventuale percorso icone di menu della skin public string Sounds; //Percorso effetti sonori } public class SkinFile //Classe file della skin (con ID) @@ -60,7 +61,8 @@ _paths.Skin = skinsPath + Name + @"\"; //--> percorso skin _paths.Cache = cachesPath + Name + @"\"; //--> percorso cache skin _paths.Media = _paths.Skin + @"Media\"; //--> percorso file multimediali skin - _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multiimage) skin + _paths.Animations = _paths.Media + @"Animations\"; //--> percorso per animazioni (multi-image) skin + _paths.Icons = _paths.Media + @"Icons\"; //--> eventuale percorso icone di menu della skin _paths.Sounds = _paths.Skin + @"Sounds\"; //--> percorso effetto sonori skin //Lettura nomi delle immagini per il treeview dei link della skin incapsulate nell'eseguibile @@ -254,6 +256,7 @@ public string CachePath { get { return this._paths.Cache; } } public string MediaPath { get { return this._paths.Media; } } public string AnimationsPath { get { return this._paths.Animations; } } + public string IconsPath { get { return this._paths.Icons; } } public string SoundsPath { get { return this._paths.Sounds; } } public List<SkinFile> SkinFiles { get { return this._skinFiles; } } public List<SkinLink> SkinLinks { get { return this._skinLinks; } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -74,8 +74,8 @@ this.saveButton = new System.Windows.Forms.Button(); this.generalGroupBox = new System.Windows.Forms.GroupBox(); this.multiImageTimeGroupBox = new System.Windows.Forms.GroupBox(); + this.multiIMageTimeLabel = new System.Windows.Forms.Label(); this.multiImageTimeSecLabel = new System.Windows.Forms.Label(); - this.multiIMageTimeLabel = new System.Windows.Forms.Label(); this.multiImageTimeTrackBar = new System.Windows.Forms.TrackBar(); this.defaultMenuItemGroupBox = new System.Windows.Forms.GroupBox(); this.defaultMenuItemComboBox = new System.Windows.Forms.ComboBox(); @@ -245,16 +245,14 @@ // // iconPictureBox // - this.iconPictureBox.BackColor = System.Drawing.Color.Transparent; - this.iconPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.iconPictureBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); this.iconPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError; - this.iconPictureBox.Location = new System.Drawing.Point(9, 22); + this.iconPictureBox.Location = new System.Drawing.Point(21, 22); this.iconPictureBox.Name = "iconPictureBox"; this.iconPictureBox.Size = new System.Drawing.Size(64, 64); this.iconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; this.iconPictureBox.TabIndex = 32; this.iconPictureBox.TabStop = false; - this.iconPictureBox.Visible = false; // // iconComboBox // @@ -264,6 +262,7 @@ this.iconComboBox.Name = "iconComboBox"; this.iconComboBox.Size = new System.Drawing.Size(164, 21); this.iconComboBox.TabIndex = 17; + this.iconComboBox.TextChanged += new System.EventHandler(this.iconComboBox_TextChanged); // // iconBrowseButton // @@ -274,6 +273,7 @@ this.iconBrowseButton.TabIndex = 16; this.iconBrowseButton.Text = "Browse"; this.iconBrowseButton.UseVisualStyleBackColor = true; + this.iconBrowseButton.Click += new System.EventHandler(this.iconBrowseButton_Click); // // loadParameterTextBox // @@ -630,6 +630,16 @@ this.multiImageTimeGroupBox.TabStop = false; this.multiImageTimeGroupBox.Text = "Multi-Image time interval"; // + // multiIMageTimeLabel + // + this.multiIMageTimeLabel.Font = new System.Drawing.Font("LCDMono2", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.multiIMageTimeLabel.Location = new System.Drawing.Point(245, 26); + this.multiIMageTimeLabel.Name = "multiIMageTimeLabel"; + this.multiIMageTimeLabel.Size = new System.Drawing.Size(44, 19); + this.multiIMageTimeLabel.TabIndex = 1; + this.multiIMageTimeLabel.Text = "0"; + this.multiIMageTimeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // // multiImageTimeSecLabel // this.multiImageTimeSecLabel.AutoSize = true; @@ -641,16 +651,6 @@ this.multiImageTimeSecLabel.Text = "\""; this.multiImageTimeSecLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // multiIMageTimeLabel - // - this.multiIMageTimeLabel.Font = new System.Drawing.Font("LCDMono2", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.multiIMageTimeLabel.Location = new System.Drawing.Point(245, 26); - this.multiIMageTimeLabel.Name = "multiIMageTimeLabel"; - this.multiIMageTimeLabel.Size = new System.Drawing.Size(44, 19); - this.multiIMageTimeLabel.TabIndex = 1; - this.multiIMageTimeLabel.Text = "0"; - this.multiIMageTimeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // // multiImageTimeTrackBar // this.multiImageTimeTrackBar.Location = new System.Drawing.Point(6, 19); @@ -952,7 +952,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1019, 592); + this.ClientSize = new System.Drawing.Size(1019, 608); this.Controls.Add(this.menuPanel); this.Controls.Add(this.propertiesPanel); this.Controls.Add(this.infoPictureBox); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -42,6 +42,7 @@ singleImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgImages; multiImageComboBox.DataSource = myMediaPortal.SelectedSkin.SkinBgFolders; fanartComboBox.DataSource = myMediaPortal.FanartTypes; + iconComboBox.DataSource = myMediaPortal.SelectedSkin.SkinMenuIcons; overlayComboBox.DataSource = myMediaPortal.SelectedSkin.SkinOverlays; menuListBox.DataSource = myMenu.Items; menuListBox.SelectedIndex = 0; @@ -112,6 +113,7 @@ singleImageRadioButton.Checked = true; singleImageComboBox.Text = "hover_extensions.png"; fanartComboBox.SelectedIndex = 0; + iconComboBox.Text = ""; overlayGroupBox.Enabled = true; overlayComboBox.SelectedIndex = 0; propLeftPictureBox.Visible = true; @@ -152,6 +154,7 @@ } } + iconComboBox.Text = ""; overlayGroupBox.Enabled = true; overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Overlay)); propLeftPictureBox.Visible = true; @@ -192,6 +195,7 @@ } } + iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[selectedIndex].Icon); overlayGroupBox.Enabled = true; overlayComboBox.SelectedIndex = overlayComboBox.FindStringExact(myMediaPortal.SelectedSkin.GetOverlayDescription(myMenu.Items[selectedIndex].Overlay)); propLeftPictureBox.Visible = false; @@ -234,7 +238,7 @@ } } - + iconComboBox.Text = myMediaPortal.SelectedSkin.GetMenuIconFile(myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Icon); overlayGroupBox.Enabled = false; overlayComboBox.SelectedIndex = 0; propLeftPictureBox.Visible = false; @@ -270,6 +274,8 @@ try { backgroundPictureBox.LoadAsync(bgImageName); } catch { } } + else + backgroundPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.BackgroundError; } else if (multiImageRadioButton.Checked) //Caso di cartella di animazione (multi-immagine) @@ -392,6 +398,7 @@ else if (fanartRadioButton.Checked) mItem.FanartHandler = myMediaPortal.GetFanartValue(fanartComboBox.Text); + mItem.Icon = myMediaPortal.SelectedSkin.GetMenuIconPath(iconComboBox.Text); mItem.Overlay = myMediaPortal.SelectedSkin.GetOverlayValue(overlayComboBox.Text); if (edit) //Caso di editazione: rimozione ed re-inserimento elemento { @@ -431,6 +438,7 @@ else if (fanartRadioButton.Checked) smItem.FanartHandler = myMediaPortal.GetFanartValue(fanartComboBox.Text); + smItem.Icon = myMediaPortal.SelectedSkin.GetMenuIconPath(iconComboBox.Text); if (edit) //Caso di editazione: rimozione ed re-inserimento elemento { int index = subMenuListBox.SelectedIndex; @@ -547,7 +555,7 @@ ShowItemProperties(sender); } #endregion - #region Eventi Selezione Immagine(i) Background + #region Eventi Selezione Immagine(i) Background & Icona private void singleImageRadioButton_CheckedChanged(object sender, EventArgs e) { if (showingProperties) @@ -595,8 +603,21 @@ } } } + private void iconBrowseButton_Click(object sender, EventArgs e) + { + iconOpenFileDialog.InitialDirectory = myMediaPortal.SelectedSkin.IconsPath; + if (iconOpenFileDialog.ShowDialog() == DialogResult.OK) + { + if (iconOpenFileDialog.FileName.Length > 0) + { + if (iconOpenFileDialog.FileName.ToLower().StartsWith(myMediaPortal.SelectedSkin.IconsPath.ToLower())) + iconOpenFileDialog.FileName = iconOpenFileDialog.FileName.Remove(0, myMediaPortal.SelectedSkin.IconsPath.Length); + iconComboBox.Text = iconOpenFileDialog.FileName; + } + } + } #endregion - #region Eventi Visualizzazione Immagine(i) Background + #region Eventi Visualizzazione Immagine(i) Background & Icona private void singleImageComboBox_TextChanged(object sender, EventArgs e) { if (showingProperties) @@ -628,6 +649,22 @@ try { backgroundPictureBox.LoadAsync(bgImages[bgImageIndex]); } catch { } } + private void iconComboBox_TextChanged(object sender, EventArgs e) + { + if (iconComboBox.Text.Length > 0) + { + string iconName = Path.Combine(myMediaPortal.SelectedSkin.IconsPath, iconComboBox.Text); + if (File.Exists(iconName)) + { + try { iconPictureBox.LoadAsync(iconName); } + catch { } + } + else + iconPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError; + } + else + iconPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconEmpty; + } #endregion #region Eventi Liste Menu & Sotto-Menu private void menuListBox_SelectedIndexChanged(object sender, EventArgs e) @@ -681,6 +718,10 @@ if (!falseRemMenuItem && myMenu.Items.Count > 0) DefaultMenuItemRefresh(); } + private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e) + { + multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString(); + } #endregion #region Eventi Modifica Sotto-Menu private void subMenuRowRemoveButton_Click(object sender, EventArgs e) @@ -766,12 +807,5 @@ return false; } #endregion - - private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e) - { - multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString(); - } - - } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-09 19:35:41 UTC (rev 4673) @@ -117,15 +117,198 @@ <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="multiImageFolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>183, 2</value> </metadata> <metadata name="singleImageOpenFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>5, 1</value> </metadata> + <metadata name="propertiesPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="iconGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="iconPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="iconComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="iconBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="loadParameterTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="windowIdShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="skinFileShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="captionTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="backgroundGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fanartHandlerPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="backgroundPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fanartComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fanartRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="singleImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="singleImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="singleImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="overlayGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="overlayLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="overlayComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="captionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="labelLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="clearCacheCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageTimeGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiIMageTimeLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageTimeSecLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="multiImageTimeTrackBar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="showRssCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="backgroundImageTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>390, 2</value> </metadata> + <metadata name="infoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="infoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -176,6 +359,27 @@ AElFTkSuQmCC </value> </data> + <metadata name="subMenuRowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuRowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="propLeftPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="propRightPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="menuRowEditButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="subMenuRowEditButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <data name="arrowsPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAAoAAAACACAYAAACbUtgKAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 @@ -312,6 +516,9 @@ <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>703, 1</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>25</value> </metadata> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -37,9 +37,10 @@ public string Description; //Descrizione overlay public override string ToString() { return Description; } //Override metodo ToString per riempire classi ListControl } - private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media) - private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations) - private List<Overlay> _skinOverlays = new List<Overlay>(); //Lista overlay disponibili per BasicHome della skin + private List<string> _skinBgImages = new List<string>(); //Lista immagini di background della skin (sotto \media) + private List<string> _skinBgFolders = new List<string>(); //Lista cartelle per animazioni della skin (sotto \media\animations) + private List<string> _skinMenuIcons = new List<string>(); //Lista icone per elementi di menu della skin (sotto \media\icons) + private List<Overlay> _skinOverlays = new List<Overlay>(); //Lista overlay disponibili per BasicHome della skin #endregion #region Costruttore @@ -47,7 +48,8 @@ { //Costruttore sotto-classe Skin _initialized = _initialized && GetSkinBackgroundImages(false) && GetSkinMultiImageFolders() - && GetSkinOverlays(); //--> raccolta immagini di background, animazioni ed overlays della skin + && GetSkinIcons() + && GetSkinOverlays(); //--> raccolta immagini di background, animazioni, icone ed overlays della skin } #endregion @@ -116,6 +118,29 @@ return false; } } + private bool GetSkinIcons() //Raccolta icone per elementi di menu della skin + { + DirectoryInfo dInfo = new DirectoryInfo(_paths.Icons); + if (!dInfo.Exists) + { + Tools.ErrorMessage("Skin icons folder not found!", _paths.Icons); + return false; + } + string fExt; + foreach (FileInfo fInfo in dInfo.GetFiles()) //Iterazione per applicazione filtro e memorizzazione dati + { + fExt = fInfo.Extension.ToLower(); + if ((fExt == ".png" || fExt == ".jpg" || fExt == ".bmp" || fExt == ".gif")) + _skinMenuIcons.Add(fInfo.Name); //--> aggiunta icona nella lista + } + if (_skinMenuIcons.Count > 0) + return true; //--> raccolta icone effettuata + else + { + Tools.ErrorMessage("No icons found.", _paths.Icons); + return false; + } + } private bool GetSkinOverlays() //Raccolta degli overlay per BasicHome della skin { const string OverlayPrefix = "BasicHome.Overlay."; //Prefisso nomi file identificativi degli overlays per BasicHome @@ -172,11 +197,24 @@ Overlay ovl = _skinOverlays.Find(x => x.Description == overlayDescription); return ovl.Value; } + public string GetMenuIconPath(string iconFile) //Ottenimento path (completo o parziale) icona + { + return (Path.IsPathRooted(iconFile) ? iconFile : @"Icons\" + iconFile); + } + public string GetMenuIconFile(string iconPath) //Ottenimento nome file icona + { + try + { + return (Path.IsPathRooted(iconPath) ? iconPath : iconPath.Remove(0, @"Icons\".Length)); + } + catch { return ""; } + } #endregion #region Proprietà public List<string> SkinBgImages { get { return this._skinBgImages; } } public List<string> SkinBgFolders { get { return this._skinBgFolders; } } + public List<string> SkinMenuIcons { get { return this._skinMenuIcons; } } public List<Overlay> SkinOverlays { get { return this._skinOverlays; } } #endregion } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -18,6 +18,7 @@ public string BackgroundImage = ""; //File immagine di background public string BackgroundFolder = ""; //Cartella per multi-image di background public string FanartHandler = ""; //Tipologia di fanart per background + public string Icon = ""; //Eventuale icona public override string ToString() { return Caption; } //Override metodo ToString per riempire classi ListControl } internal class SimpleMenuItem : SubMenuItem //Classe elemento di menu semplificato @@ -139,6 +140,9 @@ innerNode = node.SelectSingleNode("FanartHandler"); if (innerNode != null) mItem.FanartHandler = innerNode.InnerText; + innerNode = node.SelectSingleNode("Icon"); + if (innerNode != null) + mItem.Icon = innerNode.InnerText; innerNode = node.SelectSingleNode("Overlay"); if (innerNode != null) mItem.Overlay = innerNode.InnerText; @@ -169,6 +173,9 @@ innerNode = subNode.SelectSingleNode("FanartHandler"); if (innerNode != null) smItem.FanartHandler = innerNode.InnerText; + innerNode = node.SelectSingleNode("Icon"); + if (innerNode != null) + mItem.Icon = innerNode.InnerText; mItem.SubMenuItems.Add(smItem); //--> aggiunta dell'elemento di sotto-menu nella lista } _items.Add(mItem); //--> aggiunta dell'elemento di menu nella lista @@ -265,6 +272,7 @@ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundImage", _items[itemIndex].BackgroundImage); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".BackgroundFolder", _items[itemIndex].BackgroundFolder); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".FanartHandler", _items[itemIndex].FanartHandler); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Icon", _items[itemIndex].Icon); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".Overlay", _items[itemIndex].Overlay); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.Count", _items[itemIndex].SubMenuItems.Count.ToString()); @@ -277,6 +285,7 @@ XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundImage", _items[itemIndex].SubMenuItems[ii-1].BackgroundImage); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".BackgroundFolder", _items[itemIndex].SubMenuItems[ii-1].BackgroundFolder); XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".FanartHandler", _items[itemIndex].SubMenuItems[ii-1].FanartHandler); + XmlAddMenuSetting(ref xmlSkinSettings, NodeName, menuSectionIndex, "#skin.CustomMenu.Items.Item" + i.ToString() + ".SubItems.SubItem" + ii.ToString() + ".Icon", _items[itemIndex].SubMenuItems[ii-1].Icon); } itemIndex = (itemIndex + 1) % _items.Count; } @@ -301,60 +310,59 @@ { //Questa procedura si è resa necessaria per limitazioni dello skin engine: non si riesce ad assegnare un path parametrico ai controlli multi-image - const string SkinMltImgAnimFile = "BasicHomeBackgrounds.MultiImages.animated.xml"; //Nome del file di definizione controlli multi-image animati della skin - const string SkinMltImgNormFile = "BasicHomeBackgrounds.MultiImages.normal.xml"; //Nome del file di definizione controlli multi-image normali della skin + const string SkinMltImgPrefix = "BasicHomeBackgrounds.MultiImages."; //Prefisso nomi file di definizione controlli multi-image della skin - string skinMltImgFile = skinPath + (_general.BackgroundAnimated ? SkinMltImgAnimFile : SkinMltImgNormFile); - if (!File.Exists(skinMltImgFile)) + string[] files = Directory.GetFiles(skinPath); //--> lettura file skin da disco + foreach (string file in files) //Iterazione per applicazione filtro e scrittura impostazioni { - Tools.ErrorMessage("Skin multi-image file not found!", skinMltImgFile); - return false; //--> file di definizione controlli multi-image skin non trovato - } + if (file.StartsWith(skinPath + SkinMltImgPrefix) && file.ToLower().EndsWith(".xml")) + { + FileStream mltImg = null; + try + { + XmlDocument xmlMltImg = new XmlDocument(); + mltImg = new FileStream(file, FileMode.Open, FileAccess.Read); + xmlMltImg.Load(mltImg); //--> lettura file di definizione controlli multi-image skin + mltImg.Close(); //--> chiusura file - FileStream mltImg = null; - try - { - XmlDocument xmlMltImg = new XmlDocument(); - mltImg = new FileStream(skinMltImgFile, FileMode.Open, FileAccess.Read); - xmlMltImg.Load(mltImg); //--> lettura file di definizione controlli multi-image skin - mltImg.Close(); //--> chiusura file + XmlNodeList controlsList = xmlMltImg.DocumentElement.SelectNodes("/window/controls/control"); + if (controlsList.Count != ItemsMaxNum) + { + Tools.ErrorMessage("Skin multi-image file not valid!", file); + return false; //--> file di definizione controlli multi-image skin non valido + } - XmlNodeList controlsList = xmlMltImg.DocumentElement.SelectNodes("/window/controls/control"); - if (controlsList.Count != ItemsMaxNum) - { - Tools.ErrorMessage("Skin multi-image file not valid!", skinMltImgFile); - return false; //--> file di definizione controlli multi-image skin non valido - } + /* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo + e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */ + for (int i = 0; i < controlsList.Count; i++) //Iterazione di modifica path controlli multi-image + { + controlsList[i].SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : ""); + controlsList[i].SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString(); + } - /* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo - e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */ - for (int i = 0; i < controlsList.Count; i++) //Iterazione di modifica path controlli multi-image - { - controlsList[i].SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : ""); - controlsList[i].SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString(); + mltImg = new FileStream(file, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite); + xmlMltImg.Save(mltImg); //--> salvataggio file di definizione controlli multi-image skin manipolato + mltImg.Close(); //--> chiusura file + } + catch (Exception e) + { + Tools.ErrorMessage("Error writing multi-image settings in " + file, e.Message); + return false; //--> procedura terminata con errori + } + finally + { + if (mltImg != null) + mltImg.Close(); //--> eventuale chiusura oggetto FileStream + } } - - mltImg = new FileStream(skinMltImgFile, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite); - xmlMltImg.Save(mltImg); //--> salvataggio file di definizione controlli multi-image skin manipolato - mltImg.Close(); //--> chiusura file - return true; //--> procedura terminata correttamente } - catch (Exception e) - { - Tools.ErrorMessage("Error writing multi-image settings.", e.Message); - return false; //--> procedura terminata con errori - } - finally - { - if (mltImg != null) - mltImg.Close(); //--> eventuale chiusura oggetto FileStream - } + return true; //--> file di definizione controlli multi-image skin non trovato } private void XmlAddMenuSetting(ref XmlDocument xmlSkinSettings, string nodeName, int menuSectionIndex, string nameData, string valueData) - { //Aggiunta scrittura impostazione di menu + { //Aggiunta scrittura impostazione di menu XmlElement menuSetting = xmlSkinSettings.CreateElement("entry"); XmlAttribute menuSettingAttribute = xmlSkinSettings.CreateAttribute("name"); - menuSetting.InnerText = ((valueData.Length > 0) ? valueData : " "); //--> conversione stringhe nulle in " " + menuSetting.InnerText = ((valueData.Length > 0) ? valueData : " "); //--> conversione stringhe nulle in " " menuSettingAttribute.Value = nameData; menuSetting.Attributes.Append(menuSettingAttribute); xmlSkinSettings.DocumentElement.SelectSingleNode(nodeName).ChildNodes[menuSectionIndex].AppendChild(menuSetting); @@ -409,6 +417,7 @@ menuSettings.WriteElementString("BackgroundImage", mItem.BackgroundImage); menuSettings.WriteElementString("BackgroundFolder", mItem.BackgroundFolder); menuSettings.WriteElementString("FanartHandler", mItem.FanartHandler); + menuSettings.WriteElementString("Icon", mItem.Icon); menuSettings.WriteElementString("Overlay", mItem.Overlay); if (mItem.SubMenuItems.Count > 0) { @@ -423,6 +432,7 @@ menuSettings.WriteElementString("BackgroundImage", smItem.BackgroundImage); menuSettings.WriteElementString("BackgroundFolder", smItem.BackgroundFolder); menuSettings.WriteElementString("FanartHandler", smItem.FanartHandler); + menuSettings.WriteElementString("Icon", smItem.Icon); menuSettings.WriteEndElement(); } menuSettings.WriteEndElement(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs 2013-11-09 19:35:41 UTC (rev 4673) @@ -113,6 +113,16 @@ /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap IconEmpty { + get { + object obj = ResourceManager.GetObject("IconEmpty", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap IconError { get { object obj = ResourceManager.GetObject("IconError", resourceCulture); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx 2013-11-09 19:35:41 UTC (rev 4673) @@ -172,11 +172,14 @@ <data name="SubRowUp" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\resources\images\subrowup.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="BackgroundError" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Images\BackgroundError.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="IconError" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\Images\IconError.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="IconEmpty" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\Images\IconEmpty.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root> \ No newline at end of file Added: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png 2013-11-09 19:35:41 UTC (rev 4673) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/IconEmpty.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-09 09:54:37 UTC (rev 4672) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-09 19:35:41 UTC (rev 4673) @@ -281,6 +281,7 @@ <Content Include="Resources\Images\ArrowDoubleDown.png" /> <Content Include="Resources\Images\BackgroundError.png" /> <Content Include="Resources\Images\Editor.ico" /> + <Content Include="Resources\Images\IconEmpty.png" /> <Content Include="Resources\Images\FanartHandler.png" /> <Content Include="Resources\Images\IconError.png" /> <Content Include="Resources\Images\MiniArrowLeft.png" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-14 19:01:39
|
Revision: 4678 http://sourceforge.net/p/mp-plugins/code/4678 Author: nicsergio Date: 2013-11-14 19:01:37 +0000 (Thu, 14 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/UpdateNotify.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/FanartList.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-12 22:22:29 UTC (rev 4677) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-14 19:01:37 UTC (rev 4678) @@ -210,7 +210,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.movie.scraper</FanartHandler> + <FanartHandler>fh.movie.scraper</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>Movies.png</IconList> @@ -224,7 +224,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <FanartHandler>fh.movie.userdef</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>DVD.png</IconList> @@ -238,7 +238,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.movie.userdef</FanartHandler> + <FanartHandler>fh.movie.userdef</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>BD.png</IconList> @@ -250,8 +250,8 @@ <XmlFile>ShowTimesGUI</XmlFile> <WindowID>7111992</WindowID> <LoadParameter></LoadParameter> - <BackgroundImage>Film</BackgroundImage> - <BackgroundFolder></BackgroundFolder> + <BackgroundImage></BackgroundImage> + <BackgroundFolder>Film</BackgroundFolder> <FanartHandler></FanartHandler> <Icon></Icon> <Overlay></Overlay> @@ -325,7 +325,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <FanartHandler>fh.music.userdef</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>MusicPlaylists.png</IconList> @@ -367,7 +367,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.music.scraper</FanartHandler> + <FanartHandler>fh.music.scraper</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>Music.png</IconList> @@ -395,7 +395,7 @@ <LoadParameter></LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> - <FanartHandler>#fanarthandler.music.userdef</FanartHandler> + <FanartHandler>fh.movie.userdef</FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>LastFM.png</IconList> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-12 22:22:29 UTC (rev 4677) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-14 19:01:37 UTC (rev 4678) @@ -40,6 +40,7 @@ this.propertiesPanel = new System.Windows.Forms.Panel(); this.propertiesGroupBox = new System.Windows.Forms.GroupBox(); this.iconGroupBox = new System.Windows.Forms.GroupBox(); + this.iconPictureBox = new System.Windows.Forms.PictureBox(); this.iconComboBox = new System.Windows.Forms.ComboBox(); this.iconBrowseButton = new System.Windows.Forms.Button(); this.loadParameterTextBox = new System.Windows.Forms.TextBox(); @@ -47,6 +48,8 @@ this.skinFileShowLabel = new System.Windows.Forms.Label(); this.captionTextBox = new System.Windows.Forms.TextBox(); this.backgroundGroupBox = new System.Windows.Forms.GroupBox(); + this.fanartHandlerPictureBox = new System.Windows.Forms.PictureBox(); + this.backgroundPictureBox = new System.Windows.Forms.PictureBox(); this.fanartComboBox = new System.Windows.Forms.ComboBox(); this.multiImageComboBox = new System.Windows.Forms.ComboBox(); this.fanartRadioButton = new System.Windows.Forms.RadioButton(); @@ -79,22 +82,20 @@ this.backgroundAnimatedCheckBox = new System.Windows.Forms.CheckBox(); this.showRssCheckBox = new System.Windows.Forms.CheckBox(); this.subMenuGroupBox = new System.Windows.Forms.GroupBox(); - this.subMenuListBox = new System.Windows.Forms.ListBox(); - this.menuGroupBox = new System.Windows.Forms.GroupBox(); - this.menuListBox = new System.Windows.Forms.ListBox(); - this.backgroundImageTimer = new System.Windows.Forms.Timer(this.components); - this.iconOpenFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.subMenuRowRemoveButton = new System.Windows.Forms.Button(); this.subMenuRowDownButton = new System.Windows.Forms.Button(); this.subMenuRowUpButton = new System.Windows.Forms.Button(); + this.subMenuListBox = new System.Windows.Forms.ListBox(); + this.menuGroupBox = new System.Windows.Forms.GroupBox(); this.menuRowRemoveButton = new System.Windows.Forms.Button(); this.menuRowDownButton = new System.Windows.Forms.Button(); this.menuRowUpButton = new System.Windows.Forms.Button(); + this.menuListBox = new System.Windows.Forms.ListBox(); this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox(); - this.iconPictureBox = new System.Windows.Forms.PictureBox(); - this.fanartHandlerPictureBox = new System.Windows.Forms.PictureBox(); - this.backgroundPictureBox = new System.Windows.Forms.PictureBox(); + this.backgroundImageTimer = new System.Windows.Forms.Timer(this.components); + this.iconOpenFileDialog = new System.Windows.Forms.OpenFileDialog(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.updateNotifyTimer = new System.Windows.Forms.Timer(this.components); this.infoPictureBox = new System.Windows.Forms.PictureBox(); this.subMenuRowAddButton = new System.Windows.Forms.Button(); this.menuRowAddButton = new System.Windows.Forms.Button(); @@ -103,16 +104,18 @@ this.menuRowEditButton = new System.Windows.Forms.Button(); this.subMenuRowEditButton = new System.Windows.Forms.Button(); this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox(); + this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox(); this.arrowsPictureBox = new System.Windows.Forms.PictureBox(); - this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox(); - this.updateNotifyTimer = new System.Windows.Forms.Timer(this.components); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); this.skinTabPage.SuspendLayout(); this.propertiesPanel.SuspendLayout(); this.propertiesGroupBox.SuspendLayout(); this.iconGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).BeginInit(); this.backgroundGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fanartHandlerPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).BeginInit(); this.overlayGroupBox.SuspendLayout(); this.menuPanel.SuspendLayout(); this.creationGroupBox.SuspendLayout(); @@ -123,15 +126,12 @@ this.subMenuGroupBox.SuspendLayout(); this.menuGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fanartHandlerPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.updateNotifyMenuPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.updateNotifySubMenuPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.arrowsPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.updateNotifySubMenuPictureBox)).BeginInit(); this.SuspendLayout(); // // itemsTabControl @@ -244,10 +244,21 @@ this.iconGroupBox.Location = new System.Drawing.Point(6, 394); this.iconGroupBox.Name = "iconGroupBox"; this.iconGroupBox.Size = new System.Drawing.Size(324, 94); - this.iconGroupBox.TabIndex = 15; + this.iconGroupBox.TabIndex = 14; this.iconGroupBox.TabStop = false; this.iconGroupBox.Text = "Icon"; // + // iconPictureBox + // + this.iconPictureBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); + this.iconPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError; + this.iconPictureBox.Location = new System.Drawing.Point(21, 22); + this.iconPictureBox.Name = "iconPictureBox"; + this.iconPictureBox.Size = new System.Drawing.Size(64, 64); + this.iconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.iconPictureBox.TabIndex = 32; + this.iconPictureBox.TabStop = false; + // // iconComboBox // this.iconComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -255,7 +266,7 @@ this.iconComboBox.Location = new System.Drawing.Point(97, 44); this.iconComboBox.Name = "iconComboBox"; this.iconComboBox.Size = new System.Drawing.Size(164, 21); - this.iconComboBox.TabIndex = 17; + this.iconComboBox.TabIndex = 16; this.iconComboBox.TextChanged += new System.EventHandler(this.iconComboBox_TextChanged); // // iconBrowseButton @@ -264,7 +275,7 @@ this.iconBrowseButton.Location = new System.Drawing.Point(267, 43); this.iconBrowseButton.Name = "iconBrowseButton"; this.iconBrowseButton.Size = new System.Drawing.Size(51, 23); - this.iconBrowseButton.TabIndex = 16; + this.iconBrowseButton.TabIndex = 17; this.iconBrowseButton.Text = "Browse"; this.iconBrowseButton.UseVisualStyleBackColor = true; this.iconBrowseButton.Click += new System.EventHandler(this.iconBrowseButton_Click); @@ -277,6 +288,7 @@ this.loadParameterTextBox.Size = new System.Drawing.Size(214, 20); this.loadParameterTextBox.TabIndex = 4; this.loadParameterTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.loadParameterTextBox.TextChanged += new System.EventHandler(this.loadParameterTextBox_TextChanged); // // windowIdShowLabel // @@ -305,6 +317,7 @@ this.captionTextBox.Size = new System.Drawing.Size(158, 21); this.captionTextBox.TabIndex = 3; this.captionTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.captionTextBox.TextChanged += new System.EventHandler(this.captionTextBox_TextChanged); // // backgroundGroupBox // @@ -313,11 +326,11 @@ this.backgroundGroupBox.Controls.Add(this.fanartComboBox); this.backgroundGroupBox.Controls.Add(this.multiImageComboBox); this.backgroundGroupBox.Controls.Add(this.fanartRadioButton); - this.backgroundGroupBox.Controls.Add(this.multiImageRadioButton); - this.backgroundGroupBox.Controls.Add(this.singleImageRadioButton); this.backgroundGroupBox.Controls.Add(this.singleImageComboBox); this.backgroundGroupBox.Controls.Add(this.multiImageBrowseButton); this.backgroundGroupBox.Controls.Add(this.singleImageBrowseButton); + this.backgroundGroupBox.Controls.Add(this.singleImageRadioButton); + this.backgroundGroupBox.Controls.Add(this.multiImageRadioButton); this.backgroundGroupBox.Location = new System.Drawing.Point(6, 156); this.backgroundGroupBox.Name = "backgroundGroupBox"; this.backgroundGroupBox.Size = new System.Drawing.Size(324, 232); @@ -325,6 +338,29 @@ this.backgroundGroupBox.TabStop = false; this.backgroundGroupBox.Text = "Background image(s)"; // + // fanartHandlerPictureBox + // + this.fanartHandlerPictureBox.BackColor = System.Drawing.Color.Transparent; + this.fanartHandlerPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.fanartHandlerPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.FanartHandler; + this.fanartHandlerPictureBox.Location = new System.Drawing.Point(234, 93); + this.fanartHandlerPictureBox.Name = "fanartHandlerPictureBox"; + this.fanartHandlerPictureBox.Size = new System.Drawing.Size(48, 48); + this.fanartHandlerPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.fanartHandlerPictureBox.TabIndex = 31; + this.fanartHandlerPictureBox.TabStop = false; + this.fanartHandlerPictureBox.Visible = false; + // + // backgroundPictureBox + // + this.backgroundPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.BackgroundError; + this.backgroundPictureBox.Location = new System.Drawing.Point(42, 93); + this.backgroundPictureBox.Name = "backgroundPictureBox"; + this.backgroundPictureBox.Size = new System.Drawing.Size(240, 135); + this.backgroundPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.backgroundPictureBox.TabIndex = 14; + this.backgroundPictureBox.TabStop = false; + // // fanartComboBox // this.fanartComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -348,41 +384,42 @@ // // fanartRadioButton // - this.fanartRadioButton.AutoSize = true; + this.fanartRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); this.fanartRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fanartRadioButton.Location = new System.Drawing.Point(6, 68); + this.fanartRadioButton.Location = new System.Drawing.Point(6, 65); this.fanartRadioButton.Name = "fanartRadioButton"; - this.fanartRadioButton.Size = new System.Drawing.Size(95, 17); + this.fanartRadioButton.Size = new System.Drawing.Size(314, 23); this.fanartRadioButton.TabIndex = 12; this.fanartRadioButton.TabStop = true; this.fanartRadioButton.Text = "Fanart Handler"; - this.fanartRadioButton.UseVisualStyleBackColor = true; + this.fanartRadioButton.UseVisualStyleBackColor = false; this.fanartRadioButton.CheckedChanged += new System.EventHandler(this.fanartRadioButton_CheckedChanged); // // multiImageRadioButton // - this.multiImageRadioButton.AutoSize = true; + this.multiImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); this.multiImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.multiImageRadioButton.Location = new System.Drawing.Point(6, 44); + this.multiImageRadioButton.Location = new System.Drawing.Point(6, 41); this.multiImageRadioButton.Name = "multiImageRadioButton"; - this.multiImageRadioButton.Size = new System.Drawing.Size(79, 17); + this.multiImageRadioButton.Size = new System.Drawing.Size(314, 23); this.multiImageRadioButton.TabIndex = 9; this.multiImageRadioButton.TabStop = true; this.multiImageRadioButton.Text = "Multi Image"; - this.multiImageRadioButton.UseVisualStyleBackColor = true; + this.multiImageRadioButton.UseVisualStyleBackColor = false; this.multiImageRadioButton.CheckedChanged += new System.EventHandler(this.multiImageRadioButton_CheckedChanged); // // singleImageRadioButton // - this.singleImageRadioButton.AutoSize = true; + this.singleImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); this.singleImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.singleImageRadioButton.Location = new System.Drawing.Point(6, 20); + this.singleImageRadioButton.ForeColor = System.Drawing.SystemColors.ControlText; + this.singleImageRadioButton.Location = new System.Drawing.Point(6, 17); this.singleImageRadioButton.Name = "singleImageRadioButton"; - this.singleImageRadioButton.Size = new System.Drawing.Size(86, 17); + this.singleImageRadioButton.Size = new System.Drawing.Size(314, 23); this.singleImageRadioButton.TabIndex = 6; this.singleImageRadioButton.TabStop = true; this.singleImageRadioButton.Text = "Single Image"; - this.singleImageRadioButton.UseVisualStyleBackColor = true; + this.singleImageRadioButton.UseVisualStyleBackColor = false; this.singleImageRadioButton.CheckedChanged += new System.EventHandler(this.singleImageRadioButton_CheckedChanged); // // singleImageComboBox @@ -398,9 +435,9 @@ // multiImageBrowseButton // this.multiImageBrowseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.multiImageBrowseButton.Location = new System.Drawing.Point(268, 41); + this.multiImageBrowseButton.Location = new System.Drawing.Point(268, 42); this.multiImageBrowseButton.Name = "multiImageBrowseButton"; - this.multiImageBrowseButton.Size = new System.Drawing.Size(51, 23); + this.multiImageBrowseButton.Size = new System.Drawing.Size(51, 21); this.multiImageBrowseButton.TabIndex = 11; this.multiImageBrowseButton.Text = "Browse"; this.multiImageBrowseButton.UseVisualStyleBackColor = true; @@ -409,9 +446,9 @@ // singleImageBrowseButton // this.singleImageBrowseButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.singleImageBrowseButton.Location = new System.Drawing.Point(268, 17); + this.singleImageBrowseButton.Location = new System.Drawing.Point(268, 18); this.singleImageBrowseButton.Name = "singleImageBrowseButton"; - this.singleImageBrowseButton.Size = new System.Drawing.Size(51, 23); + this.singleImageBrowseButton.Size = new System.Drawing.Size(51, 21); this.singleImageBrowseButton.TabIndex = 8; this.singleImageBrowseButton.Text = "Browse"; this.singleImageBrowseButton.UseVisualStyleBackColor = true; @@ -424,7 +461,7 @@ this.overlayGroupBox.Location = new System.Drawing.Point(6, 494); this.overlayGroupBox.Name = "overlayGroupBox"; this.overlayGroupBox.Size = new System.Drawing.Size(324, 60); - this.overlayGroupBox.TabIndex = 14; + this.overlayGroupBox.TabIndex = 15; this.overlayGroupBox.TabStop = false; this.overlayGroupBox.Text = "Overlay"; // @@ -446,7 +483,8 @@ this.overlayComboBox.Location = new System.Drawing.Point(98, 30); this.overlayComboBox.Name = "overlayComboBox"; this.overlayComboBox.Size = new System.Drawing.Size(220, 21); - this.overlayComboBox.TabIndex = 15; + this.overlayComboBox.TabIndex = 18; + this.overlayComboBox.TextChanged += new System.EventHandler(this.overlayComboBox_TextChanged); // // labelTextBox // @@ -457,6 +495,7 @@ this.labelTextBox.Size = new System.Drawing.Size(158, 20); this.labelTextBox.TabIndex = 2; this.labelTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.labelTextBox.TextChanged += new System.EventHandler(this.labelTextBox_TextChanged); // // loadParameterLabel // @@ -601,7 +640,7 @@ this.multiImageTimeGroupBox.Size = new System.Drawing.Size(310, 66); this.multiImageTimeGroupBox.TabIndex = 5; this.multiImageTimeGroupBox.TabStop = false; - this.multiImageTimeGroupBox.Text = "Multi-Image time interval"; + this.multiImageTimeGroupBox.Text = "Multi Image time interval"; // // multiIMageTimeLabel // @@ -696,57 +735,6 @@ this.subMenuGroupBox.TabStop = false; this.subMenuGroupBox.Text = "Sub Menu"; // - // subMenuListBox - // - this.subMenuListBox.BackColor = System.Drawing.Color.White; - this.subMenuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.subMenuListBox.FormattingEnabled = true; - this.subMenuListBox.Location = new System.Drawing.Point(6, 25); - this.subMenuListBox.Name = "subMenuListBox"; - this.subMenuListBox.Size = new System.Drawing.Size(138, 134); - this.subMenuListBox.TabIndex = 22; - this.subMenuListBox.SelectedIndexChanged += new System.EventHandler(this.subMenuListBox_SelectedIndexChanged); - this.subMenuListBox.Enter += new System.EventHandler(this.subMenuListBox_Enter); - // - // menuGroupBox - // - this.menuGroupBox.Controls.Add(this.menuRowRemoveButton); - this.menuGroupBox.Controls.Add(this.menuRowDownButton); - this.menuGroupBox.Controls.Add(this.menuRowUpButton); - this.menuGroupBox.Controls.Add(this.menuListBox); - this.menuGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.menuGroupBox.Location = new System.Drawing.Point(3, 3); - this.menuGroupBox.Name = "menuGroupBox"; - this.menuGroupBox.Size = new System.Drawing.Size(150, 221); - this.menuGroupBox.TabIndex = 21; - this.menuGroupBox.TabStop = false; - this.menuGroupBox.Text = "Menu"; - // - // menuListBox - // - this.menuListBox.BackColor = System.Drawing.Color.White; - this.menuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.menuListBox.FormattingEnabled = true; - this.menuListBox.Location = new System.Drawing.Point(6, 25); - this.menuListBox.Name = "menuListBox"; - this.menuListBox.Size = new System.Drawing.Size(138, 134); - this.menuListBox.TabIndex = 18; - this.menuListBox.SelectedIndexChanged += new System.EventHandler(this.menuListBox_SelectedIndexChanged); - this.menuListBox.Enter += new System.EventHandler(this.menuListBox_Enter); - // - // backgroundImageTimer - // - this.backgroundImageTimer.Interval = 2500; - this.backgroundImageTimer.Tick += new System.EventHandler(this.backgroundImageTimer_Tick); - // - // iconOpenFileDialog - // - this.iconOpenFileDialog.Filter = "Image Files |*.png;*.jpg;*.bmp;*.gif"; - // - // toolTip - // - this.toolTip.ShowAlways = true; - // // subMenuRowRemoveButton // this.subMenuRowRemoveButton.AutoSize = true; @@ -783,6 +771,32 @@ this.subMenuRowUpButton.UseVisualStyleBackColor = true; this.subMenuRowUpButton.Click += new System.EventHandler(this.subMenuRowUpButton_Click); // + // subMenuListBox + // + this.subMenuListBox.BackColor = System.Drawing.Color.White; + this.subMenuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.subMenuListBox.FormattingEnabled = true; + this.subMenuListBox.Location = new System.Drawing.Point(6, 25); + this.subMenuListBox.Name = "subMenuListBox"; + this.subMenuListBox.Size = new System.Drawing.Size(138, 134); + this.subMenuListBox.TabIndex = 22; + this.subMenuListBox.SelectedIndexChanged += new System.EventHandler(this.subMenuListBox_SelectedIndexChanged); + this.subMenuListBox.Enter += new System.EventHandler(this.subMenuListBox_Enter); + // + // menuGroupBox + // + this.menuGroupBox.Controls.Add(this.menuRowRemoveButton); + this.menuGroupBox.Controls.Add(this.menuRowDownButton); + this.menuGroupBox.Controls.Add(this.menuRowUpButton); + this.menuGroupBox.Controls.Add(this.menuListBox); + this.menuGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.menuGroupBox.Location = new System.Drawing.Point(3, 3); + this.menuGroupBox.Name = "menuGroupBox"; + this.menuGroupBox.Size = new System.Drawing.Size(150, 221); + this.menuGroupBox.TabIndex = 21; + this.menuGroupBox.TabStop = false; + this.menuGroupBox.Text = "Menu"; + // // menuRowRemoveButton // this.menuRowRemoveButton.AutoSize = true; @@ -819,6 +833,18 @@ this.menuRowUpButton.UseVisualStyleBackColor = true; this.menuRowUpButton.Click += new System.EventHandler(this.menuRowUpButton_Click); // + // menuListBox + // + this.menuListBox.BackColor = System.Drawing.Color.White; + this.menuListBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.menuListBox.FormattingEnabled = true; + this.menuListBox.Location = new System.Drawing.Point(6, 25); + this.menuListBox.Name = "menuListBox"; + this.menuListBox.Size = new System.Drawing.Size(138, 134); + this.menuListBox.TabIndex = 18; + this.menuListBox.SelectedIndexChanged += new System.EventHandler(this.menuListBox_SelectedIndexChanged); + this.menuListBox.Enter += new System.EventHandler(this.menuListBox_Enter); + // // subMenuArrowPictureBox // this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight; @@ -829,40 +855,24 @@ this.subMenuArrowPictureBox.TabIndex = 26; this.subMenuArrowPictureBox.TabStop = false; // - // iconPictureBox + // backgroundImageTimer // - this.iconPictureBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); - this.iconPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconError; - this.iconPictureBox.Location = new System.Drawing.Point(21, 22); - this.iconPictureBox.Name = "iconPictureBox"; - this.iconPictureBox.Size = new System.Drawing.Size(64, 64); - this.iconPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.iconPictureBox.TabIndex = 32; - this.iconPictureBox.TabStop = false; + this.backgroundImageTimer.Interval = 2500; + this.backgroundImageTimer.Tick += new System.EventHandler(this.backgroundImageTimer_Tick); // - // fanartHandlerPictureBox + // iconOpenFileDialog // - this.fanartHandlerPictureBox.BackColor = System.Drawing.Color.Transparent; - this.fanartHandlerPictureBox.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.fanartHandlerPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.FanartHandler; - this.fanartHandlerPictureBox.Location = new System.Drawing.Point(234, 93); - this.fanartHandlerPictureBox.Name = "fanartHandlerPictureBox"; - this.fanartHandlerPictureBox.Size = new System.Drawing.Size(48, 48); - this.fanartHandlerPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.fanartHandlerPictureBox.TabIndex = 31; - this.fanartHandlerPictureBox.TabStop = false; - this.fanartHandlerPictureBox.Visible = false; + this.iconOpenFileDialog.Filter = "Image Files |*.png;*.jpg;*.bmp;*.gif"; // - // backgroundPictureBox + // toolTip // - this.backgroundPictureBox.ErrorImage = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.BackgroundError; - this.backgroundPictureBox.Location = new System.Drawing.Point(42, 93); - this.backgroundPictureBox.Name = "backgroundPictureBox"; - this.backgroundPictureBox.Size = new System.Drawing.Size(240, 135); - this.backgroundPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.backgroundPictureBox.TabIndex = 14; - this.backgroundPictureBox.TabStop = false; + this.toolTip.ShowAlways = true; // + // updateNotifyTimer + // + this.updateNotifyTimer.Interval = 1250; + this.updateNotifyTimer.Tick += new System.EventHandler(this.updateNotifyTimer_Tick); + // // infoPictureBox // this.infoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("infoPictureBox.Image"))); @@ -932,6 +942,7 @@ this.menuRowEditButton.Size = new System.Drawing.Size(38, 38); this.menuRowEditButton.TabIndex = 18; this.menuRowEditButton.UseVisualStyleBackColor = true; + this.menuRowEditButton.VisibleChanged += new System.EventHandler(this.menuRowEditButton_VisibleChanged); this.menuRowEditButton.Click += new System.EventHandler(this.menuRowEditButton_Click); // // subMenuRowEditButton @@ -944,6 +955,7 @@ this.subMenuRowEditButton.Size = new System.Drawing.Size(38, 38); this.subMenuRowEditButton.TabIndex = 19; this.subMenuRowEditButton.UseVisualStyleBackColor = true; + this.subMenuRowEditButton.VisibleChanged += new System.EventHandler(this.subMenuRowEditButton_VisibleChanged); this.subMenuRowEditButton.Click += new System.EventHandler(this.subMenuRowEditButton_Click); // // updateNotifyMenuPictureBox @@ -957,17 +969,6 @@ this.updateNotifyMenuPictureBox.TabStop = false; this.updateNotifyMenuPictureBox.Visible = false; // - // arrowsPictureBox - // - this.arrowsPictureBox.ErrorImage = null; - this.arrowsPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("arrowsPictureBox.Image"))); - this.arrowsPictureBox.Location = new System.Drawing.Point(592, 9); - this.arrowsPictureBox.Name = "arrowsPictureBox"; - this.arrowsPictureBox.Size = new System.Drawing.Size(358, 90); - this.arrowsPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.arrowsPictureBox.TabIndex = 26; - this.arrowsPictureBox.TabStop = false; - // // updateNotifySubMenuPictureBox // this.updateNotifySubMenuPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.UpdateNotify; @@ -979,10 +980,16 @@ this.updateNotifySubMenuPictureBox.TabStop = false; this.updateNotifySubMenuPictureBox.Visible = false; // - // updateNotifyTimer + // arrowsPictureBox // - this.updateNotifyTimer.Interval = 1500; - this.updateNotifyTimer.Tick += new System.EventHandler(this.updateNotifyTimer_Tick); + this.arrowsPictureBox.ErrorImage = null; + this.arrowsPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("arrowsPictureBox.Image"))); + this.arrowsPictureBox.Location = new System.Drawing.Point(592, 9); + this.arrowsPictureBox.Name = "arrowsPictureBox"; + this.arrowsPictureBox.Size = new System.Drawing.Size(358, 90); + this.arrowsPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.arrowsPictureBox.TabIndex = 26; + this.arrowsPictureBox.TabStop = false; // // BHEditorForm // @@ -1019,8 +1026,11 @@ this.propertiesGroupBox.ResumeLayout(false); this.propertiesGroupBox.PerformLayout(); this.iconGroupBox.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).EndInit(); this.backgroundGroupBox.ResumeLayout(false); this.backgroundGroupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fanartHandlerPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).EndInit(); this.overlayGroupBox.ResumeLayout(false); this.overlayGroupBox.PerformLayout(); this.menuPanel.ResumeLayout(false); @@ -1037,15 +1047,12 @@ this.menuGroupBox.ResumeLayout(false); this.menuGroupBox.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.iconPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fanartHandlerPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.backgroundPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.updateNotifyMenuPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.updateNotifySubMenuPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.arrowsPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.updateNotifySubMenuPictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-12 22:22:29 UTC (rev 4677) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-14 19:01:37 UTC (rev 4678) @@ -23,9 +23,10 @@ private MediaPortal myMediaPortal; //Istanza classe Mediaportal (dati relativi all'installazione ed alla skin) private MenuItems myMenu; //Istanza classe MenuItems (dati relativi al menu per BasicHome) private bool unsavedChanges; //Presenza modifiche da salvare + private bool showingProperties; //Visualizzazione proprietà elemento in corso + private bool movingItem; //Spostamento elemento di menu o sotto-menu in corso private bool falseRemMenuItem; //Rimozione virtuale elemento di menu (usata per editazione e spostamento) private bool falseAddMenuItem; //Aggiunta virtuale elemento di menu (usata per editazione) - private bool showingProperties; //Visualizzazione proprietà elemento in corso private string[] bgImages = new string[50]; //Array immagini di background da visualizzare (multi-immagine) private int bgImageIndex = 0; //Indice immagine di background visualizzata (multi-immagine) #endregion @@ -128,6 +129,10 @@ subMenuRowAddButton.Visible = true; menuRowEditButton.Visible = false; subMenuRowEditButton.Visible = false; + skinFilesListBox.BackColor = Color.Aquamarine; + skinLinksTreeView.BackColor = Color.FromArgb(213,220,227); + menuListBox.BackColor = Color.White; + subMenuListBox.BackColor = Color.White; break; case "skinLinksTreeView": //Lista links predefiniti della skin @@ -171,6 +176,10 @@ subMenuRowAddButton.Visible = true; menuRowEditButton.Visible = false; subMenuRowEditButton.Visible = false; + skinLinksTreeView.BackColor = Color.Aquamarine; + skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227); + menuListBox.BackColor = Color.White; + subMenuListBox.BackColor = Color.White; break; case "menuListBox": //Lista elementi di menu @@ -214,6 +223,10 @@ subMenuRowAddButton.Visible = true; menuRowEditButton.Visible = true; subMenuRowEditButton.Visible = false; + menuListBox.BackColor = Color.Aquamarine; + subMenuListBox.BackColor = Color.White; + skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227); + skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227); break; case "subMenuListBox": //Lista elementi di sotto-menu @@ -241,6 +254,10 @@ subMenuRowAddButton.Visible = false; menuRowEditButton.Visible = false; subMenuRowEditButton.Visible = true; + subMenuListBox.BackColor = Color.Aquamarine; + menuListBox.BackColor = Color.White; + skinLinksTreeView.BackColor = Color.FromArgb(213, 220, 227); + skinFilesListBox.BackColor = Color.FromArgb(213, 220, 227); break; } @@ -250,11 +267,14 @@ } private void RefreshImageRadioButton() //Aggiornamento abilitazione controlli legati ai pulsanti opzione per l'immagine di background { - singleImageComboBox.Enabled = singleImageRadioButton.Checked; - singleImageBrowseButton.Enabled = singleImageRadioButton.Checked; - multiImageComboBox.Enabled = multiImageRadioButton.Checked; - multiImageBrowseButton.Enabled = multiImageRadioButton.Checked; - fanartComboBox.Enabled = fanartRadioButton.Checked; + singleImageComboBox.Enabled = singleImageRadioButton.Checked; + singleImageBrowseButton.Enabled = singleImageRadioButton.Checked; + multiImageComboBox.Enabled = multiImageRadioButton.Checked; + multiImageBrowseButton.Enabled = multiImageRadioButton.Checked; + fanartComboBox.Enabled = fanartRadioButton.Checked; + singleImageRadioButton.BackColor = (singleImageRadioButton.Checked ? Color.LightGoldenrodYellow : Color.FromArgb(213, 220, 227)); + multiImageRadioButton.BackColor = (multiImageRadioButton.Checked ? Color.LightGoldenrodYellow : Color.FromArgb(213, 220, 227)); + fanartRadioButton.BackColor = (fanartRadioButton.Checked ? Color.LightGoldenrodYellow : Color.FromArgb(213, 220, 227)); } private void ShowBackgroundImage() //Visualizzazione immagine(i) di sfondo selezionata per l'elemento { @@ -325,6 +345,7 @@ } private void MoveMenuItemList(bool dirUp) //Spostamento elemento di menu { + movingItem = true; int index = menuListBox.SelectedIndex; MenuItem mItem = myMenu.Items[index]; falseRemMenuItem = true; @@ -336,10 +357,12 @@ index++; myMenu.Items.Insert(index, mItem); menuListBox.SelectedIndex = index; + movingItem = false; } private void MoveSubMenuItemList(bool dirUp) //Spostamento elemento di sotto-menu { - unsavedChanges = true; + unsavedChanges = true; + movingItem = true; int index = subMenuListBox.SelectedIndex; SubMenuItem smItem = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[index]; myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.RemoveAt(index); @@ -349,6 +372,7 @@ index++; myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Insert(index, smItem); subMenuListBox.SelectedIndex = index; + movingItem = false; } private void ModifyMenuListButtonsEnable() //Abilitazione/disabilitazione pulsanti di modifica menu { @@ -401,9 +425,13 @@ mItem.SubMenuItems = myMenu.Items[index].SubMenuItems; falseRemMenuItem = true; myMenu.Items.RemoveAt(index); + falseRemMenuItem = false; + falseAddMenuItem = true; myMenu.Items.Insert(index, mItem); falseAddMenuItem = false; menuListBox.SelectedIndex = index; + updateNotifyTimer.Enabled = false; + updateNotifyMenuPictureBox.Visible = false; } else //Caso di aggiunta elemento { @@ -441,6 +469,8 @@ myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.RemoveAt(index); myMenu.Items[menuListBox.SelectedIndex].SubMenuItems.Insert(index, smItem); subMenuListBox.SelectedIndex = index; + updateNotifyTimer.Enabled = false; + updateNotifySubMenuPictureBox.Visible = false; } else //Caso di aggiunta elemento { @@ -464,10 +494,6 @@ //Se elemento non trovato, viene selezionato il primo defaultMenuItemComboBox.SelectedIndex = (defaultItemIndex < 0) ? 0 : defaultItemIndex; } - private void UpdateNotify() - { - - } private void SaveMenu() //Salvataggio impostazioni e creazione menu { myMenu.GeneralDefaultItemIndex = defaultMenuItemComboBox.SelectedIndex; @@ -574,6 +600,8 @@ return; RefreshImageRadioButton(); ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void multiImageRadioButton_CheckedChanged(object sender, EventArgs e) { @@ -581,6 +609,8 @@ return; RefreshImageRadioButton(); ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void fanartRadioButton_CheckedChanged(object sender, EventArgs e) { @@ -588,6 +618,8 @@ return; RefreshImageRadioButton(); ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void singleImageBrowseButton_Click(object sender, EventArgs e) { @@ -635,18 +667,24 @@ if (showingProperties) return; ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void multiImageComboBox_TextChanged(object sender, EventArgs e) { if (showingProperties) return; ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void fanartComboBox_TextChanged(object sender, EventArgs e) { if (showingProperties) return; ShowBackgroundImage(); + if (menuRowEditButton.Visible || subMenuRowEditButton.Visible) + updateNotifyTimer.Enabled = true; } private void backgroundImageTimer_Tick(object sender, EventArgs e) { @@ -676,14 +714,44 @@ } else iconPictureBox.Image = ProcessPlugins.XtremeMenuEditor.Properties.Resources.IconEmpty; + + if (!showingProperties && (menuRowEditButton.Visible || subMenuRowEditButton.Visible)) + updateNotifyTimer.Enabled = true; } #endregion + #region Eventi Modifica Altre Proprietà Elemento + private void labelTextBox_TextChanged(object sender, EventArgs e) + { + if (!showingProperties && (menuRowEditButton.Visible || subMenuRowEditButton.Visible)) + updateNotifyTimer.Enabled = true; + } + private void captionTextBox_TextChanged(object sender, EventArgs e) + { + if (!showingProperties && (menuRowEditButton.Visible || subMenuRowEditButton.Visible)) + updateNotifyTimer.Enabled = true; + } + private void loadParameterTextBox_TextChanged(object sender, EventArgs e) + { + if (!showingProperties && (menuRowEditButton.Visible || subMenuRowEditButton.Visible)) + updateNotifyTimer.Enabled = true; + } + private void overlayComboBox_TextChanged(object sender, EventArgs e) + { + if (!showingProperties && (menuRowEditButton.Visible || subMenuRowEditButton.Visible)) + updateNotifyTimer.Enabled = true; + } + #endregion #region Eventi Liste Menu & Sotto-Menu private void menuListBox_SelectedIndexChanged(object sender, EventArgs e) { subMenuArrowPictureBox.Top = 22 + ((menuListBox.SelectedIndex >= 0) ? menuListBox.SelectedIndex : 0) * menuListBox.ItemHeight; ModifyMenuListButtonsEnable(); ShowItemProperties(sender); + if (!movingItem) + { + updateNotifyTimer.Enabled = false; + updateNotifyMenuPictureBox.Visible = false; + } } private void menuListBox_Enter(object sender, EventArgs e) { @@ -693,13 +761,45 @@ { ModifyMenuListButtonsEnable(); ShowItemProperties(sender); + if (!movingItem) + { + updateNotifyTimer.Enabled = false; + updateNotifySubMenuPictureBox.Visible = false; + } } private void subMenuListBox_Enter(object sender, EventArgs e) { ShowItemProperties(sender); } #endregion - #region Eventi Modifica Menu + #region Eventi Modifica Impostazioni Generali Menu + private void defaultMenuItemComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + private void showRssCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + private void backgroundAnimatedCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e) + { + unsavedChanges = true; + multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString(); + } + private void clearCacheCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + private void createBackupCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + #endregion + #region Eventi Modifica Lista Elementi Menu private void menuRowRemoveButton_Click(object sender, EventArgs e) { int index = menuListBox.SelectedIndex; @@ -708,6 +808,8 @@ menuListBox.SelectedIndex = ((index < myMenu.Items.Count) ? index : index-1); ShowItemProperties(menuListBox); ModifyMenuListButtonsEnable(); + updateNotifyTimer.Enabled = false; + updateNotifyMenuPictureBox.Visible = false; } private void menuRowAddButton_Click(object sender, EventArgs e) { @@ -731,33 +833,8 @@ if (!falseRemMenuItem && myMenu.Items.Count > 0) DefaultMenuItemRefresh(); } - private void defaultMenuItemComboBox_SelectedIndexChanged(object sender, EventArgs e) - { - unsavedChanges = true; - } - private void showRssCheckBox_CheckedChanged(object sender, EventArgs e) - { - unsavedChanges = true; - } - private void backgroundAnimatedCheckBox_CheckedChanged(object sender, EventArgs e) - { - unsavedChanges = true; - } - private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e) - { - unsavedChanges = true; - multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString(); - } - private void clearCacheCheckBox_CheckedChanged(object sender, EventArgs e) - { - unsavedChanges = true; - } - private void createBackupCheckBox_CheckedChanged(object sender, EventArgs e) - { - unsavedChanges = true; - } #endregion - #region Eventi Modifica Sotto-Menu + #region Eventi Modifica Lista Elementi Sotto-Menu private void subMenuRowRemoveButton_Click(object sender, EventArgs e) { unsavedChanges = true; @@ -772,6 +849,8 @@ subMenuRowAddButton.Visible = true; subMenuRowEditButton.Visible = false; } + updateNotifyTimer.Enabled = false; + updateNotifySubMenuPictureBox.Visible = false; } private void subMenuRowAddButton_Click(object sender, EventArgs e) { @@ -790,6 +869,32 @@ MoveSubMenuItemList(false); } #endregion + #region Eventi Notifica Elemento Non Aggiornato + private void updateNotifyTimer_Tick(object sender, EventArgs e) + { + if (menuRowEditButton.Visible) + updateNotifyMenuPictureBox.Visible = !updateNotifyMenuPictureBox.Visible; + else + if (subMenuRowEditButton.Visible) + updateNotifySubMenuPictureBox.Visible = !updateNotifySubMenuPictureBox.Visible; + } + private void menuRowEditButton_VisibleChanged(object sender, EventArgs e) + { + if (!menuRowEditButton.Visible) + { + updateNotifyTimer.Enabled = false; + updateNotifyMenuPictureBox.Visible = false; + } + } + private void subMenuRowEditButton_VisibleChanged(object sender, EventArgs e) + { + if (!subMenuRowEditButton.Visible) + { + updateNotifyTimer.Enabled = false; + updateNotifySubMenuPictureBox.Visible = false; + } + } + #endregion private void saveButton_Click(object sender, EventArgs e) { SaveMenu(); @@ -842,14 +947,5 @@ return false; } #endregion - - private void updateNotifyTimer_Tick(object sender, EventArgs e) - { - if (menuRowEditButton.Visible) - updateNotifyMenuPictureBox.Visible = !updateNotifyMenuPictureBox.Visible; - else - if (subMenuRowEditButton.Visible) - updateNotifySubMenuPictureBox.Visible = !updateNotifySubMenuPictureBox.Visible; - } } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-12 22:22:29 UTC (rev 4677) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-14 19:01:37 UTC (rev 4678) @@ -156,51 +156,9 @@ <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="propertiesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="iconGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="loadParameterTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileShowLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="captionTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="backgroundGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="overlayGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="windowIdLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="skinFileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="captionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>T... [truncated message content] |
From: <nic...@us...> - 2013-11-18 18:51:15
|
Revision: 4680 http://sourceforge.net/p/mp-plugins/code/4680 Author: nicsergio Date: 2013-11-18 18:51:11 +0000 (Mon, 18 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.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/ShortCuter.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-18 18:51:11 UTC (rev 4680) @@ -47,6 +47,12 @@ <Compile Include="Skin.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Tools.cs" /> + <Compile Include="VersionInfo.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="VersionInfo.designer.cs"> + <DependentUpon>VersionInfo.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <Content Include="Resources\Images\ArrowDown.png" /> @@ -54,6 +60,7 @@ <Content Include="Resources\Images\ArrowRight.png" /> <Content Include="Resources\Images\ArrowUp.png" /> <Content Include="Resources\Images\Info.png" /> + <Content Include="Resources\Images\Ok.png" /> <Content Include="Resources\Images\RowAdd.png" /> <Content Include="Resources\Images\RowDown.png" /> <Content Include="Resources\Images\RowEdit.png" /> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Info.png =================================================================== (Binary files differ) Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png 2013-11-18 18:51:11 UTC (rev 4680) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Ok.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -1,6 +1,9 @@ -using System.Reflection; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Reflection; using System.Windows.Forms; + namespace My.Common { internal static class Tools //Collezione utilità @@ -30,6 +33,16 @@ DialogResult ret = MessageBox.Show(question, MessageHeader, MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2); return (ret == DialogResult.OK); } + public static void RoundEdges(Control winControl, int wRadius, int hRadius) //Arrotondamento spigoli controllo grafico + { + Rectangle r = new Rectangle(-1, -1, winControl.Width + 1, winControl.Height + 1); + GraphicsPath gp = new GraphicsPath(); + gp.AddArc(r.X, r.Y, wRadius, hRadius, 180, 90); + gp.AddArc(r.X + r.Width - wRadius, r.Y, wRadius, hRadius, 270, 90); + gp.AddArc(r.X + r.Width - wRadius, r.Y + r.Height - hRadius, wRadius, hRadius, 0, 90); + gp.AddArc(r.X, r.Y + r.Height - hRadius, wRadius, hRadius, 90, 90); + winControl.Region = new Region(gp); + } #endregion } } Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -0,0 +1,105 @@ +namespace My.Common +{ + partial class VersionInfo + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.exitPictureBox = new System.Windows.Forms.PictureBox(); + this.infoPictureBox = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.exitPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.BackColor = System.Drawing.Color.Transparent; + this.groupBox1.Location = new System.Drawing.Point(200, 50); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(475, 214); + this.groupBox1.TabIndex = 1; + this.groupBox1.TabStop = false; + // + // exitPictureBox + // + this.exitPictureBox.BackColor = System.Drawing.Color.Transparent; + this.exitPictureBox.Location = new System.Drawing.Point(643, 3); + this.exitPictureBox.Name = "exitPictureBox"; + this.exitPictureBox.Size = new System.Drawing.Size(32, 32); + this.exitPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.exitPictureBox.TabIndex = 4; + this.exitPictureBox.TabStop = false; + this.exitPictureBox.Click += new System.EventHandler(this.exitPictureBox_Click); + // + // infoPictureBox + // + this.infoPictureBox.BackColor = System.Drawing.Color.Transparent; + this.infoPictureBox.Location = new System.Drawing.Point(25, 65); + this.infoPictureBox.Name = "infoPictureBox"; + this.infoPictureBox.Size = new System.Drawing.Size(128, 128); + this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.infoPictureBox.TabIndex = 3; + this.infoPictureBox.TabStop = false; + this.infoPictureBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); + this.infoPictureBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); + this.infoPictureBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); + // + // VersionInfo + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(700, 300); + this.Controls.Add(this.exitPictureBox); + this.Controls.Add(this.infoPictureBox); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "VersionInfo"; + this.Opacity = 0.85D; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Load += new System.EventHandler(this.VersionInfo_Load); + this.Paint += new System.Windows.Forms.PaintEventHandler(this.VersionInfo_Paint); + this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); + this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); + this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); + ((System.ComponentModel.ISupportInitialize)(this.exitPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.PictureBox infoPictureBox; + private System.Windows.Forms.PictureBox exitPictureBox; + } +} \ No newline at end of file Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -0,0 +1,147 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Text; +using System.Windows.Forms; +using System.Reflection; + +namespace My.Common +{ + public partial class VersionInfo : Form + { + static VersionInfo myVersionInfo; + const double opNorm = 0.95; + const double opMove = 0.6; + + //Selezione e mouse + private bool mouseSel = false; + private int eXSel = 0; + private int eYSel = 0; + + public static void ShowInfo(Image imgInfo, Image imgExit, string comment) + { + myVersionInfo = new VersionInfo(); + myVersionInfo.infoPictureBox.Image = imgInfo; + myVersionInfo.exitPictureBox.Image = imgExit; + myVersionInfo.Opacity = opNorm; + + Assembly myAssembly = Assembly.GetExecutingAssembly(); + string name = myAssembly.GetName().Name.ToString(); + string fileName = System.IO.Path.GetFileName(myAssembly.Location); + string title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; + string description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; + string author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; + string buildDate = RetrieveLinkerTimestamp(); + Tools.InfoMessage(name + "\n" + + fileName + "\n" + + title + "\n" + + description + "\n" + + author + "\n" + + buildDate); + + + /* //Tools.InfoMessage(myAssembly.FullName + " V" + + myAssembly.GetName().Version.ToString() + "\n\n" + + ">>> " + description + " <<<" + "\n\n\n\n" + + "...a big thank to Marduk65 for this skin!"); + + + //Tools.InfoMessage(title + " V" + myAssembly.GetName().Version.ToString() + "\n\n" + + ">>> " + description + " <<<" + "\n\n\n\n" + + "...a big thank to MoPath & Chemelli for this plugin!"); + +*/ + + myVersionInfo.ShowDialog(); + + } + + + private static string RetrieveLinkerTimestamp() + { + string filePath = Assembly.GetExecutingAssembly().Location; + const int c_PeHeaderOffset = 60; + const int c_LinkerTimestampOffset = 8; + byte[] b = new byte[2048]; + System.IO.Stream s = null; + + try + { + s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read); + s.Read(b, 0, 2048); + } + finally + { + if (s != null) + s.Close(); + } + + int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset); + int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset); + DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0); + dt = dt.AddSeconds(secondsSince1970); + dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours); + return dt.ToString(); + } + + + + + public VersionInfo() + { + InitializeComponent(); + Tools.RoundEdges(this,110,50); + } + + + private void VersionInfo_Paint(object sender, PaintEventArgs e) + { + Graphics mGraphics = e.Graphics; + Rectangle mArea = new Rectangle(0, 0, this.Width, this.Height); + LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.FromArgb(245, 251, 251), LinearGradientMode.ForwardDiagonal); + mGraphics.FillRectangle(mLGB, mArea); + + + Rectangle r = new Rectangle(-1, -1, this.Width + 1, 36); + mLGB = new LinearGradientBrush(r, Color.Navy, Color.MediumTurquoise, LinearGradientMode.ForwardDiagonal); + GraphicsPath gp = new GraphicsPath(); + gp.AddLine(r.X, r.Y, r.X + r.Width, r.Y); + gp.AddArc(r.X + r.Width - 40, r.Y + r.Height - 20, 40, 20, 0, 90); + gp.AddArc(r.X, r.Y + r.Height - 20, 40, 20, 90, 90); + mGraphics.FillPath(mLGB, gp); + } + + + private void VersionInfo_MouseDown(object sender, MouseEventArgs e) + { + mouseSel = true; + eXSel = e.X; + eYSel = e.Y; + this.Opacity = opMove; + } + private void VersionInfo_MouseMove(object sender, MouseEventArgs e) + { + if (mouseSel) + { + this.Left -= (eXSel - e.X); + this.Top -= (eYSel - e.Y); + } + } + private void VersionInfo_MouseUp(object sender, MouseEventArgs e) + { + mouseSel = false; + this.Opacity = opNorm; + } + private void exitPictureBox_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void VersionInfo_Load(object sender, EventArgs e) + { + } + } +} Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -83,6 +83,16 @@ /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap Ok { + get { + object obj = ResourceManager.GetObject("Ok", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap RowAdd { get { object obj = ResourceManager.GetObject("RowAdd", resourceCulture); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-11-18 18:51:11 UTC (rev 4680) @@ -117,13 +117,17 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <data name="ArrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\arrowdown.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\info.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="Ok" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\..\common\resources\images\ok.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="RowAdd" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\rowadd.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -66,7 +66,12 @@ Utils.PlaySound(sc.SoundEffect, false, true); //--> eventuale effetto sonoro if (sc.LoadParameter.Length > 0) //Richiamo schermata con parametri di caricamento + { + string sm = GUIPropertyManager.GetProperty("#MovingPictures.SelectedMovie.title"); + MpLog(false, "SSSM:" + sm, null); + GUIWindowManager.ActivateWindow(sc.WindowID, sc.LoadParameter, true); + } else //Richiamo schermata senza parametri di caricamento { GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, sc.WindowID, 0, null); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-18 18:51:11 UTC (rev 4680) @@ -145,9 +145,15 @@ <Content Include="..\Common\Resources\Images\ArrowDown.png"> <Link>Resources\Images\ArrowDown.png</Link> </Content> + <Content Include="..\Common\Resources\Images\Exit.png"> + <Link>Resources\Images\Exit.png</Link> + </Content> <Content Include="..\Common\Resources\Images\Info.png"> <Link>Resources\Images\Info.png</Link> </Content> + <Content Include="..\Common\Resources\Images\Ok.png"> + <Link>Resources\Images\Ok.png</Link> + </Content> <Content Include="..\Common\Resources\Images\RowAdd.png"> <Link>Resources\Images\RowAdd.png</Link> </Content> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -38,6 +38,7 @@ skinLinksTreeView.CollapseAll(); toolTip.SetToolTip(skinLinksTreeView, "Double Click to Set the Link's Parameter to ShortCut"); FormatShortCutsGrid(); + toolTip.SetToolTip(infoPictureBox, "Version information"); } private void FormatShortCutsGrid() //Formattazione (e popolazione) tabella shortcuts { Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -53,11 +53,11 @@ this.fanartComboBox = new System.Windows.Forms.ComboBox(); this.multiImageComboBox = new System.Windows.Forms.ComboBox(); this.fanartRadioButton = new System.Windows.Forms.RadioButton(); - this.multiImageRadioButton = new System.Windows.Forms.RadioButton(); - this.singleImageRadioButton = new System.Windows.Forms.RadioButton(); this.singleImageComboBox = new System.Windows.Forms.ComboBox(); this.multiImageBrowseButton = new System.Windows.Forms.Button(); this.singleImageBrowseButton = new System.Windows.Forms.Button(); + this.singleImageRadioButton = new System.Windows.Forms.RadioButton(); + this.multiImageRadioButton = new System.Windows.Forms.RadioButton(); this.overlayGroupBox = new System.Windows.Forms.GroupBox(); this.overlayLabel = new System.Windows.Forms.Label(); this.overlayComboBox = new System.Windows.Forms.ComboBox(); @@ -395,33 +395,6 @@ this.fanartRadioButton.UseVisualStyleBackColor = false; this.fanartRadioButton.CheckedChanged += new System.EventHandler(this.fanartRadioButton_CheckedChanged); // - // multiImageRadioButton - // - this.multiImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); - this.multiImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.multiImageRadioButton.Location = new System.Drawing.Point(6, 41); - this.multiImageRadioButton.Name = "multiImageRadioButton"; - this.multiImageRadioButton.Size = new System.Drawing.Size(314, 23); - this.multiImageRadioButton.TabIndex = 9; - this.multiImageRadioButton.TabStop = true; - this.multiImageRadioButton.Text = "Multi Image"; - this.multiImageRadioButton.UseVisualStyleBackColor = false; - this.multiImageRadioButton.CheckedChanged += new System.EventHandler(this.multiImageRadioButton_CheckedChanged); - // - // singleImageRadioButton - // - this.singleImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); - this.singleImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.singleImageRadioButton.ForeColor = System.Drawing.SystemColors.ControlText; - this.singleImageRadioButton.Location = new System.Drawing.Point(6, 17); - this.singleImageRadioButton.Name = "singleImageRadioButton"; - this.singleImageRadioButton.Size = new System.Drawing.Size(314, 23); - this.singleImageRadioButton.TabIndex = 6; - this.singleImageRadioButton.TabStop = true; - this.singleImageRadioButton.Text = "Single Image"; - this.singleImageRadioButton.UseVisualStyleBackColor = false; - this.singleImageRadioButton.CheckedChanged += new System.EventHandler(this.singleImageRadioButton_CheckedChanged); - // // singleImageComboBox // this.singleImageComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -454,6 +427,33 @@ this.singleImageBrowseButton.UseVisualStyleBackColor = true; this.singleImageBrowseButton.Click += new System.EventHandler(this.singleImageBrowseButton_Click); // + // singleImageRadioButton + // + this.singleImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); + this.singleImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.singleImageRadioButton.ForeColor = System.Drawing.SystemColors.ControlText; + this.singleImageRadioButton.Location = new System.Drawing.Point(6, 17); + this.singleImageRadioButton.Name = "singleImageRadioButton"; + this.singleImageRadioButton.Size = new System.Drawing.Size(314, 23); + this.singleImageRadioButton.TabIndex = 6; + this.singleImageRadioButton.TabStop = true; + this.singleImageRadioButton.Text = "Single Image"; + this.singleImageRadioButton.UseVisualStyleBackColor = false; + this.singleImageRadioButton.CheckedChanged += new System.EventHandler(this.singleImageRadioButton_CheckedChanged); + // + // multiImageRadioButton + // + this.multiImageRadioButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(213)))), ((int)(((byte)(220)))), ((int)(((byte)(227))))); + this.multiImageRadioButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.multiImageRadioButton.Location = new System.Drawing.Point(6, 41); + this.multiImageRadioButton.Name = "multiImageRadioButton"; + this.multiImageRadioButton.Size = new System.Drawing.Size(314, 23); + this.multiImageRadioButton.TabIndex = 9; + this.multiImageRadioButton.TabStop = true; + this.multiImageRadioButton.Text = "Multi Image"; + this.multiImageRadioButton.UseVisualStyleBackColor = false; + this.multiImageRadioButton.CheckedChanged += new System.EventHandler(this.multiImageRadioButton_CheckedChanged); + // // overlayGroupBox // this.overlayGroupBox.Controls.Add(this.overlayLabel); @@ -875,7 +875,7 @@ // // infoPictureBox // - this.infoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("infoPictureBox.Image"))); + this.infoPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.Info; this.infoPictureBox.Location = new System.Drawing.Point(994, 1); this.infoPictureBox.Name = "infoPictureBox"; this.infoPictureBox.Size = new System.Drawing.Size(24, 24); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-18 18:51:11 UTC (rev 4680) @@ -69,7 +69,7 @@ fanartHandlerPictureBox.Parent = backgroundPictureBox; fanartHandlerPictureBox.Location = new Point(fanartHandlerPictureBox.Location.X - backgroundPictureBox.Location.X, fanartHandlerPictureBox.Location.Y - backgroundPictureBox.Location.Y); - RoundEdgesPictureBox(backgroundPictureBox, 45); + Tools.RoundEdges(backgroundPictureBox, 45, 45); toolTip.SetToolTip(menuRowAddButton, "Add menu item to list"); toolTip.SetToolTip(menuRowRemoveButton, "Remove selected menu item from list"); @@ -83,6 +83,7 @@ toolTip.SetToolTip(subMenuRowDownButton, "Move down sub-menu item in list"); toolTip.SetToolTip(defaultMenuItemComboBox, "Select the menu item displayed when BasicHome starts"); toolTip.SetToolTip(saveButton, "Save settings and create custom menu"); + toolTip.SetToolTip(infoPictureBox, "Version information"); } private void ShowItemProperties(object listControl) //Visualizzazione proprietà elemento di menu/sotto-menu { @@ -333,16 +334,6 @@ fanartHandlerPictureBox.Visible = false; } } - private void RoundEdgesPictureBox(PictureBox rndPictureBox, int radius) //Ottenimento PictureBox con spigoli arrotondati - { - Rectangle r = new Rectangle(-1, -1, rndPictureBox.Width + 1, rndPictureBox.Height + 1); - System.Drawing.Drawing2D.GraphicsPath gp = new System.Drawing.Drawing2D.GraphicsPath(); - gp.AddArc(r.X, r.Y, radius, radius, 180, 90); - gp.AddArc(r.X + r.Width - radius, r.Y, radius, radius, 270, 90); - gp.AddArc(r.X + r.Width - radius, r.Y + r.Height - radius, radius, radius, 0, 90); - gp.AddArc(r.X, r.Y + r.Height - radius, radius, radius, 90, 90); - rndPictureBox.Region = new Region(gp); - } private void MoveMenuItemList(bool dirUp) //Spostamento elemento di menu { movingItem = true; @@ -507,16 +498,6 @@ myMediaPortal.SelectedSkin.SkinPath)) //--> salvataggio & creazione (con eventuale cancellazione cache) unsavedChanges = false; } - private void ShowInfo() //Visualizzazione informazioni versione - { - Assembly myAssembly = Assembly.GetExecutingAssembly(); - string description = ((AssemblyDescriptionAttribute) myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; - - Tools.InfoMessage(myAssembly.GetName().Name.ToString() + " V" + - myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to Marduk65 for this skin!"); - } #endregion #region Consumazione Eventi @@ -901,7 +882,7 @@ } private void infoPictureBox_Click(object sender, EventArgs e) { - ShowInfo(); + VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor, XtremeMenuEditor.Properties.Resources.Ok, "...a big thank to Marduk65 for this skin!"); } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-14 20:14:41 UTC (rev 4679) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-18 18:51:11 UTC (rev 4680) @@ -123,27 +123,15 @@ <metadata name="linksTabPage.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="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="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="skinFilesListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="multiImageFolderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>183, 2</value> </metadata> @@ -240,57 +228,12 @@ <metadata name="labelLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="fanartHandlerPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="backgroundPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fanartComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fanartRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageRadioButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="singleImageBrowseButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="menuPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="creationGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -300,33 +243,12 @@ <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="createBackupCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="clearCacheCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="multiImageTimeGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="showRssCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageTimeGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="multiIMageTimeLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -336,24 +258,12 @@ <metadata name="multiImageTimeTrackBar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="multiIMageTimeLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageTimeSecLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="multiImageTimeTrackBar.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="defaultMenuItemGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="defaultMenuItemComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="backgroundAnimatedCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -375,18 +285,6 @@ <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="subMenuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="subMenuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -402,18 +300,6 @@ <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="menuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuRowDownButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuRowUpButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="menuListBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <metadata name="subMenuArrowPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -432,56 +318,6 @@ <metadata name="infoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="infoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - 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 - AElFTkSuQmCC -</value> - </data> <metadata name="subMenuRowAddButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -503,6 +339,7 @@ <metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="arrowsPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAAoAAAACACAYAAACbUtgKAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 @@ -641,4062 +478,1668 @@ </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> - 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 - Q9CYOIzIQ5JkFBO7lI... [truncated message content] |
From: <nic...@us...> - 2013-11-19 20:17:55
|
Revision: 4681 http://sourceforge.net/p/mp-plugins/code/4681 Author: nicsergio Date: 2013-11-19 20:17:53 +0000 (Tue, 19 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.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/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.resx trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-19 20:17:53 UTC (rev 4681) @@ -44,15 +44,20 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="Skin.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Tools.cs" /> <Compile Include="VersionInfo.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="VersionInfo.designer.cs"> + <Compile Include="VersionInfo.Designer.cs"> <DependentUpon>VersionInfo.cs</DependentUpon> </Compile> + <Compile Include="Properties\Resources.Designer.cs"> + <AutoGen>True</AutoGen> + <DesignTime>True</DesignTime> + <DependentUpon>Resources.resx</DependentUpon> + </Compile> + <Compile Include="Skin.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="Tools.cs" /> </ItemGroup> <ItemGroup> <Content Include="Resources\Images\ArrowDown.png" /> @@ -107,7 +112,15 @@ <SubType>Designer</SubType> </Content> </ItemGroup> - <ItemGroup /> + <ItemGroup> + <EmbeddedResource Include="Properties\Resources.resx"> + <Generator>ResXFileCodeGenerator</Generator> + <LastGenOutput>Resources.Designer.cs</LastGenOutput> + </EmbeddedResource> + <EmbeddedResource Include="VersionInfo.resx"> + <DependentUpon>VersionInfo.cs</DependentUpon> + </EmbeddedResource> + </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. Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.Designer.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.Designer.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// <auto-generated> +// Il codice è stato generato da uno strumento. +// 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. +// </auto-generated> +//------------------------------------------------------------------------------ + +namespace My.Common.Properties { + using System; + + + /// <summary> + /// Classe di risorse fortemente tipizzata per la ricerca di stringhe localizzate e così via. + /// </summary> + // Questa classe è stata generata automaticamente dalla classe StronglyTypedResourceBuilder. + // tramite uno strumento quale ResGen o Visual Studio. + // Per aggiungere o rimuovere un membro, modificare il file con estensione ResX ed eseguire nuovamente ResGen + // con l'opzione /str oppure ricompilare il progetto VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// <summary> + /// Restituisce l'istanza di ResourceManager nella cache utilizzata da questa classe. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("My.Common.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// <summary> + /// Esegue l'override della proprietà CurrentUICulture del thread corrente per tutte le + /// ricerche di risorse eseguite utilizzando questa classe di risorse fortemente tipizzata. + /// </summary> + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.resx (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Properties/Resources.resx 2013-11-19 20:17:53 UTC (rev 4681) @@ -0,0 +1,120 @@ +<?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=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -1,4 +1,5 @@ -using System.Drawing; +using System; +using System.Drawing; using System.Drawing.Drawing2D; using System.Reflection; using System.Windows.Forms; @@ -14,6 +15,7 @@ #endregion #region Metodi pubblici statici + #region Finestre di dialogo public static void ErrorMessage(string description) //Emissione messaggio di errore (senza errore specifico) { ErrorMessage(description, ""); //--> override metodo per parametro opzionale @@ -33,6 +35,12 @@ DialogResult ret = MessageBox.Show(question, MessageHeader, MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2); return (ret == DialogResult.OK); } + #endregion + #region Metodi grafici + public static void RoundEdges(Control winControl, int radius) //Arrotondamento spigoli controllo grafico (raggiature simmetriche) + { + RoundEdges(winControl, radius, radius); + } public static void RoundEdges(Control winControl, int wRadius, int hRadius) //Arrotondamento spigoli controllo grafico { Rectangle r = new Rectangle(-1, -1, winControl.Width + 1, winControl.Height + 1); @@ -44,5 +52,31 @@ winControl.Region = new Region(gp); } #endregion + public static string RetrieveLinkerTimestamp(string filePath) //Lettura data & ora di compilazione di un assembly + { + const int c_PeHeaderOffset = 60; + const int c_LinkerTimestampOffset = 8; + byte[] b = new byte[2048]; + System.IO.Stream s = null; + + try + { + s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read); + s.Read(b, 0, 2048); + } + finally + { + if (s != null) + s.Close(); + } + + int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset); + int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset); + DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0); + dt = dt.AddSeconds(secondsSince1970); + dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours); + return dt.ToString(); + } + #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -28,69 +28,75 @@ /// </summary> private void InitializeComponent() { - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.exitPictureBox = new System.Windows.Forms.PictureBox(); - this.infoPictureBox = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.exitPictureBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VersionInfo)); + this.okPictureBox = new System.Windows.Forms.PictureBox(); + this.logoPictureBox = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit(); this.SuspendLayout(); // - // groupBox1 + // okPictureBox // - this.groupBox1.BackColor = System.Drawing.Color.Transparent; - this.groupBox1.Location = new System.Drawing.Point(200, 50); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(475, 214); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; + this.okPictureBox.BackColor = System.Drawing.Color.Transparent; + this.okPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("okPictureBox.Image"))); + this.okPictureBox.Location = new System.Drawing.Point(450, 2); + this.okPictureBox.Name = "okPictureBox"; + this.okPictureBox.Size = new System.Drawing.Size(32, 32); + this.okPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.okPictureBox.TabIndex = 0; + this.okPictureBox.TabStop = false; + this.okPictureBox.Click += new System.EventHandler(this.okPictureBox_Click); // - // exitPictureBox + // logoPictureBox // - this.exitPictureBox.BackColor = System.Drawing.Color.Transparent; - this.exitPictureBox.Location = new System.Drawing.Point(643, 3); - this.exitPictureBox.Name = "exitPictureBox"; - this.exitPictureBox.Size = new System.Drawing.Size(32, 32); - this.exitPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.exitPictureBox.TabIndex = 4; - this.exitPictureBox.TabStop = false; - this.exitPictureBox.Click += new System.EventHandler(this.exitPictureBox_Click); + this.logoPictureBox.BackColor = System.Drawing.Color.Transparent; + this.logoPictureBox.Location = new System.Drawing.Point(12, 52); + this.logoPictureBox.Name = "logoPictureBox"; + this.logoPictureBox.Size = new System.Drawing.Size(128, 128); + this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.logoPictureBox.TabIndex = 1; + this.logoPictureBox.TabStop = false; + this.logoPictureBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); + this.logoPictureBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); + this.logoPictureBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); // - // infoPictureBox + // label1 // - this.infoPictureBox.BackColor = System.Drawing.Color.Transparent; - this.infoPictureBox.Location = new System.Drawing.Point(25, 65); - this.infoPictureBox.Name = "infoPictureBox"; - this.infoPictureBox.Size = new System.Drawing.Size(128, 128); - this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.infoPictureBox.TabIndex = 3; - this.infoPictureBox.TabStop = false; - this.infoPictureBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); - this.infoPictureBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); - this.infoPictureBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Alien Encounters", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(500, 36); + this.label1.TabIndex = 2; + this.label1.Text = "Version Information"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.label1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); + this.label1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); + this.label1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); // // VersionInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(700, 300); - this.Controls.Add(this.exitPictureBox); - this.Controls.Add(this.infoPictureBox); - this.Controls.Add(this.groupBox1); + this.ClientSize = new System.Drawing.Size(500, 300); + this.Controls.Add(this.okPictureBox); + this.Controls.Add(this.label1); + this.Controls.Add(this.logoPictureBox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "VersionInfo"; - this.Opacity = 0.85D; this.ShowIcon = false; this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Load += new System.EventHandler(this.VersionInfo_Load); this.Paint += new System.Windows.Forms.PaintEventHandler(this.VersionInfo_Paint); this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); this.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); - ((System.ComponentModel.ISupportInitialize)(this.exitPictureBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -98,8 +104,8 @@ #endregion - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.PictureBox infoPictureBox; - private System.Windows.Forms.PictureBox exitPictureBox; + private System.Windows.Forms.PictureBox okPictureBox; + private System.Windows.Forms.PictureBox logoPictureBox; + private System.Windows.Forms.Label label1; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -3,17 +3,18 @@ using System.ComponentModel; using System.Data; using System.Drawing; -using System.Drawing.Drawing2D; +using System.Linq; using System.Text; using System.Windows.Forms; +using System.Drawing.Drawing2D; using System.Reflection; + namespace My.Common { public partial class VersionInfo : Form { static VersionInfo myVersionInfo; - const double opNorm = 0.95; const double opMove = 0.6; //Selezione e mouse @@ -21,81 +22,57 @@ private int eXSel = 0; private int eYSel = 0; - public static void ShowInfo(Image imgInfo, Image imgExit, string comment) + + public VersionInfo() { + InitializeComponent(); + Tools.RoundEdges(this, 75, 50); + } + + + + + public static void ShowInfo(Image imgInfo, string comment, string forumURL, string wikiURL) + { myVersionInfo = new VersionInfo(); - myVersionInfo.infoPictureBox.Image = imgInfo; - myVersionInfo.exitPictureBox.Image = imgExit; - myVersionInfo.Opacity = opNorm; - + myVersionInfo.logoPictureBox.Image = imgInfo; + Assembly myAssembly = Assembly.GetExecutingAssembly(); string name = myAssembly.GetName().Name.ToString(); string fileName = System.IO.Path.GetFileName(myAssembly.Location); string title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; string description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; string author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; - string buildDate = RetrieveLinkerTimestamp(); - Tools.InfoMessage(name + "\n" + - fileName + "\n" + - title + "\n" + - description + "\n" + - author + "\n" + - buildDate); + string buildDate = Tools.RetrieveLinkerTimestamp(myAssembly.Location); + /* Tools.InfoMessage(name + "\n" + + fileName + "\n" + + title + "\n" + + description + "\n" + + author + "\n" + + buildDate); - /* //Tools.InfoMessage(myAssembly.FullName + " V" + - myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to Marduk65 for this skin!"); + //Tools.InfoMessage(myAssembly.FullName + " V" + + myAssembly.GetName().Version.ToString() + "\n\n" + + ">>> " + description + " <<<" + "\n\n\n\n" + + "...a big thank to Marduk65 for this skin!"); - //Tools.InfoMessage(title + " V" + myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to MoPath & Chemelli for this plugin!"); - -*/ - + //Tools.InfoMessage(title + " V" + myAssembly.GetName().Version.ToString() + "\n\n" + + ">>> " + description + " <<<" + "\n\n\n\n" + + "...a big thank to MoPath & Chemelli for this plugin!"); + date + */ myVersionInfo.ShowDialog(); } - - - private static string RetrieveLinkerTimestamp() - { - string filePath = Assembly.GetExecutingAssembly().Location; - const int c_PeHeaderOffset = 60; - const int c_LinkerTimestampOffset = 8; - byte[] b = new byte[2048]; - System.IO.Stream s = null; - try - { - s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read); - s.Read(b, 0, 2048); - } - finally - { - if (s != null) - s.Close(); - } - int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset); - int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset); - DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0); - dt = dt.AddSeconds(secondsSince1970); - dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours); - return dt.ToString(); - } - public VersionInfo() - { - InitializeComponent(); - Tools.RoundEdges(this,110,50); - } - + private void VersionInfo_Paint(object sender, PaintEventArgs e) { @@ -133,15 +110,13 @@ private void VersionInfo_MouseUp(object sender, MouseEventArgs e) { mouseSel = false; - this.Opacity = opNorm; + this.Opacity = 1; } - private void exitPictureBox_Click(object sender, EventArgs e) + private void okPictureBox_Click(object sender, EventArgs e) { this.Close(); } - private void VersionInfo_Load(object sender, EventArgs e) - { - } + } } Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-19 20:17:53 UTC (rev 4681) @@ -0,0 +1,182 @@ +<?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="okPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="okPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 + AAAAAElFTkSuQmCC +</value> + </data> + <metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="label1.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/ShortCuter/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -83,16 +83,6 @@ /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> - internal static System.Drawing.Bitmap Ok { - get { - object obj = ResourceManager.GetObject("Ok", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// <summary> - /// Looks up a localized resource of type System.Drawing.Bitmap. - /// </summary> internal static System.Drawing.Bitmap RowAdd { get { object obj = ResourceManager.GetObject("RowAdd", resourceCulture); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-11-19 20:17:53 UTC (rev 4681) @@ -124,10 +124,6 @@ <data name="Info" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\info.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="Ok" type="System.Resources.ResXFileRef, System.Windows.Forms"> - <value>..\..\common\resources\images\ok.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> - </data> <data name="RowAdd" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\..\common\resources\images\rowadd.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-19 20:17:53 UTC (rev 4681) @@ -145,15 +145,9 @@ <Content Include="..\Common\Resources\Images\ArrowDown.png"> <Link>Resources\Images\ArrowDown.png</Link> </Content> - <Content Include="..\Common\Resources\Images\Exit.png"> - <Link>Resources\Images\Exit.png</Link> - </Content> <Content Include="..\Common\Resources\Images\Info.png"> <Link>Resources\Images\Info.png</Link> </Content> - <Content Include="..\Common\Resources\Images\Ok.png"> - <Link>Resources\Images\Ok.png</Link> - </Content> <Content Include="..\Common\Resources\Images\RowAdd.png"> <Link>Resources\Images\RowAdd.png</Link> </Content> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -983,7 +983,7 @@ // arrowsPictureBox // this.arrowsPictureBox.ErrorImage = null; - this.arrowsPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("arrowsPictureBox.Image"))); + this.arrowsPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.ArrowDoubleDown; this.arrowsPictureBox.Location = new System.Drawing.Point(592, 9); this.arrowsPictureBox.Name = "arrowsPictureBox"; this.arrowsPictureBox.Size = new System.Drawing.Size(358, 90); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-19 20:17:53 UTC (rev 4681) @@ -69,7 +69,7 @@ fanartHandlerPictureBox.Parent = backgroundPictureBox; fanartHandlerPictureBox.Location = new Point(fanartHandlerPictureBox.Location.X - backgroundPictureBox.Location.X, fanartHandlerPictureBox.Location.Y - backgroundPictureBox.Location.Y); - Tools.RoundEdges(backgroundPictureBox, 45, 45); + Tools.RoundEdges(backgroundPictureBox, 45); toolTip.SetToolTip(menuRowAddButton, "Add menu item to list"); toolTip.SetToolTip(menuRowRemoveButton, "Remove selected menu item from list"); @@ -882,7 +882,7 @@ } private void infoPictureBox_Click(object sender, EventArgs e) { - VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor, XtremeMenuEditor.Properties.Resources.Ok, "...a big thank to Marduk65 for this skin!"); + VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor,"...a big thank to Marduk65 for this skin!","",""); } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-18 18:51:11 UTC (rev 4680) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-19 20:17:53 UTC (rev 4681) @@ -339,143 +339,13 @@ <metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="arrowsPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAAoAAAACACAYAAACbUtgKAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1 - MAAA6mAAADqYAAAXb5JfxUYAAAAJcEhZcwAACwwAAAsMAT9AIsgAABzdSURBVHhe7d1ddFTlvcfxfcGF - F73wohdc9MKLrtV1jlVRVN5CMiS8KZSAWEBBo4K6WtujXbSH1hdiBRXkJYQAEQIECEgIhHfySjIJhIQQ - IPJeCCCiHGp71vLCdZYXXvzP/9l7Xvf8J5nZ2TN79p7fxWe6+lhC1tPOdz3/7icTjYgAAAAAIIuIiwAA - AADgXeIiAAAAAHiXuAgAAAAA3qW//Md7lZGGsrdYMUAG80P6/Of723QPf7Dd/+vFO1iV/9Hinf5HP9zp - H/b3L/zDPvrC/8RH1f4nllb7hy/d0/jEkt17HvtwVzn/mSX856X//gAA0oZbVMz9KuZ+FT9SvLP40Q93 - FXO7ih//aHcxN6v4yY9rip/+ZF/xiGW1xaOWH1g4ZsXBmTkrDw/zlRx9gGm5Jce0/NJ6w9oGbXL5cd2U - ja26aRXtaWM+yFmlv/DmBL3JfmQEABDE8aSHP9hBjyyuIj74ER/uiONJjy+ppieW7qHhH9fQk5/spac+ - 3UdPL9tPI5cfoFGfHdSN4H/PcdX/jPS1AQBSzWrDRq849OOYlYe7+AC4hA9/Y7x6AJwfuVkAAEH9xXPk - sn00ZsUBGrvqIE1cV0dTNzbRjM0tNGd7O81mz5Q38T87SmNXH6MxK4/QUxxZnsLFvwcAIBXsalhuSd1X - fAB8jw9/Q71yAHyAfR+5WQAAQVan57ySo/TcFj+9sa+HXt93hgor/JS3pl43cvl+HAQBIC3sbpivtOHH - 8euaSvjwN9TtB8AC82YBAAQN4vGJ/v/65fD0PGFdI71W000L6y7RnKpTlF/WROPWNtGIZbX615f+XgAA - O6SqYfllzT9M2tCyiA9mQ8wHtVQxH+Ss0l94c4rMmwUAEGRHPAOPTziiTfRG7Vla1HiFZm0/RePXHScf - T9Tqa0p/NwDAYKW6YRPWt/RO3dT+MNNSzXyQs0p/4c3BARAA4rIznoHHJ1S4uY3+2nSV3j5ygZ7d2KYC - qt8PlP5+AIDBSEfDJm5o/YH/tYhpqWQ+yFmlv/Dm4AAIAHGlIp7j1jbqk/NbB3upuPU6T9KdNKncr/8Z - 6XsAALAqnQ2bsunEEqalivkgZ5X+wpuDAyAAxJWqeOaXNesBLdp9hpaeuElFe3po8uftNHbVEfH7AACw - It0Nm1pxsoRpqWA+yFmlv/Dm4AAIAHGlOp7q8e/cXafp45O3aMG+8/TMxhOUu/qo+L0AACTLiYZN29xR - wjS7mQ9yVukvvDk4AAJAXOmI58QNrTT3i276pOMWvV7bS89uOsl//qD4/QAAJMOphhVuPbWQaXYyH+Ss - 0l94c3AABIC40hVPdX/mtZpztKzzK3q5+qwe0OFLa8TvCQAgUU41bEpFx0/TK7sKmGYX80HOKv2FNwcH - QACIK53xVPdn3j56mafo2zSrqlt/lPIIPjAaAAbByYZN3dx5/4VdPT9nmh3MBzmr9BfeHBwAASCudMdz - SsVJKvb30eLWPvrNlk7+zzaJ3xcAQCKcbthvtnTtZZodzAc5q/QX3hwcAAEgrnTHU/2/fnN4cl7eeYf+ - cPgyx/M0PiMQACzLhIbNquopYNpgmQ9yVukvvDk4AAJAXE7EU93/+9OxK7S8644KJ00ub4/5vgAAEpEJ - DSvc2t3LtMEyH+Ss0l94c3AABIC4nIrnjMouPZ5/afiHiieNXFYrfn8AAP3JlIbN2XWukGmDYT7IWaW/ - 8ObgAAgAcTkVzykVHfQOT9ArTn9Ns3ee1f+Z9P0BAPQnUxo2fduZHqYNhvkgZ5X+wpvzpHmzAACCnIzn - zO3dejwX1l9T8aThS6vF7xEAIJ5MatiLX5wfzjSrzAc5q/QX3hylL3KzAACCnIzn1M2d9G7zDfqs8w7N - 2N5D+WsbxO8RACCeTGrYrJ1nS5hmlfkgZ5X+wpujjGA/BDcLACDI6Xgu2HeBVnffpfm1F/WPVJC+RwCA - eDKpYXwI/IZpVpkPclbpL7w5kYfAXrVZAABBTsdzemU3rer+mhY13dAn6OH890rfJwCAJNMa9lJ17zCm - WWE+yFmlv/DmmA1j6gdD4pkprNkJX79/+PrvVZaxijj6+2eJ8vLXTxrHU/fwB9vZjopfL64qe6S4quKR - 4p0VHNKKx/7+RcWwv+/ewhFt43j+n93xVJ+hVey/ScsCj1Cmbmzbxd+X9L+LROE91D98/f7h6/cv1V8/ - adyvIu5X0a8X7yjibhU9+uGuIu5W0bCPdhc9saS6aPjSmqInP947nw+AFdyw71PdsJeqv3yb8YEueeaD - nFXiIgA4h2OVcTieGsdT43hqHE+N46lxPDWOp8bx1DieGsdT43AqD3I8K+yO55/qrlJJzzc0e9d5em7H - 2SqmWSHtOQDYR2qI09CwWOIiADhHipfTkoynxuFUPrUzngtqL+jxnF97ScWz1xzFREl7DgD2kRriNDQs - lrgIAM6R4uW0ZOPJ0Qw6aVc85+0+r8fzD0euqnj+YI5ioqQ9BwD7SA1xGhoWS1wEAOdI8XJaovEcveKw - WYFd8ZxVdVaP58KG6yqe9Pr+Sz9jWrKkPQcA+0gNcRoaFktcBIDMJIUtHRKNJ4dS8r0d8VS/RknF86/N - fXo8i2ouPMS0ZEn7CgDpIfUlHdCwWOIiAGQmKWzpkEg8hWgGdeEACACK1Jd0QMNiiYsAkJmksKXDQPEU - ghnJjwMgAChSX9IBDYslLgJAZpLClg79xVOIpVlK4vkyx5NpyZL2FQDSQ+pLOqBhscRFAMhMUtjSIV48 - hVBKcAAEAJ3Ul3RAw2KJiwCQmaSwpYMUzzErjyaK43ksEM96jmcDx7MRB0CALCT1JR3QsFjiIgBkJils - 6WCO55hVHMXE+XM4nGNX15ni2YQDIECWkfqSDmhYLHERADKTFLZ0iIynEMeBGPEs4Xiu4XiWcjx5ch5X - FhFPDicOgADeJ/UlHdCwWOIiAGQmKWzpEIynEMZExI8nh3M8T856PDmcA8VzDQ6AAK4m9SUd0LBY4iIA - ZCYpbOmg4ilEMVGJx/PzNprM4XyGw4kDIID3SH1JBzQslrgIAJlJCls6CEFMhh7P4E/PqXgal6ebqCAQ - T/XoJDaeHRzPUxzPLhwAATxC6ks6CF1KhicbJi4CQGaSwpZqORzAQfLLH59gxDP68nSb/uhExdOYnGPj - +TccAAFcS2pMqglNSpYnGyYuAkBmkuKWSjmrjtkhEE+enBOMZ/jRySkOZxdN43DiAAiQvaQ+JULokRWe - bJi4CACZSQpcqggRtMqv350RPj8rmXhOrzwTiudMjmcRx9P8K5ISIe0rAGQ2qVEDEVpklScbJi4CQGaS - IpcKOas5evYx4hm4O6Nfng58flbBupbk43kcB0CAbCN1qj9ChwbDkw0TFwEgM0mhs5sQv8GKjWeZ+um5 - YDxbOZ7Bj08YIJ5nA/GsOocDIEAWkVoVj9CgwfJkw8RFAHAXKYJW5KyuSwWOZ70cT56cw5+f1cbxNH9+ - Vj/x3Mvx3MtBTJK0fwCQ2aReSYT+2MGTDRMXAcBdpBAmS4ieXQLxbOB4NnI8m+R48uQ8eaOKZ/DjE+LF - 82Ygnhc5nhc5iMmR9g8AMpvULDOhPXbxZMPERQBwFymGycgp4ciljn8sT865gclZxVPdnVEfoBqMp3p0 - EoonT87PcjiNz8+KjmcpDoAAWUnqViShO3byZMPERQBwFymIieLJNtX8xuRsfnSiPkA1eHdGPTpRd2fa - 9Ucnejw5nMYn6EfG81scAAGykNSuIKE5dvNkw8RFAHAXKYqJEEKXCoF4Bh+dBCdnjmfM3RkjnsFHJ1O3 - cDy3no6K57s4AAJkHalfitCbVPBkw8RFAHAXKYwDGbuGw5YefvXoJC/w6CQcz5ZwPEN3Z8yXpzs5nBxP - DicOgADZCw0Lk/bHCnERANxFimN/xq5pSCeOZyPHs4l8ZRzPdRxPnpyNePo5nm0Rd2c4nurRSejujBHP - Qg7njG09OAACZCk0LEzaHyvERQBwF3Mc+yPELdUi4hmenAs2cDx5cjbi2c7xVL8/MxBP9ehEiOdaHAAB - shIaFibtjxXiIgC4S2Qc+8MRc4I/GE59co54dDLBNDlHxZPDaVyeluP5CseTacmS9g8AMhsaFibtjxXi - IgC4S+QhLx4haukSEc/jlK9Pzq0R8VSTc+DRSczlaVM8z31L77XcpOdxAATIKmhYmLQ/VoiLAOAu5sOe - We7aJif58zicvrLj0fEs99MEnpyjH51wPFU49Y9OUI9OOJ6V3bHx3HmeXtnH8dzHQUyStH8AkNmErqST - JxsmLgKAu0iHPmXYpwdslbu22QojnhzOcRzOfA6niucEPZ7tNInDOZnDaXx4aiCeoUcnXRxOjieHU8Wz - DAdAgKwk9cgKoU+J8GTDxEUAcJdUH/yCHl9+UMcxTIbfmJw5nKbJeWJocjbCGXV3Rn90YsRzOofzue1n - Bx3Pt+pui/sHAJlN6pEVaFiYuAgA7pLqg19QMJ5PfHaYo3g8Uf7oydkfjmfU5KzCqe7OdIbjWanuzkTH - 8/1QPC9xPC9xFAc2/2CfDgdAAHeSemQFGhYmLgKAu0ihS4XIeA5fcUTLW8dxHBjHs4Xj2crx9FMBh3M8 - hzMcz5P0jHlyDjw6McdznR7PW0nF87UDRjhxAARwL6lHVqBhYeIiALiLFLpUMMfzyZVHOY4tA/H7eHIe - x5NzPoezoLzNiOfG9oh4dtCzPDlHPzpR4WTbzojxfJXjybR+7b+BAyCAB0g9sgINCxMXAcBdpNClghTP - p1fXScGM5I+ZnPVwttMk0+Q8ZYuKZ1dUPKereHI49Xie53i23qLfJhDPotrrOAACeITUIyvQsDBxEQDc - RQpdKsSL54iSBs23vjUevz456/FUk3N7aHI24smTcyCeUyPjGXp0EhnPe0Y8d/Ufz5f3XsMBEMBDpB5Z - gYaFiYsA4C5S6FKhv3iOXNMohVPhePopn8NZwJOzEc8TNHETx5OjaTw64clZj6fx6OQ3PDnr8dxmxHMG - h3PmjnO0nuP5wQDxnLvnCg6AAB4j9cgKNCxMXAQAd5FClwoDxXN0aZPm2+A3i4hnO43nyXkCh3MiT856 - PDmaejw5nKG7MxzO/uPZK8bzxT2XcQAE8CCpR1agYWHiIgC4ixS6VEgknmPWNsfGMxjOqMn5JE0OTM6h - eG5V8QyEs1J9eCrHc3uPGM9XTJ+h9UI1DoAAXiX1yAo0LExcBAB3kUKXConGM6eshaPZFuQPT84nAvFU - k7OKZ/TkPDXm0Un8eL5cc+Ehpimzd+MACOBlUo+sQMPCxEUAcBcpdKmQTDxz17dqPDUr/nwOZyieHM7g - o5PJkZMz0+/OcDj1352px1Ndno6O5+JAPOftufAQ017YjQMggNdJPbICDQsTFwEgM0lBS6dAPIdyPH0c - Tx/H08fx9HE8fRxPH8fTx/H0cTx9HE+fb4Pfx/HsNeJ5IhxPnpzD8ewMPDpRk3Pw7kw4njP0eJ7T47nq - 9F36a1OfHs85uy/Mnlt90cfx9HE8fRxPH8fTx/H0cTx9HE8fx9PH8fRxOIfhAAjgXlKPrEDDwsRFAMhM - UtDSaAirfHz5IeJ4EseTnlpdR0+X1NOINQ00qrSRRq9tojFlx2nsuhbKW99KHE8aV95Oejw5nOF4doTj - yeFMNJ7qw1PV52epeM764gLNZnN2X6Q51ZfohT2X6cU9V2huzVWat/cavbTvH/Ry7XUq2n+DXjlwg149 - eLOP4/kraV8BILOZWmQVGhZBXASAzPQYR8xBhRxPCsaTJ+fYeJY1G/FcHyeeHM5QPDereHb2H8/tgXhy - OEPx3DVwPF8KxPONwzfpwxPf0Ced9+j1w7fotYO3Dkj7CgCZTeiRFWhYBHERAJwjRCtTFPUbT56c9Xjy - 5JzL4czbwPEsD8bzxADx7DLiWani2U3TOJwJxXN3//FU0/Oilq9p8+X/pXca76h4dkl7DgCZTeiRFWhY - BHERAJwjRCtTPBw/no1CPP22xfO5RONZExvP1T33aV3vv2j+oZtqgi6R9hwAMpvQIyvQsAjiIgA4Z9iy - g5nsiBHPI/bGk8MZGU8VTv0XqIvx7E04nn9uusOT87/pz8fvqPszP/6x7vYvpD0HAPsI3cgkaFiAuAgA - zhGClUl+yfH8aVDTM4dzoOnZiGec6TkQ0IHiWcST8/rz3+nTs7pA/frhm8Usaq8BwH5CNzIJGhYgLgKA - cx7/7FCm+1S8P1MaGc8Wjqd992esPD5533+XNl/6N7117LaK51d/rL/9AIvZbwCwl9CMTIOGMXERAJzz - +GeHM92DHM/7T64wxzP8E3R6PHmCDscz3k/QSR+hwPEMTNDBeEZdoI6cnpkUzwUHrtPGL/9FSzu+1T9C - YcGhvtlMU6Q9BwD7CM3INGgYExcBwDlPrDjiBvMtfYZWZDzZgJ+hlWw8Az9Bp6JZ3vsdzT/Yp+J5kmlB - 0p4DgH2EXmSirG+YuAgAzuEoucEQ1vvUqmOheI40xVPdoTHi2WbE83OOJwfUiGeyn6Jv/BqlROL5uyM3 - aNPFf9G7LV/rP0H35pGbw5kWJO05ANjH1IpMlfUNExcBwDnDVx51izw9njxBj1hTHyeerRHxtPJ7NNUE - HR1PPaB6PL80xfOSHs+V3feo9Ow/9XC+VHu9kmmRpD0HAPsIrchUWd0wcREAnPPkqmNuslePJ0/QI0sb - aNTaRo5nM8czcIdGXaLewPHkgIbiyYx4nqTJFdHxNCZoFc/TVBh6hNJ/PGdHxPNPDbfo8wvf0Tv1t9RH - KPzw+6M3hzItkrTnAGAfoROZLGsbJi4CgHOeXnXUTX7J8fxRj2foDg3Hkyfo3Kg7NIF4MiOeJwLx7NDj - GQroVjVB9xPPKiOgejx3RcdzXs1lKjv3T1redU//PZqv7r/+HtPMpD0HAPsInchkWdswcREAnPMUT6Uu - 8+mIkjqOZ33oEvVYnqBzeYLO4wk6dIcmcoLmeAYfoTwTGU8WvkPDAVXx3BaO50xTPPU7NHo8L9K7Lbep - /Mvv6M1D11U8v/rdkb4HmGYm7TkA2EdoRKbLyoaJiwDgnKc5SC7zsxGr6+6P5Al6FE/Qo0ubKEfFkyfo - PJ6gfTxBj+OAGvFs43hGTNCbOJ6BCXrKllPheAYnaD2e6hK1OZ7no+L5Su0V2nD+Pn3Y/jW9WHOVimqv - zWSaRNpzALCP0IhMl5UNExcBwDlPr+YguU/RSJ6gR/EEPZon6JzABJ3HE3QonqyAA2o8QmmniRzQSTxB - G/HsoCkc0Kl6QMM/Saceoah4Tud4PqcCGoynHtBwPD9qv0Nl5+7TK/uuqnj6mRaPtOcAYB+hD26QdQ0T - FwHAOSNK6tyqxxxP9QjFxxP0OA6oEU8/x7ONJnBAJ3JAjXiepGc5oCqexgQdiCdP0IUc0IHi+cahq1Te - +0/6S+MtemHPlZ8W7L/2GNPikfYcAOwjtMEtsqph4iIAOGfk6jq3GqMm6NFrGiiHAzqWA5qrT9DqEQoH - dAMHVMVTn6A5oIEJenLMBB1+hKLiqf9C9W09EfEMBJTjqS5Qf9Z1l1Z136MX9Z+iu1zBtP5Iew4A9hHa - 4BZZ1TBxEQCcwwFys93qDk04nk2UVxZvgm6LiGdwgu4w4hnzCCUcz9AEzfF8u+46bei9T78/fF39FN33 - bxy8NpRp/ZH2HADsI3TBTbKmYeIiADhnFE+iLvbQqJL6H8dwQMdyQHM5oEY8j3M8WzierVTAAR3PAQ3H - 8wQ9wwENxXNz9E/SRcVzR3CCPk8v7L5AJWe+pY87vtY/SHVezeVFTBuItOcAYB+hC26SNQ0TFwHAOaN5 - CnW5JSqeOaUc0LUqoM1GPHmCzueAFnBAQ/H8vJ0mc0CNeAYDGniEwhP0NA5oMJ4zVEAj4rmoqY/Wnfsf - eq32srpE3bfgwNUHmDYQac8BwD5CE9wmKxomLgKAc0avrne7n40pqb+fE5qgm3mCDgQ0NEEHA9pOk9QE - HRFQKZ6FldHxnFdzkdb23KN3W27pl6jn7rk0k2mJkPYcAOwjNMFtsqJh4iIAOGcMT6AeMDdnTT3HsyHw - CIXjWaYm6OMxE/Sk0AR9IhzPzSqenXo89d+pWXkmKp6L/bf0RycvVl9Q8WxmWqKkPQcA+wg9cCPPN0xc - BADn5JTUe0XXWJ6gc0s5nhxQHwc0Op6tNKE8GM92I548QU+pUPEMTNAqnvpP0oXjOb/2IpWdu0fvHLuu - LlH/9PLeSw8zLVHSngOAfUwdcDNPN0xcBADnjOHweMSIsTxB55Y2RsSzmfI5oAUc0PEcUCOebUY8eYJW - 8Yy9QxOOp7pAvazjDi3rvEu/3dmrLlGXMy0Z0p4DgH2EFriVpxsmLgKAc3LW8OTpHVXGBB0OqIqnMUFz - QMv9ejyjJuhgPJnxCCUcz7eOXKG1Z+/R6/sv0/M7e79/rfbSz5mWDGnPAcA+QgfczLMNExcBwDk8cXrJ - LzieP8ZM0Ot5glbx3OCniZETdDCezBzP31b10MrTd+nDttv6HZo5X3y5kGnJkvYcAOwjdMDNPNswcREA - nMOx8Zri3NIGjmcj+Tig4wITdPARysTABB35CMUcz2kcz4V112hNz7c0t/pLFc++V/ddHMK0ZEl7DgD2 - ERrgdp5smLgIAM7J5eB4zAPsmzyeoKPjeTwcT56gJ3+u4tkeFU/jDs1pmrPzLJWcuUv/3XhDv0Q9r/rL - KUyzQtpzALCP6f3vBZ5smLgIAM7JXVPvRXPzeIL28QQ9rqyJ49lsxHM9x3NDMJ5tejzDn6iv7tAYl6jf - b+mjlV1f0/NV51Q8m5lmlbTnAGAf4f3vBZ5rmLgIAM7JLeWJ05tOBifo/IhHKBPMj1CC8Qx8lELRnvO0 - +sw39NahyzRje89PL+7u/RXTrJL2HADsI7z3vcJTDRMXAcA5eWsavGp4+BFKcIIW4rmR4xl4hKLuzyw5 - cYvdpunb1CXqs2VMGwxpzwHAPsJ73ys81TBxEQCck8eTpodVRj9CMcVTv0MTvkT95oELtKr7LhXV9NL0 - yjPfv7Sn90GmDYa05wBgH+F97yWeaZi4CADO4bh42VD2Qyie6zieMXdojHgWbu2kZafu0N+O36BpW7vp - +R09bzFtsKQ9BwD7mN7zXuOZhomLAOAcX2mT1703LnCHxohnC8ezlePpj4rnO0ev0Gddd2hWVY+K57V5 - 1eeHMG2wpD0HAPsI73mv8UTDxEUAcA6HxeseGLe28at8nqAL1h0X4/n89i5a3vUV/RcHVP0E3eydPZOY - ZgdpzwHAPsJ73ms80TBxEQCck8+ByQKz+4vnoqZr9HHHbZpe2aXiWc80u0h7DgD2Ed7vXuT6homLAOAc - jkq2OCnFc+6uM/rk/Hptr/oIhZ9mVXX/iml2kfYcAOwjvNe9ytUNExcBwDkF65qzxWMcz58i46k+RHWx - /zq7oX+GVuHWrhVMs5O05wBgH+G97lWubpi4CADO4aBkk4rxHM/gxygs2HeOlp26TS/sPEPPbur495yq - 7geZZidpzwHAPsL73Mtc2zBxEQCcM2FDSzYZyvH8XsVzSsUJWtLeRwvrLut3aKZt6XiTaXaT9hwA7CO8 - z73MtQ0TFwHAOUJgvG6ReoQyv6aHiltvUOGWDhXPS7/d0TWEaXaT9hwA7CO8x73OlQ0TFwHAOVM2tWWb - IRxPf/gSdfsPHNDHmJYK0p4DgH2E97jXubJh4iIAOKdw84lsNGTKpvbZUze1LyzccnIo49ClhrTnAGAf - 4f2dDVzXMHERAAAAALxLXAQAAAAA7xIXAQAAAMC7xEUAAAAA8C5xEQAAAAC8S1wEAAAAAO8SFwEAAADA - u8RFAAAAAPAucREAAAAAvEtcBAAAAADvEhcBAAAAwLvERQAAAADwLnERAAAAALyKtP8HeiPfSwiUQFIA - AAAASUVORK5CYII= -</value> - </data> <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>25</value> </metadata> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAUAEBAAAAAAIABoBAAAVgAAACAgAAAAACAAqBAAAL4EAAAwMAAAAAAgAKglAABmFQAAQEAAAAAA Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Properties/Resources.Designer.cs 2013-11-18... [truncated message content] |
From: <nic...@us...> - 2013-11-19 22:33:42
|
Revision: 4682 http://sourceforge.net/p/mp-plugins/code/4682 Author: nicsergio Date: 2013-11-19 22:33:39 +0000 (Tue, 19 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-19 22:33:39 UTC (rev 4682) @@ -65,6 +65,7 @@ <Content Include="Resources\Images\ArrowRight.png" /> <Content Include="Resources\Images\ArrowUp.png" /> <Content Include="Resources\Images\Info.png" /> + <Content Include="Resources\Images\Internet.png" /> <Content Include="Resources\Images\Ok.png" /> <Content Include="Resources\Images\RowAdd.png" /> <Content Include="Resources\Images\RowDown.png" /> Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png 2013-11-19 22:33:39 UTC (rev 4682) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/Internet.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -88,7 +88,7 @@ } #endregion - #region MetodiPrivati + #region Metodi Privati private bool GetSkinFiles(bool excludeHome, bool excludeFS) //Raccolta dei file della skin { if (!Directory.Exists(_paths.Skin)) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -9,13 +9,13 @@ { internal static class Tools //Collezione utilità { - #region Dati statici + #region Dati //Intestazione messaggi (nome assembly) private static readonly string MessageHeader = Assembly.GetExecutingAssembly().GetName().Name.ToString(); #endregion - #region Metodi pubblici statici - #region Finestre di dialogo + #region Metodi Pubblici + #region Finestre di Dialogo public static void ErrorMessage(string description) //Emissione messaggio di errore (senza errore specifico) { ErrorMessage(description, ""); //--> override metodo per parametro opzionale @@ -36,7 +36,7 @@ return (ret == DialogResult.OK); } #endregion - #region Metodi grafici + #region Metodi Grafici public static void RoundEdges(Control winControl, int radius) //Arrotondamento spigoli controllo grafico (raggiature simmetriche) { RoundEdges(winControl, radius, radius); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -31,9 +31,28 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(VersionInfo)); this.okPictureBox = new System.Windows.Forms.PictureBox(); this.logoPictureBox = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); + this.headerLabel = new System.Windows.Forms.Label(); + this.infoGroupBox = new System.Windows.Forms.GroupBox(); + this.buildDateLabel = new System.Windows.Forms.Label(); + this.authorLabel = new System.Windows.Forms.Label(); + this.descriptionLabel = new System.Windows.Forms.Label(); + this.titleLabel = new System.Windows.Forms.Label(); + this.fileLabel = new System.Windows.Forms.Label(); + this.versionLabel = new System.Windows.Forms.Label(); + this.versionHeaderLabel = new System.Windows.Forms.Label(); + this.buildDateHeaderLabel = new System.Windows.Forms.Label(); + this.authorHeaderLabel = new System.Windows.Forms.Label(); + this.descriptionHeaderLabel = new System.Windows.Forms.Label(); + this.titleHeaderLabel = new System.Windows.Forms.Label(); + this.fileHeaderLabel = new System.Windows.Forms.Label(); + this.forumLinkLabel = new System.Windows.Forms.LinkLabel(); + this.wikiLinkLabel = new System.Windows.Forms.LinkLabel(); + this.internetPictureBox = new System.Windows.Forms.PictureBox(); + this.commentLabel = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit(); + this.infoGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.internetPictureBox)).BeginInit(); this.SuspendLayout(); // // okPictureBox @@ -51,7 +70,7 @@ // logoPictureBox // this.logoPictureBox.BackColor = System.Drawing.Color.Transparent; - this.logoPictureBox.Location = new System.Drawing.Point(12, 52); + this.logoPictureBox.Location = new System.Drawing.Point(12, 86); this.logoPictureBox.Name = "logoPictureBox"; this.logoPictureBox.Size = new System.Drawing.Size(128, 128); this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; @@ -61,28 +80,239 @@ this.logoPictureBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); this.logoPictureBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); // - // label1 + // headerLabel // - this.label1.BackColor = System.Drawing.Color.Transparent; - this.label1.Font = new System.Drawing.Font("Alien Encounters", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(500, 36); - this.label1.TabIndex = 2; - this.label1.Text = "Version Information"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.label1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); - this.label1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); - this.label1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); + this.headerLabel.BackColor = System.Drawing.Color.Transparent; + this.headerLabel.Font = new System.Drawing.Font("Alien Encounters", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headerLabel.ForeColor = System.Drawing.Color.White; + this.headerLabel.Location = new System.Drawing.Point(0, 0); + this.headerLabel.Name = "headerLabel"; + this.headerLabel.Size = new System.Drawing.Size(500, 36); + this.headerLabel.TabIndex = 2; + this.headerLabel.Text = "Version Information"; + this.headerLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.headerLabel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseDown); + this.headerLabel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseMove); + this.headerLabel.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); // + // infoGroupBox + // + this.infoGroupBox.BackColor = System.Drawing.Color.Transparent; + this.infoGroupBox.Controls.Add(this.buildDateLabel); + this.infoGroupBox.Controls.Add(this.authorLabel); + this.infoGroupBox.Controls.Add(this.descriptionLabel); + this.infoGroupBox.Controls.Add(this.titleLabel); + this.infoGroupBox.Controls.Add(this.fileLabel); + this.infoGroupBox.Controls.Add(this.versionLabel); + this.infoGroupBox.Controls.Add(this.versionHeaderLabel); + this.infoGroupBox.Controls.Add(this.buildDateHeaderLabel); + this.infoGroupBox.Controls.Add(this.authorHeaderLabel); + this.infoGroupBox.Controls.Add(this.descriptionHeaderLabel); + this.infoGroupBox.Controls.Add(this.titleHeaderLabel); + this.infoGroupBox.Controls.Add(this.fileHeaderLabel); + this.infoGroupBox.Location = new System.Drawing.Point(164, 56); + this.infoGroupBox.Name = "infoGroupBox"; + this.infoGroupBox.Size = new System.Drawing.Size(317, 188); + this.infoGroupBox.TabIndex = 3; + this.infoGroupBox.TabStop = false; + // + // buildDateLabel + // + this.buildDateLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buildDateLabel.ForeColor = System.Drawing.Color.White; + this.buildDateLabel.Location = new System.Drawing.Point(109, 151); + this.buildDateLabel.Name = "buildDateLabel"; + this.buildDateLabel.Size = new System.Drawing.Size(202, 19); + this.buildDateLabel.TabIndex = 11; + this.buildDateLabel.Text = "build date"; + this.buildDateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // authorLabel + // + this.authorLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.authorLabel.ForeColor = System.Drawing.Color.White; + this.authorLabel.Location = new System.Drawing.Point(109, 124); + this.authorLabel.Name = "authorLabel"; + this.authorLabel.Size = new System.Drawing.Size(202, 19); + this.authorLabel.TabIndex = 10; + this.authorLabel.Text = "author"; + this.authorLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // descriptionLabel + // + this.descriptionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.descriptionLabel.ForeColor = System.Drawing.Color.White; + this.descriptionLabel.Location = new System.Drawing.Point(109, 97); + this.descriptionLabel.Name = "descriptionLabel"; + this.descriptionLabel.Size = new System.Drawing.Size(202, 19); + this.descriptionLabel.TabIndex = 9; + this.descriptionLabel.Text = "description"; + this.descriptionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // titleLabel + // + this.titleLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.titleLabel.ForeColor = System.Drawing.Color.White; + this.titleLabel.Location = new System.Drawing.Point(109, 70); + this.titleLabel.Name = "titleLabel"; + this.titleLabel.Size = new System.Drawing.Size(202, 19); + this.titleLabel.TabIndex = 8; + this.titleLabel.Text = "title"; + this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // fileLabel + // + this.fileLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.fileLabel.ForeColor = System.Drawing.Color.White; + this.fileLabel.Location = new System.Drawing.Point(109, 43); + this.fileLabel.Name = "fileLabel"; + this.fileLabel.Size = new System.Drawing.Size(202, 19); + this.fileLabel.TabIndex = 7; + this.fileLabel.Text = "file"; + this.fileLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // versionLabel + // + this.versionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.versionLabel.ForeColor = System.Drawing.Color.White; + this.versionLabel.Location = new System.Drawing.Point(109, 16); + this.versionLabel.Name = "versionLabel"; + this.versionLabel.Size = new System.Drawing.Size(202, 19); + this.versionLabel.TabIndex = 6; + this.versionLabel.Text = "version"; + this.versionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // versionHeaderLabel + // + this.versionHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.versionHeaderLabel.ForeColor = System.Drawing.Color.White; + this.versionHeaderLabel.Location = new System.Drawing.Point(16, 16); + this.versionHeaderLabel.Name = "versionHeaderLabel"; + this.versionHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.versionHeaderLabel.TabIndex = 5; + this.versionHeaderLabel.Text = "Version:"; + this.versionHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // buildDateHeaderLabel + // + this.buildDateHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.buildDateHeaderLabel.ForeColor = System.Drawing.Color.White; + this.buildDateHeaderLabel.Location = new System.Drawing.Point(16, 151); + this.buildDateHeaderLabel.Name = "buildDateHeaderLabel"; + this.buildDateHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.buildDateHeaderLabel.TabIndex = 4; + this.buildDateHeaderLabel.Text = "Build Date:"; + this.buildDateHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // authorHeaderLabel + // + this.authorHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.authorHeaderLabel.ForeColor = System.Drawing.Color.White; + this.authorHeaderLabel.Location = new System.Drawing.Point(16, 124); + this.authorHeaderLabel.Name = "authorHeaderLabel"; + this.authorHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.authorHeaderLabel.TabIndex = 3; + this.authorHeaderLabel.Text = "Author:"; + this.authorHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // descriptionHeaderLabel + // + this.descriptionHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.descriptionHeaderLabel.ForeColor = System.Drawing.Color.White; + this.descriptionHeaderLabel.Location = new System.Drawing.Point(16, 97); + this.descriptionHeaderLabel.Name = "descriptionHeaderLabel"; + this.descriptionHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.descriptionHeaderLabel.TabIndex = 2; + this.descriptionHeaderLabel.Text = "Description:"; + this.descriptionHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // titleHeaderLabel + // + this.titleHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.titleHeaderLabel.ForeColor = System.Drawing.Color.White; + this.titleHeaderLabel.Location = new System.Drawing.Point(16, 70); + this.titleHeaderLabel.Name = "titleHeaderLabel"; + this.titleHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.titleHeaderLabel.TabIndex = 1; + this.titleHeaderLabel.Text = "Title:"; + this.titleHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // fileHeaderLabel + // + this.fileHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.fileHeaderLabel.ForeColor = System.Drawing.Color.White; + this.fileHeaderLabel.Location = new System.Drawing.Point(16, 43); + this.fileHeaderLabel.Name = "fileHeaderLabel"; + this.fileHeaderLabel.Size = new System.Drawing.Size(87, 19); + this.fileHeaderLabel.TabIndex = 0; + this.fileHeaderLabel.Text = "File:"; + this.fileHeaderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // forumLinkLabel + // + this.forumLinkLabel.BackColor = System.Drawing.Color.Transparent; + this.forumLinkLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.forumLinkLabel.Location = new System.Drawing.Point(410, 280); + this.forumLinkLabel.Name = "forumLinkLabel"; + this.forumLinkLabel.Size = new System.Drawing.Size(40, 15); + this.forumLinkLabel.TabIndex = 4; + this.forumLinkLabel.TabStop = true; + this.forumLinkLabel.Text = "forum"; + this.forumLinkLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.forumLinkLabel.Visible = false; + this.forumLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.forumLinkLabel_LinkClicked); + // + // wikiLinkLabel + // + this.wikiLinkLabel.BackColor = System.Drawing.Color.Transparent; + this.wikiLinkLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.wikiLinkLabel.Location = new System.Drawing.Point(380, 280); + this.wikiLinkLabel.Name = "wikiLinkLabel"; + this.wikiLinkLabel.Size = new System.Drawing.Size(31, 15); + this.wikiLinkLabel.TabIndex = 5; + this.wikiLinkLabel.TabStop = true; + this.wikiLinkLabel.Text = "wiki"; + this.wikiLinkLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.wikiLinkLabel.Visible = false; + this.wikiLinkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.wikiLinkLabel_LinkClicked); + // + // internetPictureBox + // + this.internetPictureBox.BackColor = System.Drawing.Color.Transparent; + this.internetPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("internetPictureBox.Image"))); + this.internetPictureBox.Location = new System.Drawing.Point(450, 265); + this.internetPictureBox.Name = "internetPictureBox"; + this.internetPictureBox.Size = new System.Drawing.Size(32, 32); + this.internetPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.internetPictureBox.TabIndex = 6; + this.internetPictureBox.TabStop = false; + this.internetPictureBox.Visible = false; + // + // commentLabel + // + this.commentLabel.BackColor = System.Drawing.Color.Transparent; + this.commentLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.commentLabel.ForeColor = System.Drawing.Color.DarkViolet; + this.commentLabel.Location = new System.Drawing.Point(180, 248); + this.commentLabel.Name = "commentLabel"; + this.commentLabel.Size = new System.Drawing.Size(288, 15); + this.commentLabel.TabIndex = 7; + this.commentLabel.Text = "comment"; + this.commentLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.commentLabel.Visible = false; + // // VersionInfo // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(500, 300); + this.Controls.Add(this.commentLabel); + this.Controls.Add(this.internetPictureBox); + this.Controls.Add(this.wikiLinkLabel); + this.Controls.Add(this.forumLinkLabel); + this.Controls.Add(this.infoGroupBox); this.Controls.Add(this.okPictureBox); - this.Controls.Add(this.label1); + this.Controls.Add(this.headerLabel); this.Controls.Add(this.logoPictureBox); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.MaximizeBox = false; @@ -97,6 +327,8 @@ this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.VersionInfo_MouseUp); ((System.ComponentModel.ISupportInitialize)(this.okPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit(); + this.infoGroupBox.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.internetPictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,6 +338,23 @@ private System.Windows.Forms.PictureBox okPictureBox; private System.Windows.Forms.PictureBox logoPictureBox; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label headerLabel; + private System.Windows.Forms.GroupBox infoGroupBox; + private System.Windows.Forms.LinkLabel forumLinkLabel; + private System.Windows.Forms.LinkLabel wikiLinkLabel; + private System.Windows.Forms.PictureBox internetPictureBox; + private System.Windows.Forms.Label fileHeaderLabel; + private System.Windows.Forms.Label authorHeaderLabel; + private System.Windows.Forms.Label descriptionHeaderLabel; + private System.Windows.Forms.Label titleHeaderLabel; + private System.Windows.Forms.Label buildDateLabel; + private System.Windows.Forms.Label authorLabel; + private System.Windows.Forms.Label descriptionLabel; + private System.Windows.Forms.Label titleLabel; + private System.Windows.Forms.Label fileLabel; + private System.Windows.Forms.Label versionLabel; + private System.Windows.Forms.Label versionHeaderLabel; + private System.Windows.Forms.Label buildDateHeaderLabel; + private System.Windows.Forms.Label commentLabel; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -8,72 +8,67 @@ using System.Windows.Forms; using System.Drawing.Drawing2D; using System.Reflection; +using System.Diagnostics; namespace My.Common { - public partial class VersionInfo : Form + public partial class VersionInfo : Form //Form di visualizzazione informazioni sulla versione { - static VersionInfo myVersionInfo; - const double opMove = 0.6; + #region Dati + static VersionInfo myVersionInfo; //Istanza form di visualizzazione versione + const double MovingOpacity = 0.6; //Opacità durante lo spostamento della form + private bool mouseSel = false; //Selezione form con mouse attiva + private int eXSel = 0; //Memorizzazione coordinata X di pick del mouse (per spostamento form) + private int eYSel = 0; //Memorizzazione coordinata Y di pick del mouse (per spostamento form) + #endregion - //Selezione e mouse - private bool mouseSel = false; - private int eXSel = 0; - private int eYSel = 0; - - + #region Costruttore public VersionInfo() { InitializeComponent(); - Tools.RoundEdges(this, 75, 50); } + #endregion - - - - public static void ShowInfo(Image imgInfo, string comment, string forumURL, string wikiURL) - { + #region Metodi Pubblici + public static void ShowInfo(Image logo, string comment, string forumURL, string wikiURL) + { //Visualizzazione informazioni sulla versione myVersionInfo = new VersionInfo(); - myVersionInfo.logoPictureBox.Image = imgInfo; - - Assembly myAssembly = Assembly.GetExecutingAssembly(); - string name = myAssembly.GetName().Name.ToString(); - string fileName = System.IO.Path.GetFileName(myAssembly.Location); - string title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; - string description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; - string author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; - string buildDate = Tools.RetrieveLinkerTimestamp(myAssembly.Location); - /* Tools.InfoMessage(name + "\n" + - fileName + "\n" + - title + "\n" + - description + "\n" + - author + "\n" + - buildDate); + myVersionInfo.logoPictureBox.Image = logo; //--> logo applicazione + Tools.RoundEdges(myVersionInfo, 75, 50); //--> arrotondamento spigoli form + Assembly myAssembly = Assembly.GetExecutingAssembly(); //Raccolta informazioni assembly in esecuzione + myVersionInfo.versionLabel.Text = myAssembly.GetName().Version.ToString(); + myVersionInfo.fileLabel.Text = System.IO.Path.GetFileName(myAssembly.Location); + myVersionInfo.titleLabel.Text = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; + myVersionInfo.descriptionLabel.Text = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; + myVersionInfo.authorLabel.Text = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; + myVersionInfo.buildDateLabel.Text = Tools.RetrieveLinkerTimestamp(myAssembly.Location); - //Tools.InfoMessage(myAssembly.FullName + " V" + - myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to Marduk65 for this skin!"); + if (comment.Length > 0) //Eventuale visualizzazione commento + { + myVersionInfo.commentLabel.Visible= true; + myVersionInfo.commentLabel.Text = comment; + } + if (forumURL.Length > 0) //Eventuale visualizzazione link forum + { + myVersionInfo.internetPictureBox.Visible = true; + myVersionInfo.forumLinkLabel.Visible = true; + myVersionInfo.forumLinkLabel.Links.Add(0, myVersionInfo.forumLinkLabel.Text.Length, forumURL); + if (wikiURL.Length > 0) //Eventuale visualizzazione link documentazione + { + myVersionInfo.wikiLinkLabel.Visible = true; + myVersionInfo.wikiLinkLabel.Links.Add(0, myVersionInfo.wikiLinkLabel.Text.Length, wikiURL); + } + } - //Tools.InfoMessage(title + " V" + myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to MoPath & Chemelli for this plugin!"); - date - */ - myVersionInfo.ShowDialog(); - + myVersionInfo.ShowDialog(); //--> visualizzazione form } + #endregion - - - - - - - + #region Consumazione Eventi + #region Eventi Form private void VersionInfo_Paint(object sender, PaintEventArgs e) { Graphics mGraphics = e.Graphics; @@ -89,15 +84,20 @@ gp.AddArc(r.X + r.Width - 40, r.Y + r.Height - 20, 40, 20, 0, 90); gp.AddArc(r.X, r.Y + r.Height - 20, 40, 20, 90, 90); mGraphics.FillPath(mLGB, gp); + + if (this.internetPictureBox.Visible) + { + Pen p = new Pen(Color.DarkBlue); + mGraphics.DrawLine(p, 12, 275, 442, 275); + p.Dispose(); + } } - - private void VersionInfo_MouseDown(object sender, MouseEventArgs e) { mouseSel = true; eXSel = e.X; eYSel = e.Y; - this.Opacity = opMove; + this.Opacity = MovingOpacity; } private void VersionInfo_MouseMove(object sender, MouseEventArgs e) { @@ -112,11 +112,22 @@ mouseSel = false; this.Opacity = 1; } + #endregion + + + private void forumLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start(e.Link.LinkData.ToString()); + } + + private void wikiLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Process.Start(e.Link.LinkData.ToString()); + } private void okPictureBox_Click(object sender, EventArgs e) { this.Close(); } - - + #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-19 22:33:39 UTC (rev 4682) @@ -173,9 +173,115 @@ <metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="label1.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="headerLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="infoGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="buildDateLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="buildDateHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="forumLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="wikiLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="internetPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <data name="internetPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + 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 + CDnUhkr9VgAAAABJRU5ErkJggg== +</value> + </data> + <metadata name="commentLabel.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> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -20,7 +20,7 @@ } #endregion - #region MetodiPrivati + #region Metodi Privati private bool GetSkinSounds() //Raccolta effetti sonori della skin { DirectoryInfo dInfo = new DirectoryInfo(_paths.Sounds); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -882,7 +882,8 @@ } private void infoPictureBox_Click(object sender, EventArgs e) { - VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor,"...a big thank to Marduk65 for this skin!","",""); + VersionInfo.ShowInfo(XtremeMenuEditor.Properties.Resources.Editor, "...a big thank to Marduk65 for this skin!", + "http://forum.team-mediaportal.com/threads/skin-xtreme-widescreen-16-9-11-10-2013-new-version-1-3-0-1-released.109707/", ""); } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-19 20:17:53 UTC (rev 4681) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-19 22:33:39 UTC (rev 4682) @@ -53,7 +53,7 @@ } #endregion - #region MetodiPrivati + #region Metodi Privati private bool GetSkinBackgroundImages(bool onlyBigImages) //Raccolta immagini di background della skin (onlyBigImages: solo quelle almeno 1280x720) { DirectoryInfo dInfo = new DirectoryInfo(_paths.Media); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-20 21:21:55
|
Revision: 4684 http://sourceforge.net/p/mp-plugins/code/4684 Author: nicsergio Date: 2013-11-20 21:21:50 +0000 (Wed, 20 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 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.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -9,9 +9,65 @@ { internal static class Tools //Collezione utilità { + #region Classi + public static class MyAssembly //Classe per accesso alle proprietà assembly in esecuzione + { + #region Dati + public static readonly string Name; //Nome progetto + public static readonly string Title; //Titolo + public static readonly string File; //File binario + public static readonly string Version; //Versione + public static readonly string Description; //Descrizione (breve) + public static readonly string Author; //Autore + public static readonly string BuildDate; //Data & ora di compilazione + #endregion + + #region Costruttore + static MyAssembly() + { + Assembly myAssembly = Assembly.GetExecutingAssembly(); //Raccolta informazioni assembly in esecuzione + Name = myAssembly.GetName().Name.ToString(); + Title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; + File = System.IO.Path.GetFileName(myAssembly.Location); + Version = myAssembly.GetName().Version.ToString(); + Description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; + Author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; + BuildDate = RetrieveLinkerTimestamp(myAssembly.Location); + } + #endregion + + #region Metodi Privati + private static string RetrieveLinkerTimestamp(string filePath) //Lettura data & ora di compilazione di un assembly + { + const int c_PeHeaderOffset = 60; + const int c_LinkerTimestampOffset = 8; + byte[] b = new byte[2048]; + System.IO.Stream s = null; + + try + { + s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read); + s.Read(b, 0, 2048); + } + finally + { + if (s != null) + s.Close(); + } + + int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset); + int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset); + DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0); + dt = dt.AddSeconds(secondsSince1970); + dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours); + return dt.ToString(); + } + #endregion + } + #endregion + #region Dati - //Intestazione messaggi (nome assembly) - private static readonly string MessageHeader = Assembly.GetExecutingAssembly().GetName().Name.ToString(); + private static readonly string MessageHeader = MyAssembly.Title; //Intestazione messaggi (titolo assembly) #endregion #region Metodi Pubblici @@ -52,31 +108,6 @@ winControl.Region = new Region(gp); } #endregion - public static string RetrieveLinkerTimestamp(string filePath) //Lettura data & ora di compilazione di un assembly - { - const int c_PeHeaderOffset = 60; - const int c_LinkerTimestampOffset = 8; - byte[] b = new byte[2048]; - System.IO.Stream s = null; - - try - { - s = new System.IO.FileStream(filePath, System.IO.FileMode.Open, System.IO.FileAccess.Read); - s.Read(b, 0, 2048); - } - finally - { - if (s != null) - s.Close(); - } - - int i = System.BitConverter.ToInt32(b, c_PeHeaderOffset); - int secondsSince1970 = System.BitConverter.ToInt32(b, i + c_LinkerTimestampOffset); - DateTime dt = new DateTime(1970, 1, 1, 0, 0, 0); - dt = dt.AddSeconds(secondsSince1970); - dt = dt.AddHours(TimeZone.CurrentTimeZone.GetUtcOffset(dt).Hours); - return dt.ToString(); - } #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -293,9 +293,9 @@ this.commentLabel.BackColor = System.Drawing.Color.Transparent; this.commentLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.commentLabel.ForeColor = System.Drawing.Color.DarkViolet; - this.commentLabel.Location = new System.Drawing.Point(180, 248); + this.commentLabel.Location = new System.Drawing.Point(161, 247); this.commentLabel.Name = "commentLabel"; - this.commentLabel.Size = new System.Drawing.Size(288, 15); + this.commentLabel.Size = new System.Drawing.Size(320, 15); this.commentLabel.TabIndex = 7; this.commentLabel.Text = "comment"; this.commentLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -1,14 +1,8 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; +using System.Diagnostics; using System.Drawing; -using System.Linq; -using System.Text; +using System.Drawing.Drawing2D; using System.Windows.Forms; -using System.Drawing.Drawing2D; -using System.Reflection; -using System.Diagnostics; namespace My.Common @@ -37,13 +31,12 @@ myVersionInfo.logoPictureBox.Image = logo; //--> logo applicazione Tools.RoundEdges(myVersionInfo, 75, 50); //--> arrotondamento spigoli form - Assembly myAssembly = Assembly.GetExecutingAssembly(); //Raccolta informazioni assembly in esecuzione - myVersionInfo.versionLabel.Text = myAssembly.GetName().Version.ToString(); - myVersionInfo.fileLabel.Text = System.IO.Path.GetFileName(myAssembly.Location); - myVersionInfo.titleLabel.Text = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; - myVersionInfo.descriptionLabel.Text = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; - myVersionInfo.authorLabel.Text = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; - myVersionInfo.buildDateLabel.Text = Tools.RetrieveLinkerTimestamp(myAssembly.Location); + myVersionInfo.versionLabel.Text = Tools.MyAssembly.Version; + myVersionInfo.fileLabel.Text = Tools.MyAssembly.File; + myVersionInfo.titleLabel.Text = Tools.MyAssembly.Title; + myVersionInfo.descriptionLabel.Text = Tools.MyAssembly.Description; + myVersionInfo.authorLabel.Text = Tools.MyAssembly.Author; + myVersionInfo.buildDateLabel.Text = Tools.MyAssembly.BuildDate; if (comment.Length > 0) //Eventuale visualizzazione commento { Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-20 21:21:50 UTC (rev 4684) @@ -117,9 +117,6 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="okPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="okPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -170,60 +167,6 @@ AAAAAElFTkSuQmCC </value> </data> - <metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="headerLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="infoGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="buildDateLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="authorLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="descriptionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="titleLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="versionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="versionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="buildDateHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="authorHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="descriptionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="titleHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="forumLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="wikiLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="internetPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> <data name="internetPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -279,10 +222,4 @@ CDnUhkr9VgAAAABJRU5ErkJggg== </value> </data> - <metadata name="commentLabel.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 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-11-20 21:21:50 UTC (rev 4684) @@ -29,7 +29,6 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -48,6 +47,7 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.Designer.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -119,5 +119,15 @@ return ((System.Drawing.Bitmap)(obj)); } } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + internal static System.Drawing.Bitmap ShortCuter { + get { + object obj = ResourceManager.GetObject("ShortCuter", 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 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/Resources.resx 2013-11-20 21:21:50 UTC (rev 4684) @@ -136,4 +136,8 @@ <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> + <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> + <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> </root> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -1,17 +1,14 @@ using System; -using System.Reflection; using System.Windows.Forms; -using System.Collections.Generic; using MediaPortal.Configuration; using MediaPortal.GUI.Library; using MediaPortal.Util; -using System.Threading; -using Action = MediaPortal.GUI.Library.Action; -using System.Runtime.InteropServices; +//using Action = MediaPortal.GUI.Library.Action; +using My.Common; namespace ProcessPlugins.ShortCuter { - public class ShortCuter : IPlugin //Classe gestore shortcuts + internal class ShortCuter : IPlugin //Classe gestore shortcuts { #region Dati private ShortCuts myShortCuts; //Istanza classe ShortCuts (dati relativi ai shortcuts configurati) @@ -21,17 +18,16 @@ #region Costruttore static ShortCuter() //Costruttore classe ShortCuter { - //Header per log corrispondente a titolo assembly - LogPrefix = ((AssemblyTitleAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title + " - "; + LogPrefix = Tools.MyAssembly.Title + " - "; //Header per log su file (titolo assembly) } #endregion #region Implementazione IPlugin public void Start() //Avvio del plugin { - MpLog(false, "Plugin started", null); + MpLog(false, "Plugin started"); - string settingsFile = Config.GetFile(Config.Dir.Config, Assembly.GetExecutingAssembly().GetName().Name.ToString() + ".xml"); + string settingsFile = Config.GetFile(Config.Dir.Config, Tools.MyAssembly.Name + ".xml"); myShortCuts = new ShortCuts(settingsFile, false); //--> lettura configurazione relativa agli shortcuts if (myShortCuts.Initialized) //Se classe di gestione shortcut inizializzata { @@ -42,15 +38,15 @@ } catch { - MpLog(true, "Error creating raw input hook", null); + MpLog(true, "Error creating raw input hook"); } } else - MpLog(true, "Error loading configuration", null); + MpLog(true, "Error loading configuration"); } public void Stop() //Terminazione del plugin { - MpLog(false, "Plugin stopped", null); + MpLog(false, "Plugin stopped"); } #endregion @@ -59,7 +55,7 @@ { try { - MpLog(false, "Go to screen accepted, " + sc.ToString(), null); + MpLog(false, "Go to screen accepted, " + sc.ToString()); GUIGraphicsContext.ResetLastActivity(); if (sc.SoundEffect.Length > 0) @@ -68,7 +64,7 @@ if (sc.LoadParameter.Length > 0) //Richiamo schermata con parametri di caricamento { string sm = GUIPropertyManager.GetProperty("#MovingPictures.SelectedMovie.title"); - MpLog(false, "SSSM:" + sm, null); + MpLog(false, "SSSM:" + sm); GUIWindowManager.ActivateWindow(sc.WindowID, sc.LoadParameter, true); } @@ -87,6 +83,10 @@ #endregion #region Metodi Pubblici + public static void MpLog(bool errorLog, string description) //Registrazione evento su log di MediaPortal (senza passare l'eccezione) + { + MpLog(errorLog, description, null); + } public static void MpLog(bool errorLog, string description, Exception e) //Registrazione evento su log di MediaPortal { description = LogPrefix + description; @@ -114,7 +114,7 @@ return; } } - MpLog(false, "Key not mapped: Key=" + (e.Control ? "<CTRL>" : "") + (e.Alt ? "<ALT>" : "") + (e.Shift ? "<SHIFT>" : "") + "<" + e.KeyCode.ToString() + ">", null); + MpLog(false, "Key not mapped: Key=" + (e.Control ? "<CTRL>" : "") + (e.Alt ? "<ALT>" : "") + (e.Shift ? "<SHIFT>" : "") + "<" + e.KeyCode.ToString() + ">"); } } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-20 21:21:50 UTC (rev 4684) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.ShortCuter</RootNamespace> <AssemblyName>ShortCuter</AssemblyName> @@ -47,8 +47,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <StartupObject> - </StartupObject> + <StartupObject>ProcessPlugins.ShortCuter.Program</StartupObject> </PropertyGroup> <PropertyGroup> <ApplicationIcon>Resources\Images\ShortCuter.ico</ApplicationIcon> @@ -83,6 +82,14 @@ <Compile Include="..\Common\Tools.cs"> <Link>Tools.cs</Link> </Compile> + <Compile Include="..\Common\VersionInfo.cs"> + <Link>VersionInfo.cs</Link> + <SubType>Form</SubType> + </Compile> + <Compile Include="..\Common\VersionInfo.designer.cs"> + <Link>VersionInfo.designer.cs</Link> + <DependentUpon>VersionInfo.cs</DependentUpon> + </Compile> <Compile Include="KeyboardHookWorker.cs" /> <Compile Include="KeyboardHook.cs" /> <Compile Include="Program.cs" /> @@ -109,6 +116,10 @@ <Compile Include="SkinWithSounds.cs" /> </ItemGroup> <ItemGroup> + <EmbeddedResource Include="..\Common\VersionInfo.resx"> + <Link>VersionInfo.resx</Link> + <DependentUpon>VersionInfo.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Properties\Resources.resx"> <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -28,7 +28,6 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterForm)); this.shortCutsDataGridView = new System.Windows.Forms.DataGridView(); @@ -44,7 +43,7 @@ this.windowIdLabel = new System.Windows.Forms.Label(); this.skinFileGroupBox = new System.Windows.Forms.GroupBox(); this.skinFileLabel = new System.Windows.Forms.Label(); - this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.toolTip = new System.Windows.Forms.ToolTip(); this.updateButton = new System.Windows.Forms.Button(); this.resetButton = new System.Windows.Forms.Button(); this.rowDownButton = new System.Windows.Forms.Button(); @@ -284,7 +283,7 @@ // infoPictureBox // this.infoPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.Info; - this.infoPictureBox.Location = new System.Drawing.Point(760, 0); + this.infoPictureBox.Location = new System.Drawing.Point(759, 1); this.infoPictureBox.Name = "infoPictureBox"; this.infoPictureBox.Size = new System.Drawing.Size(24, 24); this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -1,7 +1,6 @@ using System; using System.ComponentModel; using System.Drawing; -using System.Reflection; using System.Windows.Forms; using MediaPortal.Configuration; using MediaPortal.GUI.Library; @@ -215,16 +214,6 @@ rowDownButton.Enabled = false; } } - private void ShowInfo() //Visualizzazione informazioni versione - { - Assembly myAssembly = Assembly.GetExecutingAssembly(); - string description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; - string title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; - - Tools.InfoMessage(title + " V" + myAssembly.GetName().Version.ToString() + "\n\n" + - ">>> " + description + " <<<" + "\n\n\n\n" + - "...a big thank to MoPath & Chemelli for this plugin!"); - } #endregion #region Consumazione Eventi @@ -238,7 +227,7 @@ } if (mySkin.Initialized) { - string settingsFile = Config.GetFile(Config.Dir.Config, Assembly.GetExecutingAssembly().GetName().Name.ToString() + ".xml"); + string settingsFile = Config.GetFile(Config.Dir.Config, Tools.MyAssembly.Name + ".xml"); //Lettura impostazioni e gestione shorcuts myShortCuts = new ShortCuts(settingsFile, true); if (myShortCuts.Initialized) @@ -461,22 +450,24 @@ } private void infoPictureBox_Click(object sender, EventArgs e) { - ShowInfo(); + VersionInfo.ShowInfo(ProcessPlugins.ShortCuter.Properties.Resources.ShortCuter, "...a big thank to MoPath for old version of this plugin!", + "http://forum.team-mediaportal.com/threads/shortcuter-plugin-v2.121721/", + "http://wiki.team-mediaportal.com/1_MEDIAPORTAL_1/17_Extensions/3_Plugins/ShortCut'er"); } #endregion #region Implementazione ISetupForm public string PluginName() { - return ((AssemblyTitleAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; + return Tools.MyAssembly.Title; } public string Description() { - return ((AssemblyDescriptionAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; + return Tools.MyAssembly.Description; } public string Author() { - return ((AssemblyCompanyAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; + return Tools.MyAssembly.Author; } public void ShowPlugin() { Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -124,11 +124,11 @@ if (!_initialized) { if (!ConfigContext) - ShortCuter.MpLog(false, "Deprecated config will be loaded..", null); + ShortCuter.MpLog(false, "Deprecated config will be loaded.."); _initialized = LoadDeprecatedConfig(); //--> eventuale caricamento configurazione obsoleta (versione vecchia) if (!_initialized) { - Message(false, "Settings file not found or wrong: default config will be loaded..", null); + Message(false, "Settings file not found or wrong: default config will be loaded.."); _initialized = LoadConfig(true); //Se caricamento configurazione fallita --> caricamento configurazione predefinita } } @@ -166,8 +166,12 @@ return (_items.Count > 0); } } - private void Message(bool errorMsg, string description, Exception e) //Emissione messaggio (o log su file) + private void Message(bool errorMsg, string description) //Emissione messaggio o log su file (senza passare l'eccezione) { + Message(errorMsg, description); + } + private void Message(bool errorMsg, string description, Exception e) //Emissione messaggio o log su file + { if (ConfigContext) //Se utilizzo nella fase di configurazione if (errorMsg) if (e != null) @@ -249,7 +253,7 @@ else { if (defaultSettings) //Se nessun shortcut trovato nella configurazione predefinita: emissione messaggio - Message(false, "No shortcuts found loading DefaultConfig.xml.", null); + Message(false, "No shortcuts found loading DefaultConfig.xml."); return false; } } @@ -311,7 +315,7 @@ if (xmlSettings != null) xmlSettings.Close(); //--> eventuale chiusura oggetto XmlWriter } - Message(false, "Procedure completed successfully.", null); + Message(false, "Procedure completed successfully."); return true; //--> procedura terminata correttamente } #endregion Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.IO; -using System.Reflection; -using System.Xml; using My.Common; namespace ProcessPlugins.ShortCuter Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -996,7 +996,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Control; - this.ClientSize = new System.Drawing.Size(1019, 608); + this.ClientSize = new System.Drawing.Size(1019, 602); this.Controls.Add(this.menuPanel); this.Controls.Add(this.propertiesPanel); this.Controls.Add(this.infoPictureBox); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-20 06:58:48 UTC (rev 4683) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-20 21:21:50 UTC (rev 4684) @@ -3,7 +3,6 @@ using System.Drawing; using System.IO; using System.Linq; -using System.Reflection; using System.Windows.Forms; using MediaPortal.Configuration; using MediaPortal.GUI.Library; @@ -508,7 +507,7 @@ myMediaPortal = new MediaPortal(SkinName); if (myMediaPortal.Initialized) { - string settingsFile = MediaPortal.ConfigPath + Assembly.GetExecutingAssembly().GetName().Name.ToString() + ".xml"; + string settingsFile = MediaPortal.ConfigPath + Tools.MyAssembly.Name + ".xml"; //Lettura impostazioni e gestione menu myMenu = new MenuItems(settingsFile, MenuItemsMinNum, MenuItemsMaxNum, SubMenuItemsMaxNum); if (myMenu.Initialized) @@ -890,15 +889,15 @@ #region Implementazione ISetupForm public string PluginName() { - return ((AssemblyTitleAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; + return Tools.MyAssembly.Title; } public string Description() { - return ((AssemblyDescriptionAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; + return Tools.MyAssembly.Description; } public string Author() { - return ((AssemblyCompanyAttribute)Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; + return Tools.MyAssembly.Author; } public void ShowPlugin() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-21 19:34:16
|
Revision: 4685 http://sourceforge.net/p/mp-plugins/code/4685 Author: nicsergio Date: 2013-11-21 19:34:13 +0000 (Thu, 21 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/UpdateNotify.png trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-20 21:21:50 UTC (rev 4684) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-11-21 19:34:13 UTC (rev 4685) @@ -120,9 +120,9 @@ // this.buildDateLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.buildDateLabel.ForeColor = System.Drawing.Color.White; - this.buildDateLabel.Location = new System.Drawing.Point(109, 151); + this.buildDateLabel.Location = new System.Drawing.Point(109, 152); this.buildDateLabel.Name = "buildDateLabel"; - this.buildDateLabel.Size = new System.Drawing.Size(202, 19); + this.buildDateLabel.Size = new System.Drawing.Size(202, 16); this.buildDateLabel.TabIndex = 11; this.buildDateLabel.Text = "build date"; this.buildDateLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -131,20 +131,20 @@ // this.authorLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.authorLabel.ForeColor = System.Drawing.Color.White; - this.authorLabel.Location = new System.Drawing.Point(109, 124); + this.authorLabel.Location = new System.Drawing.Point(109, 125); this.authorLabel.Name = "authorLabel"; - this.authorLabel.Size = new System.Drawing.Size(202, 19); + this.authorLabel.Size = new System.Drawing.Size(202, 16); this.authorLabel.TabIndex = 10; this.authorLabel.Text = "author"; this.authorLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // descriptionLabel // - this.descriptionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.descriptionLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.descriptionLabel.ForeColor = System.Drawing.Color.White; - this.descriptionLabel.Location = new System.Drawing.Point(109, 97); + this.descriptionLabel.Location = new System.Drawing.Point(109, 88); this.descriptionLabel.Name = "descriptionLabel"; - this.descriptionLabel.Size = new System.Drawing.Size(202, 19); + this.descriptionLabel.Size = new System.Drawing.Size(202, 36); this.descriptionLabel.TabIndex = 9; this.descriptionLabel.Text = "description"; this.descriptionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -153,9 +153,9 @@ // this.titleLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.titleLabel.ForeColor = System.Drawing.Color.White; - this.titleLabel.Location = new System.Drawing.Point(109, 70); + this.titleLabel.Location = new System.Drawing.Point(109, 71); this.titleLabel.Name = "titleLabel"; - this.titleLabel.Size = new System.Drawing.Size(202, 19); + this.titleLabel.Size = new System.Drawing.Size(202, 16); this.titleLabel.TabIndex = 8; this.titleLabel.Text = "title"; this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -164,9 +164,9 @@ // this.fileLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.fileLabel.ForeColor = System.Drawing.Color.White; - this.fileLabel.Location = new System.Drawing.Point(109, 43); + this.fileLabel.Location = new System.Drawing.Point(109, 44); this.fileLabel.Name = "fileLabel"; - this.fileLabel.Size = new System.Drawing.Size(202, 19); + this.fileLabel.Size = new System.Drawing.Size(202, 16); this.fileLabel.TabIndex = 7; this.fileLabel.Text = "file"; this.fileLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -175,9 +175,9 @@ // this.versionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.versionLabel.ForeColor = System.Drawing.Color.White; - this.versionLabel.Location = new System.Drawing.Point(109, 16); + this.versionLabel.Location = new System.Drawing.Point(109, 17); this.versionLabel.Name = "versionLabel"; - this.versionLabel.Size = new System.Drawing.Size(202, 19); + this.versionLabel.Size = new System.Drawing.Size(202, 16); this.versionLabel.TabIndex = 6; this.versionLabel.Text = "version"; this.versionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/Images/UpdateNotify.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-20 21:21:50 UTC (rev 4684) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-21 19:34:13 UTC (rev 4685) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-24 18:57:24
|
Revision: 4686 http://sourceforge.net/p/mp-plugins/code/4686 Author: nicsergio Date: 2013-11-24 18:57:20 +0000 (Sun, 24 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/My.Common.csproj 2013-11-24 18:57:20 UTC (rev 4686) @@ -81,7 +81,11 @@ <Content Include="Resources\Images\TreeViewIcons\Games.png" /> <Content Include="Resources\Images\TreeViewIcons\Home.png" /> <Content Include="Resources\Images\TreeViewIcons\Htpcinfo.png" /> + <Content Include="Resources\Images\TreeViewIcons\IMDb-MP.png" /> + <Content Include="Resources\Images\TreeViewIcons\IMDb-MV.png" /> + <Content Include="Resources\Images\TreeViewIcons\IMDb.png" /> <Content Include="Resources\Images\TreeViewIcons\Internet.png" /> + <Content Include="Resources\Images\TreeViewIcons\iTunes.png" /> <Content Include="Resources\Images\TreeViewIcons\LastFM.png" /> <Content Include="Resources\Images\TreeViewIcons\Movies.png" /> <Content Include="Resources\Images\TreeViewIcons\MovingPictures.png" /> @@ -107,7 +111,10 @@ <Content Include="Resources\Images\TreeViewIcons\TvSeries.png" /> <Content Include="Resources\Images\TreeViewIcons\Twitter.png" /> <Content Include="Resources\Images\TreeViewIcons\Weather.png" /> + <Content Include="Resources\Images\TreeViewIcons\WeatherLite.png" /> <Content Include="Resources\Images\TreeViewIcons\Wikipedia.png" /> + <Content Include="Resources\Images\TreeViewIcons\YouTube-MP.png" /> + <Content Include="Resources\Images\TreeViewIcons\YouTube-MV.png" /> <Content Include="Resources\Images\TreeViewIcons\YouTube.png" /> <Content Include="Resources\XmlFiles\PopularSkinLinks.xml"> <SubType>Designer</SubType> @@ -122,6 +129,7 @@ <DependentUpon>VersionInfo.cs</DependentUpon> </EmbeddedResource> </ItemGroup> + <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. Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MP.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb-MV.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/IMDb.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Movies.png =================================================================== (Binary files differ) Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/Trailers.png =================================================================== (Binary files differ) Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/WeatherLite.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MP.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/YouTube-MV.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png =================================================================== (Binary files differ) Index: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png 2013-11-24 18:57:20 UTC (rev 4686) Property changes on: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/Images/TreeViewIcons/iTunes.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-24 18:57:20 UTC (rev 4686) @@ -12,6 +12,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>BasicHome.png</IconList> + <Menu>False</Menu> <SubItems> <SubItem> @@ -26,6 +27,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Home.png</IconList> + <Menu>False</Menu> </SubItem> </SubItems> @@ -43,6 +45,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>TV.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -57,6 +60,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>TvSeries.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -71,6 +75,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>TvRecs.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -85,6 +90,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>TvGuide.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -99,6 +105,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Teletext.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -107,15 +114,31 @@ <XmlFile>mytvFullScreen</XmlFile> <WindowID>602</WindowID> <LoadParameter></LoadParameter> - <BackgroundImage>hover_my tv.png</BackgroundImage> + <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> <Icon></Icon> <Overlay></Overlay> <IconList>Fullscreen.png</IconList> + <Menu>False</Menu> </SubItem> <SubItem> + <Context>WATCH</Context> + <Caption>TELETEXT FULLSCREEN</Caption> + <XmlFile>myfsteletext</XmlFile> + <WindowID>7701</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>Fullscreen.png</IconList> + <Menu>False</Menu> + </SubItem> + + <SubItem> <Context>CONFIGURE</Context> <Caption>TV SETTINGS</Caption> <XmlFile>settings_tv</XmlFile> @@ -127,6 +150,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> @@ -144,6 +168,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Movies.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -158,6 +183,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>MovingPictures.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -172,36 +198,40 @@ <Icon></Icon> <Overlay></Overlay> <IconList>MyFilms.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> <Context>WATCH</Context> - <Caption>TRAILERS (iTunes)</Caption> + <Caption>TRAILERS (IMDb)</Caption> <XmlFile>myonlinevideos</XmlFile> <WindowID>4755</WindowID> - <LoadParameter>site:iTunes Movie Trailers|return:Locked</LoadParameter> + <LoadParameter>site:IMDb Movie Trailers|return:Locked</LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> <Icon></Icon> <Overlay></Overlay> - <IconList>Trailers.png</IconList> + <IconList>IMDb.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> <Context>WATCH</Context> - <Caption>TRAILERS (IMDb)</Caption> + <Caption>TRAILERS (iTunes)</Caption> <XmlFile>myonlinevideos</XmlFile> <WindowID>4755</WindowID> - <LoadParameter>site:IMDb Movie Trailers|return:Locked</LoadParameter> + <LoadParameter>site:iTunes Movie Trailers|return:Locked</LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder>Trailers</BackgroundFolder> <FanartHandler></FanartHandler> <Icon></Icon> <Overlay></Overlay> - <IconList>Trailers.png</IconList> + <IconList>iTunes.png</IconList> + <Menu>True</Menu> </SubItem> + <SubItem> <Context>WATCH YOUR</Context> <Caption>VIDEOS (DB)</Caption> @@ -214,6 +244,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Movies.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -228,6 +259,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>DVD.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -242,6 +274,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>BD.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -256,6 +289,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>ShowTimes.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -270,6 +304,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Trakt.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -284,6 +319,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Fullscreen.png</IconList> + <Menu>False</Menu> </SubItem> <SubItem> @@ -298,12 +334,91 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> - </Item> + </Item> <Item> + <Context>WATCH</Context> + <Caption>TRAILERS (for the selected item)</Caption> + <XmlFile>-</XmlFile> + <WindowID>11899</WindowID> + <LoadParameter></LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>Trailers.png</IconList> + <Menu>False</Menu> + <SubItems> + + <SubItem> + <Context>WATCH</Context> + <Caption>IMDB TRAILER (MovingPictures item)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:IMDb Movie Trailers|search:(#MovingPictures.SelectedMovie.imdb_id)|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>IMDb-MP.png</IconList> + <Menu>False</Menu> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>YOUTUBE TRAILER (MovingPictures item)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:YouTube|search:(#MovingPictures.SelectedMovie.title)|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>YouTube-MP.png</IconList> + <Menu>False</Menu> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>IMDB TRAILER (MyVideos item)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:IMDb Movie Trailers|search:(#imdbnumber)|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>IMDb-MV.png</IconList> + <Menu>False</Menu> + </SubItem> + + <SubItem> + <Context>WATCH</Context> + <Caption>YOUTUBE TRAILER (MyVideos item)</Caption> + <XmlFile>myonlinevideos</XmlFile> + <WindowID>4755</WindowID> + <LoadParameter>site:YouTube|search:(#title)|return:Locked</LoadParameter> + <BackgroundImage></BackgroundImage> + <BackgroundFolder></BackgroundFolder> + <FanartHandler></FanartHandler> + <Icon></Icon> + <Overlay></Overlay> + <IconList>YouTube-MV.png</IconList> + <Menu>False</Menu> + </SubItem> + + </SubItems> + </Item> + + <Item> <Context>LISTEN TO</Context> <Caption>MUSIC</Caption> <XmlFile>mymusicsongs</XmlFile> @@ -315,6 +430,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Music.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -329,6 +445,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>MusicPlaylists.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -343,6 +460,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>MusicPlaying.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -357,6 +475,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>MyLyrics.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -371,6 +490,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Music.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -385,6 +505,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Radio.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -399,6 +520,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>LastFM.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -413,6 +535,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>mvCentral.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -427,6 +550,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> @@ -444,6 +568,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Pictures.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -458,6 +583,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> @@ -475,11 +601,12 @@ <Icon></Icon> <Overlay>WeatherPanelBig</Overlay> <IconList>Weather.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> <Context>CHECK THE</Context> - <Caption>WEATHER (LITE)</Caption> + <Caption>WEATHER (lite)</Caption> <XmlFile>WorldWeatherLite</XmlFile> <WindowID>79770</WindowID> <LoadParameter></LoadParameter> @@ -488,7 +615,8 @@ <FanartHandler></FanartHandler> <Icon></Icon> <Overlay>WeatherPanelBig</Overlay> - <IconList>Weather.png</IconList> + <IconList>WeatherLite.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> @@ -506,6 +634,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Internet.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -520,6 +649,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>OnlineVideos.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -534,6 +664,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>YouTube.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -548,6 +679,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Wikipedia.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -562,6 +694,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>News.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -576,6 +709,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Twitter.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> @@ -593,6 +727,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Plugins.png</IconList> + <Menu>True</Menu> <SubItems> <SubItem> @@ -607,6 +742,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>HtpcInfo.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -621,6 +757,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Games.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -635,6 +772,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>FileExplorer.png</IconList> + <Menu>True</Menu> </SubItem> <SubItem> @@ -649,6 +787,7 @@ <Icon></Icon> <Overlay></Overlay> <IconList>Settings.png</IconList> + <Menu>True</Menu> </SubItem> </SubItems> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-24 18:57:20 UTC (rev 4686) @@ -55,7 +55,7 @@ #endregion #region Costruttore - public MediaPortalSkin(string skinName, string skinsPath, string cachesPath, bool excludeHome, bool excludeFS) + public MediaPortalSkin(string skinName, string skinsPath, string cachesPath, bool onlyMenuItems) { //Costruttore Name = skinName; //--> nome della skin _paths.Skin = skinsPath + Name + @"\"; //--> percorso skin @@ -84,12 +84,12 @@ catch { } } - _initialized = GetSkinFiles(excludeHome, excludeFS) && GetSkinLinks(); //--> raccolta file della skin (con ID) e link + _initialized = GetSkinFiles(onlyMenuItems) && GetSkinLinks(onlyMenuItems); //--> raccolta file della skin (con ID) e link } #endregion #region Metodi Privati - private bool GetSkinFiles(bool excludeHome, bool excludeFS) //Raccolta dei file della skin + private bool GetSkinFiles(bool onlyMenuItems) //Raccolta dei file della skin { if (!Directory.Exists(_paths.Skin)) { @@ -101,7 +101,7 @@ { try { - if (!file.ToLower().StartsWith("common") && !file.ToLower().Contains("dialog") && !file.ToLower().Contains("wizard") && !file.ToLower().Contains("overlay") && ((!file.ToLower().EndsWith("myhome.xml") && !file.ToLower().EndsWith("basichome.xml")) || !excludeHome) && (!file.ToLower().Contains("fullscreen") || !excludeFS) && file.ToLower().EndsWith(".xml")) + if (!file.ToLower().StartsWith("common") && !file.ToLower().Contains("dialog") && !file.ToLower().Contains("wizard") && !file.ToLower().Contains("overlay") && (!onlyMenuItems || (!file.ToLower().EndsWith("myhome.xml") && !file.ToLower().EndsWith("basichome.xml") && !file.ToLower().Contains("fullscreen"))) && file.ToLower().EndsWith(".xml")) { XmlDocument xmlFile = new XmlDocument(); xmlFile.Load(file); @@ -126,7 +126,7 @@ return false; } } - private bool GetSkinLinks() //Raccolta dei link predefiniti per la skin + private bool GetSkinLinks(bool onlyMenuItems) //Raccolta dei link predefiniti per la skin { XmlDocument xmlFile = new XmlDocument(); try @@ -145,11 +145,11 @@ XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/Items/Item"); foreach (XmlNode node in nodeList) //Iterazione per memorizzazione links { - if (AddLink(node, true)) //Se nodo padre aggiunto + if (AddLink(node, true, onlyMenuItems)) //Se nodo padre aggiunto { XmlNodeList subNodeList = node.SelectNodes("SubItems/SubItem"); foreach (XmlNode subNode in subNodeList) //Iterazione per memorizzazione links figli - AddLink(subNode, false); //--> aggiunta nodi figli + AddLink(subNode, false, onlyMenuItems); //--> aggiunta nodi figli } } if (_skinLinks.Count > 0) @@ -160,10 +160,14 @@ return false; } } - private bool AddLink(XmlNode node, bool isFather) //Aggiunta link + private bool AddLink(XmlNode node, bool isFather, bool onlyMenuItems) //Aggiunta link { + XmlNode innerNode = node.SelectSingleNode("Menu"); + if (onlyMenuItems && (innerNode == null || innerNode.InnerText.ToLower() != "true" )) + return false; + SkinLink popularLink = new SkinLink(); - XmlNode innerNode = node.SelectSingleNode("Context"); + innerNode = node.SelectSingleNode("Context"); if (innerNode != null) popularLink.Context = innerNode.InnerText; innerNode = node.SelectSingleNode("Caption"); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-11-24 18:57:20 UTC (rev 4686) @@ -106,17 +106,18 @@ this.Opacity = 1; } #endregion - - + #region Eventi Visita Links private void forumLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { Process.Start(e.Link.LinkData.ToString()); + e.Link.Visited = true; } - private void wikiLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { Process.Start(e.Link.LinkData.ToString()); + e.Link.Visited = true; } + #endregion private void okPictureBox_Click(object sender, EventArgs e) { this.Close(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.cs 2013-11-24 18:57:20 UTC (rev 4686) @@ -8,11 +8,12 @@ namespace ProcessPlugins.ShortCuter { - internal class ShortCuter : IPlugin //Classe gestore shortcuts + public class ShortCuter : IPlugin //Classe gestore shortcuts { #region Dati private ShortCuts myShortCuts; //Istanza classe ShortCuts (dati relativi ai shortcuts configurati) private static readonly string LogPrefix; //Prefisso per log eventi + private const int TrailersPluginControlID = 11899; //ID controllo per attivazione plugin Trailers #endregion #region Costruttore @@ -61,16 +62,42 @@ if (sc.SoundEffect.Length > 0) Utils.PlaySound(sc.SoundEffect, false, true); //--> eventuale effetto sonoro - if (sc.LoadParameter.Length > 0) //Richiamo schermata con parametri di caricamento + if (sc.LoadParameter.Length > 0) //Se richiesti parametri di caricamento { - string sm = GUIPropertyManager.GetProperty("#MovingPictures.SelectedMovie.title"); - MpLog(false, "SSSM:" + sm); - - GUIWindowManager.ActivateWindow(sc.WindowID, sc.LoadParameter, true); + bool loadParameterChange = false; + string loadParameter = sc.LoadParameter; + while (true) //Ricerca eventuali GUIProperties + { + int i = loadParameter.IndexOf("(#"), ii = 0; + if (i >= 0) + ii = loadParameter.IndexOf(")", i); + if (i >= 0 && (ii > i)) + { + string propName = loadParameter.Remove(ii).Remove(0, i + 1); + if (propName.Length > 0) + { + loadParameter = loadParameter.Remove(i) + GUIPropertyManager.GetProperty(propName).Trim() + loadParameter.Remove(0, ii + 1); + loadParameterChange = true; + } + else + break; + } + else + break; + } + if (loadParameterChange) //Eventuale log parametri di caricamento definitivi + MpLog(false, "GUIProperties replaced, LoadParameter=[" + loadParameter + "]"); + + GUIWindowManager.ActivateWindow(sc.WindowID, loadParameter, true); //--> richiamo schermata con parametri di caricamento } else //Richiamo schermata senza parametri di caricamento { - GUIMessage msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, sc.WindowID, 0, null); + GUIMessage msg; + if (sc.WindowID == TrailersPluginControlID) //Se richiesta di attivazione plugin Trailers + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_CLICKED, 0, TrailersPluginControlID, TrailersPluginControlID, 0, 0, null); + else //Caso normale di attivazione finesta MediaPortal + msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, sc.WindowID, 0, null); + GUIWindowManager.SendMessage(msg); //GUIGraphicsContext.SendMessage(msg); //Metodo usato dal vecchio plugin } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-24 18:57:20 UTC (rev 4686) @@ -47,7 +47,8 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <StartupObject>ProcessPlugins.ShortCuter.Program</StartupObject> + <StartupObject> + </StartupObject> </PropertyGroup> <PropertyGroup> <ApplicationIcon>Resources\Images\ShortCuter.ico</ApplicationIcon> @@ -173,6 +174,7 @@ </Content> <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> + <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BasicHome.png"> <Link>Resources\Images\TreeViewIcons\BasicHome.png</Link> @@ -198,9 +200,18 @@ <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Htpcinfo.png"> <Link>Resources\Images\TreeViewIcons\Htpcinfo.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\IMDb-MP.png"> + <Link>Resources\Images\TreeViewIcons\IMDb-MP.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\IMDb.png"> + <Link>Resources\Images\TreeViewIcons\IMDb.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Internet.png"> <Link>Resources\Images\TreeViewIcons\Internet.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\iTunes.png"> + <Link>Resources\Images\TreeViewIcons\iTunes.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\LastFM.png"> <Link>Resources\Images\TreeViewIcons\LastFM.png</Link> </EmbeddedResource> @@ -276,16 +287,29 @@ <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Weather.png"> <Link>Resources\Images\TreeViewIcons\Weather.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\WeatherLite.png"> + <Link>Resources\Images\TreeViewIcons\WeatherLite.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Wikipedia.png"> <Link>Resources\Images\TreeViewIcons\Wikipedia.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube-MP.png"> + <Link>Resources\Images\TreeViewIcons\YouTube-MP.png</Link> + </EmbeddedResource> <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube.png"> <Link>Resources\Images\TreeViewIcons\YouTube.png</Link> </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\IMDb-MV.png"> + <Link>Resources\Images\TreeViewIcons\IMDb-MV.png</Link> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube-MV.png"> + <Link>Resources\Images\TreeViewIcons\YouTube-MV.png</Link> + </EmbeddedResource> <Content Include="Resources\Images\ShortCuter.ico" /> <EmbeddedResource Include="Resources\Images\ShortCuterDisable.png" /> <EmbeddedResource Include="Resources\Images\ShortCuterEnable.png" /> </ItemGroup> + <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/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-11-24 18:57:20 UTC (rev 4686) @@ -28,6 +28,7 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ShortCuterForm)); this.shortCutsDataGridView = new System.Windows.Forms.DataGridView(); @@ -38,12 +39,12 @@ this.skinFilesListBox = new System.Windows.Forms.ListBox(); this.linkPropertiesGroupBox = new System.Windows.Forms.GroupBox(); this.loadParameterGroupBox = new System.Windows.Forms.GroupBox(); - this.loadParameterLabel = new System.Windows.Forms.Label(); + this.loadParameterTextBox = new System.Windows.Forms.TextBox(); this.windowIdGroupBox = new System.Windows.Forms.GroupBox(); this.windowIdLabel = new System.Windows.Forms.Label(); this.skinFileGroupBox = new System.Windows.Forms.GroupBox(); this.skinFileLabel = new System.Windows.Forms.Label(); - this.toolTip = new System.Windows.Forms.ToolTip(); + this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.updateButton = new System.Windows.Forms.Button(); this.resetButton = new System.Windows.Forms.Button(); this.rowDownButton = new System.Windows.Forms.Button(); @@ -80,12 +81,12 @@ this.shortCutsDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.shortCutsDataGridView.ColumnHeadersHeight = 30; this.shortCutsDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - this.shortCutsDataGridView.Location = new System.Drawing.Point(12, 253); + this.shortCutsDataGridView.Location = new System.Drawing.Point(6, 314); this.shortCutsDataGridView.MultiSelect = false; this.shortCutsDataGridView.Name = "shortCutsDataGridView"; this.shortCutsDataGridView.RowHeadersWidth = 20; this.shortCutsDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; - this.shortCutsDataGridView.Size = new System.Drawing.Size(760, 297); + this.shortCutsDataGridView.Size = new System.Drawing.Size(782, 252); this.shortCutsDataGridView.TabIndex = 0; this.shortCutsDataGridView.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.shortCutsDataGridView_CellEndEdit); this.shortCutsDataGridView.CurrentCellChanged += new System.EventHandler(this.shortCutsDataGridView_CurrentCellChanged); @@ -98,10 +99,10 @@ 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(264, 10); + this.itemsTabControl.Location = new System.Drawing.Point(332, 19); this.itemsTabControl.Name = "itemsTabControl"; this.itemsTabControl.SelectedIndex = 0; - this.itemsTabControl.Size = new System.Drawing.Size(247, 208); + 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); @@ -112,7 +113,7 @@ 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, 182); + this.linksTabPage.Size = new System.Drawing.Size(322, 234); this.linksTabPage.TabIndex = 0; this.linksTabPage.Text = "Default Links"; this.linksTabPage.UseVisualStyleBackColor = true; @@ -124,7 +125,7 @@ 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, 173); + 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); @@ -136,7 +137,7 @@ 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, 182); + this.skinTabPage.Size = new System.Drawing.Size(322, 234); this.skinTabPage.TabIndex = 1; this.skinTabPage.Text = "Skin Files"; this.skinTabPage.UseVisualStyleBackColor = true; @@ -147,7 +148,7 @@ 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, 173); + this.skinFilesListBox.Size = new System.Drawing.Size(298, 225); this.skinFilesListBox.TabIndex = 0; this.skinFilesListBox.SelectedIndexChanged += new System.EventHandler(this.skinFilesListBox_SelectedIndexChanged); this.skinFilesListBox.DoubleClick += new System.EventHandler(this.skinFilesListBox_DoubleClick); @@ -159,34 +160,37 @@ this.linkPropertiesGroupBox.Controls.Add(this.windowIdGroupBox); this.linkPropertiesGroupBox.Controls.Add(this.skinFileGroupBox); this.linkPropertiesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.linkPropertiesGroupBox.Location = new System.Drawing.Point(513, 37); + this.linkPropertiesGroupBox.Location = new System.Drawing.Point(6, 41); this.linkPropertiesGroupBox.Name = "linkPropertiesGroupBox"; - this.linkPropertiesGroupBox.Size = new System.Drawing.Size(259, 141); + this.linkPropertiesGroupBox.Size = new System.Drawing.Size(320, 188); this.linkPropertiesGroupBox.TabIndex = 31; this.linkPropertiesGroupBox.TabStop = false; this.linkPropertiesGroupBox.Text = "Link Properties"; // // loadParameterGroupBox // - this.loadParameterGroupBox.Controls.Add(this.loadParameterLabel); + this.loadParameterGroupBox.Controls.Add(this.loadParameterTextBox); this.loadParameterGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.loadParameterGroupBox.Location = new System.Drawing.Point(4, 103); this.loadParameterGroupBox.Name = "loadParameterGroupBox"; - this.loadParameterGroupBox.Size = new System.Drawing.Size(250, 34); + this.loadParameterGroupBox.Size = new System.Drawing.Size(312, 81); this.loadParameterGroupBox.TabIndex = 37; this.loadParameterGroupBox.TabStop = false; this.loadParameterGroupBox.Text = "Load Parameter:"; // - // loadParameterLabel + // loadParameterTextBox // - this.loadParameterLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.loadParameterLabel.ForeColor = System.Drawing.Color.Blue; - this.loadParameterLabel.Location = new System.Drawing.Point(6, 16); - this.loadParameterLabel.Name = "loadParameterLabel"; - this.loadParameterLabel.Size = new System.Drawing.Size(237, 13); - this.loadParameterLabel.TabIndex = 6; - this.loadParameterLabel.Text = "-"; - this.loadParameterLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.loadParameterTextBox.BackColor = System.Drawing.SystemColors.Control; + this.loadParameterTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.loadParameterTextBox.ForeColor = System.Drawing.Color.Blue; + this.loadParameterTextBox.Location = new System.Drawing.Point(6, 19); + this.loadParameterTextBox.Multiline = true; + this.loadParameterTextBox.Name = "loadParameterTextBox"; + this.loadParameterTextBox.ReadOnly = true; + this.loadParameterTextBox.Size = new System.Drawing.Size(300, 50); + this.loadParameterTextBox.TabIndex = 39; + this.loadParameterTextBox.Text = "-"; + this.loadParameterTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // windowIdGroupBox // @@ -194,7 +198,7 @@ this.windowIdGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.windowIdGroupBox.Location = new System.Drawing.Point(4, 63); this.windowIdGroupBox.Name = "windowIdGroupBox"; - this.windowIdGroupBox.Size = new System.Drawing.Size(250, 34); + this.windowIdGroupBox.Size = new System.Drawing.Size(312, 34); this.windowIdGroupBox.TabIndex = 36; this.windowIdGroupBox.TabStop = false; this.windowIdGroupBox.Text = "Window ID:"; @@ -205,7 +209,7 @@ this.windowIdLabel.ForeColor = System.Drawing.Color.Blue; this.windowIdLabel.Location = new System.Drawing.Point(6, 16); this.windowIdLabel.Name = "windowIdLabel"; - this.windowIdLabel.Size = new System.Drawing.Size(237, 13); + this.windowIdLabel.Size = new System.Drawing.Size(300, 13); this.windowIdLabel.TabIndex = 6; this.windowIdLabel.Text = "-"; this.windowIdLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -216,7 +220,7 @@ this.skinFileGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.skinFileGroupBox.Location = new System.Drawing.Point(4, 23); this.skinFileGroupBox.Name = "skinFileGroupBox"; - this.skinFileGroupBox.Size = new System.Drawing.Size(250, 34); + this.skinFileGroupBox.Size = new System.Drawing.Size(312, 34); this.skinFileGroupBox.TabIndex = 6; this.skinFileGroupBox.TabStop = false; this.skinFileGroupBox.Text = "Skin File:"; @@ -227,7 +231,7 @@ this.skinFileLabel.ForeColor = System.Drawing.Color.Blue; this.skinFileLabel.Location = new System.Drawing.Point(6, 16); this.skinFileLabel.Name = "skinFileLabel"; - this.skinFileLabel.Size = new System.Drawing.Size(237, 13); + this.skinFileLabel.Size = new System.Drawing.Size(300, 13); this.skinFileLabel.TabIndex = 2; this.skinFileLabel.Text = "-"; this.skinFileLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -238,19 +242,20 @@ // // updateButton // - this.updateButton.Location = new System.Drawing.Point(513, 221); + this.updateButton.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); + this.updateButton.Location = new System.Drawing.Point(668, 274); this.updateButton.Name = "updateButton"; - this.updateButton.Size = new System.Drawing.Size(259, 23); + this.updateButton.Size = new System.Drawing.Size(120, 38); this.updateButton.TabIndex = 32; this.updateButton.Text = "Save and Close"; - this.updateButton.UseVisualStyleBackColor = true; + this.updateButton.UseVisualStyleBackColor = false; this.updateButton.Click += new System.EventHandler(this.updateButton_Click); // // resetButton // - this.resetButton.Location = new System.Drawing.Point(644, 191); + this.resetButton.Location = new System.Drawing.Point(668, 67); this.resetButton.Name = "resetButton"; - this.resetButton.Size = new System.Drawing.Size(128, 23); + this.resetButton.Size = new System.Drawing.Size(120, 23); this.resetButton.TabIndex = 33; this.resetButton.Text = "Reset Configuration"; this.resetButton.UseVisualStyleBackColor = true; @@ -261,7 +266,7 @@ this.rowDownButton.AutoSize = true; this.rowDownButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.rowDownButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowDown; - this.rowDownButton.Location = new System.Drawing.Point(164, 206); + this.rowDownButton.Location = new System.Drawing.Point(288, 274); this.rowDownButton.Name = "rowDownButton"; this.rowDownButton.Size = new System.Drawing.Size(38, 38); this.rowDownButton.TabIndex = 35; @@ -273,7 +278,7 @@ this.rowUpButton.AutoSize = true; this.rowUpButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.rowUpButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowUp; - this.rowUpButton.Location = new System.Drawing.Point(120, 206); + this.rowUpButton.Location = new System.Drawing.Point(244, 274); this.rowUpButton.Name = "rowUpButton"; this.rowUpButton.Size = new System.Drawing.Size(38, 38); this.rowUpButton.TabIndex = 34; @@ -283,7 +288,7 @@ // infoPictureBox // this.infoPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.Info; - this.infoPictureBox.Location = new System.Drawing.Point(759, 1); + this.infoPictureBox.Location = new System.Drawing.Point(769, 1); this.infoPictureBox.Name = "infoPictureBox"; this.infoPictureBox.Size = new System.Drawing.Size(24, 24); this.infoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -296,7 +301,7 @@ this.rowRemoveButton.AutoSize = true; this.rowRemoveButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.rowRemoveButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowRemove; - this.rowRemoveButton.Location = new System.Drawing.Point(56, 206); + this.rowRemoveButton.Location = new System.Drawing.Point(50, 274); this.rowRemoveButton.Name = "rowRemoveButton"; this.rowRemoveButton.Size = new System.Drawing.Size(38, 38); this.rowRemoveButton.TabIndex = 26; @@ -308,7 +313,7 @@ this.rowAddButton.AutoSize = true; this.rowAddButton.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.rowAddButton.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.RowAdd; - this.rowAddButton.Location = new System.Drawing.Point(12, 206); + this.rowAddButton.Location = new System.Drawing.Point(6, 274); this.rowAddButton.Name = "rowAddButton"; this.rowAddButton.Size = new System.Drawing.Size(38, 38); this.rowAddButton.TabIndex = 25; @@ -319,7 +324,7 @@ // this.propLeftPictureBox.Enabled = false; this.propLeftPictureBox.Image = global::ProcessPlugins.ShortCuter.Properties.Resources.ArrowDown; - this.propLeftPictureBox.Location = new System.Drawing.Point(322, 206); + this.propLeftPictureBox.Location = new System.Drawing.Point(322, 267); this.propLeftPictureBox.Name = "propLeftPictureBox"; this.propLeftPictureBox.Size = new System.Drawing.Size(131, 56); this.propLeftPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -329,9 +334,9 @@ // // saveButton // - this.saveButton.Location = new System.Drawing.Point(513, 191); + this.saveButton.Location = new System.Drawing.Point(668, 39); this.saveButton.Name = "saveButton"; - this.saveButton.Size = new System.Drawing.Size(128, 23); + this.saveButton.Size = new System.Drawing.Size(120, 23); this.saveButton.TabIndex = 36; this.saveButton.Text = "Save Configuration"; this.saveButton.UseVisualStyleBackColor = true; @@ -341,7 +346,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(784, 562); + this.ClientSize = new System.Drawing.Size(794, 572); this.Controls.Add(this.saveButton); this.Controls.Add(this.rowDownButton); this.Controls.Add(this.linkPropertiesGroupBox); @@ -369,6 +374,7 @@ this.skinTabPage.ResumeLayout(false); this.linkPropertiesGroupBox.ResumeLayout(false); this.loadParameterGroupBox.ResumeLayout(false); + this.loadParameterGroupBox.PerformLayout(); this.windowIdGroupBox.ResumeLayout(false); this.skinFileGroupBox.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); @@ -400,9 +406,9 @@ private System.Windows.Forms.GroupBox skinFileGroupBox; private System.Windows.Forms.Label skinFileLabel; private System.Windows.Forms.GroupBox loadParameterGroupBox; - private System.Windows.Forms.Label loadParameterLabel; private System.Windows.Forms.TreeView skinLinksTreeView; private System.Windows.Forms.Button saveButton; + private System.Windows.Forms.TextBox loadParameterTextBox; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-21 19:34:13 UTC (rev 4685) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-24 18:57:20 UTC (rev 4686) @@ -32,12 +32,16 @@ { skinFilesListBox.DataSource = mySkin.SkinFiles; skinFilesListBox.SelectedIndex = -1; - toolTip.SetToolTip(skinFilesListBox, "Double Click to Set the Link's Parameter to ShortCut"); mySkin.FillTreeViewSkinLinks(skinLinksTreeView); skinLinksTreeView.CollapseAll(); - toolTip.SetToolTip(skinLinksTreeView, "Double Click to Set the Link's Parameter to ShortCut"); FormatShortCutsGrid(); - toolTip.SetToolTip(infoPictureBox, "Version information"); + toolTip.SetToolTip(skinFilesListBox, "Double click to set the link's parameter to shortcut"); + toolTip.SetToolTip(skinLinksTreeView, "Double click to set the link's parameter to shortcut"); + toolTip.SetToolTip(rowAddButton, "Add shortcut to list"); + toolTip.SetToolTip(rowRemoveButton, "Remove selected shortcut from list"); + toolTip.SetToolTip(rowUpButton, "Move up selected shortcut in list"); + toolTip.SetToolTip(rowDownButton, "Move down selected shortcut in list"); + toolTip.SetToolTip(infoPictureBox, "Version information"); } private void FormatShortCutsGrid() //Formattazione (e popolazione) tabella shortcuts { @@ -91,8 +95,8 @@ DataGridViewTextBoxColumn loadParameterColumn = new DataG... [truncated message content] |
From: <nic...@us...> - 2013-11-24 22:11:54
|
Revision: 4687 http://sourceforge.net/p/mp-plugins/code/4687 Author: nicsergio Date: 2013-11-24 22:11:50 +0000 (Sun, 24 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Resources/XmlFiles/PopularSkinLinks.xml 2013-11-24 22:11:50 UTC (rev 4687) @@ -405,7 +405,7 @@ <Caption>YOUTUBE TRAILER (MyVideos item)</Caption> <XmlFile>myonlinevideos</XmlFile> <WindowID>4755</WindowID> - <LoadParameter>site:YouTube|search:(#title)|return:Locked</LoadParameter> + <LoadParameter>site:YouTube|search:(#selecteditem)|return:Locked</LoadParameter> <BackgroundImage></BackgroundImage> <BackgroundFolder></BackgroundFolder> <FanartHandler></FanartHandler> @@ -606,7 +606,7 @@ <SubItem> <Context>CHECK THE</Context> - <Caption>WEATHER (lite)</Caption> + <Caption>WEATHER (LITE)</Caption> <XmlFile>WorldWeatherLite</XmlFile> <WindowID>79770</WindowID> <LoadParameter></LoadParameter> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-11-24 22:11:50 UTC (rev 4687) @@ -164,7 +164,7 @@ { XmlNode innerNode = node.SelectSingleNode("Menu"); if (onlyMenuItems && (innerNode == null || innerNode.InnerText.ToLower() != "true" )) - return false; + return false; //Nel caso di raccolta dei soli elementi di menu, si saltano gli elementi non corrispondenti SkinLink popularLink = new SkinLink(); innerNode = node.SelectSingleNode("Context"); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Properties/AssemblyInfo.cs 2013-11-24 22:11:50 UTC (rev 4687) @@ -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.0.2.0")] -[assembly: AssemblyFileVersion("2.0.2.0")] +[assembly: AssemblyVersion("2.0.3.0")] +[assembly: AssemblyFileVersion("2.0.3.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/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-11-24 22:11:50 UTC (rev 4687) @@ -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>ProcessPlugins.ShortCuter</RootNamespace> <AssemblyName>ShortCuter</AssemblyName> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-11-24 22:11:50 UTC (rev 4687) @@ -502,5 +502,6 @@ return false; } #endregion + } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/SkinWithSounds.cs 2013-11-24 22:11:50 UTC (rev 4687) @@ -11,7 +11,7 @@ #endregion #region Costruttore - public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, false, false) + public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, false) { //Costruttore classe Skin _initialized = _initialized && GetSkinSounds(); //--> raccolta effetti sonori della skin } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-24 22:11:50 UTC (rev 4687) @@ -44,7 +44,7 @@ #endregion #region Costruttore - public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, true, true) + public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, true) { //Costruttore sotto-classe Skin _initialized = _initialized && GetSkinBackgroundImages(false) && GetSkinMultiImageFolders() Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-24 18:57:20 UTC (rev 4686) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-24 22:11:50 UTC (rev 4687) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> @@ -178,111 +178,111 @@ <Content Include="..\Common\Resources\Images\RowUp.png"> <Link>Resources\Images\RowUp.png</Link> </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\BD.png"> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\BD.png"> <Link>Resources\Images\TreeViewIcons\BD.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\DVD.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\DVD.png"> <Link>Resources\Images\TreeViewIcons\DVD.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\FileExplorer.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\FileExplorer.png"> <Link>Resources\Images\TreeViewIcons\FileExplorer.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Games.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Games.png"> <Link>Resources\Images\TreeViewIcons\Games.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Htpcinfo.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Htpcinfo.png"> <Link>Resources\Images\TreeViewIcons\Htpcinfo.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\IMDb.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\IMDb.png"> <Link>Resources\Images\TreeViewIcons\IMDb.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Internet.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Internet.png"> <Link>Resources\Images\TreeViewIcons\Internet.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\iTunes.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\iTunes.png"> <Link>Resources\Images\TreeViewIcons\iTunes.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\LastFM.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\LastFM.png"> <Link>Resources\Images\TreeViewIcons\LastFM.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Movies.png"> <Link>Resources\Images\TreeViewIcons\Movies.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\MovingPictures.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MovingPictures.png"> <Link>Resources\Images\TreeViewIcons\MovingPictures.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Music.png"> <Link>Resources\Images\TreeViewIcons\Music.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaying.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaying.png"> <Link>Resources\Images\TreeViewIcons\MusicPlaying.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaylists.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MusicPlaylists.png"> <Link>Resources\Images\TreeViewIcons\MusicPlaylists.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\mvCentral.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\mvCentral.png"> <Link>Resources\Images\TreeViewIcons\mvCentral.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\MyFilms.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyFilms.png"> <Link>Resources\Images\TreeViewIcons\MyFilms.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\MyLyrics.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\MyLyrics.png"> <Link>Resources\Images\TreeViewIcons\MyLyrics.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\News.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\News.png"> <Link>Resources\Images\TreeViewIcons\News.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\OnlineVideos.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\OnlineVideos.png"> <Link>Resources\Images\TreeViewIcons\OnlineVideos.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Pictures.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Pictures.png"> <Link>Resources\Images\TreeViewIcons\Pictures.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Plugins.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Plugins.png"> <Link>Resources\Images\TreeViewIcons\Plugins.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Radio.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Radio.png"> <Link>Resources\Images\TreeViewIcons\Radio.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Settings.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Settings.png"> <Link>Resources\Images\TreeViewIcons\Settings.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\ShowTimes.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\ShowTimes.png"> <Link>Resources\Images\TreeViewIcons\ShowTimes.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Teletext.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Teletext.png"> <Link>Resources\Images\TreeViewIcons\Teletext.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Trakt.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Trakt.png"> <Link>Resources\Images\TreeViewIcons\Trakt.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TV.png"> <Link>Resources\Images\TreeViewIcons\TV.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\TvGuide.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvGuide.png"> <Link>Resources\Images\TreeViewIcons\TvGuide.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\TvRecs.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvRecs.png"> <Link>Resources\Images\TreeViewIcons\TvRecs.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\TvSeries.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\TvSeries.png"> <Link>Resources\Images\TreeViewIcons\TvSeries.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Twitter.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Twitter.png"> <Link>Resources\Images\TreeViewIcons\Twitter.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Weather.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Weather.png"> <Link>Resources\Images\TreeViewIcons\Weather.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\WeatherLite.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\WeatherLite.png"> <Link>Resources\Images\TreeViewIcons\WeatherLite.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\Wikipedia.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\Wikipedia.png"> <Link>Resources\Images\TreeViewIcons\Wikipedia.png</Link> - </Content> - <Content Include="..\Common\Resources\Images\TreeViewIcons\YouTube.png"> + </EmbeddedResource> + <EmbeddedResource Include="..\Common\Resources\Images\TreeViewIcons\YouTube.png"> <Link>Resources\Images\TreeViewIcons\YouTube.png</Link> - </Content> + </EmbeddedResource> <Content Include="Resources\Images\UpdateNotify.png" /> <EmbeddedResource Include="..\Common\Resources\XmlFiles\PopularSkinLinks.xml"> <Link>Resources\XmlFiles\PopularSkinLinks.xml</Link> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-11-28 21:50:06
|
Revision: 4689 http://sourceforge.net/p/mp-plugins/code/4689 Author: nicsergio Date: 2013-11-28 21:50:03 +0000 (Thu, 28 Nov 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-11-28 21:50:03 UTC (rev 4689) @@ -16,6 +16,7 @@ public static readonly string Name; //Nome progetto public static readonly string Title; //Titolo public static readonly string File; //File binario + public static readonly string Path; //Percorso del file binario public static readonly string Version; //Versione public static readonly string Description; //Descrizione (breve) public static readonly string Author; //Autore @@ -29,6 +30,7 @@ Name = myAssembly.GetName().Name.ToString(); Title = ((AssemblyTitleAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyTitleAttribute), false)[0]).Title; File = System.IO.Path.GetFileName(myAssembly.Location); + Path = System.IO.Path.GetDirectoryName(myAssembly.Location) + @"\"; Version = myAssembly.GetName().Version.ToString(); Description = ((AssemblyDescriptionAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false)[0]).Description; Author = ((AssemblyCompanyAttribute)myAssembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), false)[0]).Company; Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-11-28 21:50:03 UTC (rev 4689) @@ -117,6 +117,9 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="okPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="okPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -167,6 +170,60 @@ AAAAAElFTkSuQmCC </value> </data> + <metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="headerLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="infoGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="buildDateLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="buildDateHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="forumLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="wikiLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="internetPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <data name="internetPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -222,4 +279,10 @@ CDnUhkr9VgAAAABJRU5ErkJggg== </value> </data> + <metadata name="commentLabel.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 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-11-28 21:50:03 UTC (rev 4689) @@ -29,6 +29,7 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -47,7 +48,6 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-11-28 21:50:03 UTC (rev 4689) @@ -86,12 +86,12 @@ this.subMenuRowDownButton = new System.Windows.Forms.Button(); this.subMenuRowUpButton = new System.Windows.Forms.Button(); this.subMenuListBox = new System.Windows.Forms.ListBox(); + this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox(); this.menuGroupBox = new System.Windows.Forms.GroupBox(); this.menuRowRemoveButton = new System.Windows.Forms.Button(); this.menuRowDownButton = new System.Windows.Forms.Button(); this.menuRowUpButton = new System.Windows.Forms.Button(); this.menuListBox = new System.Windows.Forms.ListBox(); - this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox(); this.backgroundImageTimer = new System.Windows.Forms.Timer(this.components); this.iconOpenFileDialog = new System.Windows.Forms.OpenFileDialog(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); @@ -106,6 +106,8 @@ this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox(); this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox(); this.arrowsPictureBox = new System.Windows.Forms.PictureBox(); + this.defaultItemLeftPanel = new System.Windows.Forms.Panel(); + this.defaultItemRightPanel = new System.Windows.Forms.Panel(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); this.skinTabPage.SuspendLayout(); @@ -124,8 +126,8 @@ ((System.ComponentModel.ISupportInitialize)(this.multiImageTimeTrackBar)).BeginInit(); this.defaultMenuItemGroupBox.SuspendLayout(); this.subMenuGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).BeginInit(); this.menuGroupBox.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).BeginInit(); @@ -783,8 +785,20 @@ this.subMenuListBox.SelectedIndexChanged += new System.EventHandler(this.subMenuListBox_SelectedIndexChanged); this.subMenuListBox.Enter += new System.EventHandler(this.subMenuListBox_Enter); // + // subMenuArrowPictureBox + // + this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight; + this.subMenuArrowPictureBox.Location = new System.Drawing.Point(148, 22); + this.subMenuArrowPictureBox.Name = "subMenuArrowPictureBox"; + this.subMenuArrowPictureBox.Size = new System.Drawing.Size(30, 30); + this.subMenuArrowPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.subMenuArrowPictureBox.TabIndex = 26; + this.subMenuArrowPictureBox.TabStop = false; + // // menuGroupBox // + this.menuGroupBox.Controls.Add(this.defaultItemRightPanel); + this.menuGroupBox.Controls.Add(this.defaultItemLeftPanel); this.menuGroupBox.Controls.Add(this.menuRowRemoveButton); this.menuGroupBox.Controls.Add(this.menuRowDownButton); this.menuGroupBox.Controls.Add(this.menuRowUpButton); @@ -796,6 +810,7 @@ this.menuGroupBox.TabIndex = 21; this.menuGroupBox.TabStop = false; this.menuGroupBox.Text = "Menu"; + this.menuGroupBox.Enter += new System.EventHandler(this.menuGroupBox_Enter); // // menuRowRemoveButton // @@ -845,16 +860,6 @@ this.menuListBox.SelectedIndexChanged += new System.EventHandler(this.menuListBox_SelectedIndexChanged); this.menuListBox.Enter += new System.EventHandler(this.menuListBox_Enter); // - // subMenuArrowPictureBox - // - this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight; - this.subMenuArrowPictureBox.Location = new System.Drawing.Point(148, 22); - this.subMenuArrowPictureBox.Name = "subMenuArrowPictureBox"; - this.subMenuArrowPictureBox.Size = new System.Drawing.Size(30, 30); - this.subMenuArrowPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.subMenuArrowPictureBox.TabIndex = 26; - this.subMenuArrowPictureBox.TabStop = false; - // // backgroundImageTimer // this.backgroundImageTimer.Interval = 2500; @@ -963,7 +968,7 @@ this.updateNotifyMenuPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.UpdateNotify; this.updateNotifyMenuPictureBox.Location = new System.Drawing.Point(773, 28); this.updateNotifyMenuPictureBox.Name = "updateNotifyMenuPictureBox"; - this.updateNotifyMenuPictureBox.Size = new System.Drawing.Size(40, 70); + this.updateNotifyMenuPictureBox.Size = new System.Drawing.Size(80, 70); this.updateNotifyMenuPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.updateNotifyMenuPictureBox.TabIndex = 30; this.updateNotifyMenuPictureBox.TabStop = false; @@ -974,7 +979,7 @@ this.updateNotifySubMenuPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.UpdateNotify; this.updateNotifySubMenuPictureBox.Location = new System.Drawing.Point(943, 28); this.updateNotifySubMenuPictureBox.Name = "updateNotifySubMenuPictureBox"; - this.updateNotifySubMenuPictureBox.Size = new System.Drawing.Size(40, 70); + this.updateNotifySubMenuPictureBox.Size = new System.Drawing.Size(80, 70); this.updateNotifySubMenuPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; this.updateNotifySubMenuPictureBox.TabIndex = 31; this.updateNotifySubMenuPictureBox.TabStop = false; @@ -991,6 +996,28 @@ this.arrowsPictureBox.TabIndex = 26; this.arrowsPictureBox.TabStop = false; // + // defaultItemLeftPanel + // + this.defaultItemLeftPanel.BackColor = System.Drawing.Color.DarkTurquoise; + this.defaultItemLeftPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.defaultItemLeftPanel.ForeColor = System.Drawing.Color.Black; + this.defaultItemLeftPanel.Location = new System.Drawing.Point(2, 25); + this.defaultItemLeftPanel.Name = "defaultItemLeftPanel"; + this.defaultItemLeftPanel.Size = new System.Drawing.Size(4, 17); + this.defaultItemLeftPanel.TabIndex = 22; + this.defaultItemLeftPanel.Visible = false; + // + // defaultItemRightPanel + // + this.defaultItemRightPanel.BackColor = System.Drawing.Color.DarkTurquoise; + this.defaultItemRightPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.defaultItemRightPanel.ForeColor = System.Drawing.Color.Black; + this.defaultItemRightPanel.Location = new System.Drawing.Point(144, 25); + this.defaultItemRightPanel.Name = "defaultItemRightPanel"; + this.defaultItemRightPanel.Size = new System.Drawing.Size(4, 17); + this.defaultItemRightPanel.TabIndex = 23; + this.defaultItemRightPanel.Visible = false; + // // BHEditorForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1044,9 +1071,9 @@ this.defaultMenuItemGroupBox.ResumeLayout(false); this.subMenuGroupBox.ResumeLayout(false); this.subMenuGroupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).EndInit(); this.menuGroupBox.ResumeLayout(false); this.menuGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).EndInit(); @@ -1136,6 +1163,8 @@ private System.Windows.Forms.PictureBox updateNotifyMenuPictureBox; private System.Windows.Forms.PictureBox updateNotifySubMenuPictureBox; private System.Windows.Forms.Timer updateNotifyTimer; + private System.Windows.Forms.Panel defaultItemLeftPanel; + private System.Windows.Forms.Panel defaultItemRightPanel; } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-11-28 21:50:03 UTC (rev 4689) @@ -7,6 +7,7 @@ using MediaPortal.Configuration; using MediaPortal.GUI.Library; using My.Common; +using System.Xml; namespace ProcessPlugins.XtremeMenuEditor @@ -755,6 +756,16 @@ #region Eventi Modifica Impostazioni Generali Menu private void defaultMenuItemComboBox_SelectedIndexChanged(object sender, EventArgs e) { + if (defaultMenuItemComboBox.SelectedIndex >= 0) + { + defaultItemLeftPanel.Top = 25 + defaultMenuItemComboBox.SelectedIndex * menuListBox.ItemHeight; + defaultItemLeftPanel.Visible = true; + } + else + defaultItemLeftPanel.Visible = false; + defaultItemRightPanel.Top = defaultItemLeftPanel.Top; + defaultItemRightPanel.Visible = defaultItemLeftPanel.Visible; + unsavedChanges = true; } private void showRssCheckBox_CheckedChanged(object sender, EventArgs e) @@ -928,5 +939,10 @@ return false; } #endregion + + private void menuGroupBox_Enter(object sender, EventArgs e) + { + + } } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-11-28 21:50:03 UTC (rev 4689) @@ -288,6 +288,12 @@ <metadata name="menuGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="defaultItemRightPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="defaultItemLeftPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="menuRowRemoveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -336,6 +342,12 @@ <metadata name="subMenuRowEditButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="updateNotifyMenuPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="updateNotifySubMenuPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="arrowsPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-11-28 21:50:03 UTC (rev 4689) @@ -44,8 +44,16 @@ #endregion #region Costruttore - public Skin(string skinName, string skinsPath, string cachesPath) : base(skinName, skinsPath, cachesPath, true) + public Skin(string skinName, string skinsPath, string cachesPath) : this(skinName, skinsPath, cachesPath, null) { } + public Skin(string skinName, string skinsPath, string cachesPath, string forceMedia) : base(skinName, skinsPath, cachesPath, true) { //Costruttore sotto-classe Skin + if (forceMedia != null) //Caso di forzatura percorso file multimediali skin + { + _paths.Media = _paths.Skin + forceMedia; //--> modifica percorso file multimediali skin + _paths.Animations = _paths.Media + @"Animations\"; //--> modifica percorso per animazioni (multi-image) skin + _paths.Icons = _paths.Media + @"Icons\"; //--> modifica eventuale percorso icone di menu della skin + } + _initialized = _initialized && GetSkinBackgroundImages(false) && GetSkinMultiImageFolders() && GetSkinIcons() @@ -232,7 +240,11 @@ { if (GetInstallPath() && GetPaths() && GetFanarts()) //--> lettura percorso di installazione, percorsi di configurazione/skin/cache/.. e raccolta elementi di Fanart disponibili { - SelectedSkin = new Skin(skinName, _paths.Skins, _paths.Caches); //--> istanziazione classe skin + string skinMod = skinName, mediaMod = null; + if (GetUserConfig(ref skinMod, ref mediaMod)) //Se presente il file di configurazione utente per l'assembly + SelectedSkin = new Skin(skinMod, _paths.Skins, _paths.Caches, mediaMod); //--> istanziazione classe skin (con eventuale personalizzazione parametri) + else + SelectedSkin = new Skin(skinName, _paths.Skins, _paths.Caches); //--> istanziazione classe skin (standard) _initialized = SelectedSkin.Initialized; //--> classe inizializzata } } @@ -389,6 +401,40 @@ incompletePath += @"\"; return incompletePath; } + private bool GetUserConfig(ref string skinName, ref string mediaFolder) //Procedura di lettura eventuale configurazione utente per l'assembly + { + string configFile = _paths.Config + Tools.MyAssembly.Name + ".Config.xml"; + + if (!File.Exists(configFile)) //Verifica presenza del file di configurazione + return false; + + FileStream fsConfigFile = null; + XmlDocument xmlConfigFile = new XmlDocument(); + try + { + fsConfigFile = new FileStream(configFile, FileMode.Open, FileAccess.Read); + xmlConfigFile.Load(fsConfigFile); //Lettura file xml di configurazione assembly + fsConfigFile.Close(); //--> chiusura file + + XmlNode configNode = xmlConfigFile.DocumentElement.SelectSingleNode("/Config"); + XmlNode innerNode = configNode.SelectSingleNode("SkinName"); + if (innerNode != null) + skinName = innerNode.InnerText; //--> personalizzazione nome skin + innerNode = configNode.SelectSingleNode("MediaFolder"); + if (innerNode != null) + mediaFolder = innerNode.InnerText; //--> personalizzazione percorso file multimediali skin + return true; //--> file di configurazione letto correttamente + } + catch + { + return false; //--> errore nella lettura del file di configurazione + } + finally + { + if (fsConfigFile != null) + fsConfigFile.Close(); //--> eventuale chiusura oggetto FileStream + } + } #endregion #region Metodi Pubblici Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Menu.cs 2013-11-28 21:50:03 UTC (rev 4689) @@ -318,18 +318,18 @@ mltImg.Close(); //--> chiusura file XmlNodeList controlsList = xmlMltImg.DocumentElement.SelectNodes("/window/controls/control"); - if (controlsList.Count != ItemsMaxNum) - { - Tools.ErrorMessage("Skin multi-image file not valid!", file); - return false; //--> file di definizione controlli multi-image skin non valido - } /* Problema nello skin engine: non si riesce a specificare l'elemento di default in maniera parametrica: viene quindi fissato il primo e si shiftano tutti gli elementi fino a portare al primo posto quello selezionato */ - for (int i = 0; i < controlsList.Count; i++) //Iterazione di modifica path controlli multi-image + int i = 0; + foreach (XmlNode control in controlsList) //Iterazione di modifica proprietà controlli multi-image { - controlsList[i].SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : ""); - controlsList[i].SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString(); + if (control.SelectSingleNode("type").InnerText.ToLower() == "multiimage" && i < ItemsMaxNum) + { + control.SelectSingleNode("imagepath").InnerText = ((i < _items.Count) ? _items[(i + _general.DefaultItemIndex) % _items.Count].BackgroundFolder : ""); + control.SelectSingleNode("timeperimage").InnerText = _general.MultiImageTime.ToString(); + i++; + } } mltImg = new FileStream(file, FileMode.Truncate, FileAccess.Write, FileShare.ReadWrite); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-26 17:35:50 UTC (rev 4688) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-11-28 21:50:03 UTC (rev 4689) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> @@ -67,6 +67,8 @@ </Reference> <Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> + <Reference Include="Microsoft.VisualBasic" /> + <Reference Include="Microsoft.VisualBasic.PowerPacks.Vs, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Web.Services" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-12-03 15:45:00
|
Revision: 4695 http://sourceforge.net/p/mp-plugins/code/4695 Author: nicsergio Date: 2013-12-03 15:44:57 +0000 (Tue, 03 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-02 06:05:06 UTC (rev 4694) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-03 15:44:57 UTC (rev 4695) @@ -25,6 +25,7 @@ GlobalSection(ProjectConfigurationPlatforms) = postSolution {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Any CPU.ActiveCfg = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|Mixed Platforms.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.ActiveCfg = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 @@ -43,7 +44,6 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Any CPU.Build.0 = Debug|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Debug|x86.ActiveCfg = Debug|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-12-02 06:05:06 UTC (rev 4694) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.Designer.cs 2013-12-03 15:44:57 UTC (rev 4695) @@ -61,18 +61,20 @@ this.overlayGroupBox = new System.Windows.Forms.GroupBox(); this.overlayLabel = new System.Windows.Forms.Label(); this.overlayComboBox = new System.Windows.Forms.ComboBox(); - this.labelTextBox = new System.Windows.Forms.TextBox(); + this.contextTextBox = new System.Windows.Forms.TextBox(); this.loadParameterLabel = new System.Windows.Forms.Label(); this.windowIdLabel = new System.Windows.Forms.Label(); this.skinFileLabel = new System.Windows.Forms.Label(); this.captionLabel = new System.Windows.Forms.Label(); - this.labelLabel = new System.Windows.Forms.Label(); + this.contextLabel = new System.Windows.Forms.Label(); this.menuPanel = new System.Windows.Forms.Panel(); this.creationGroupBox = new System.Windows.Forms.GroupBox(); this.createBackupCheckBox = new System.Windows.Forms.CheckBox(); this.clearCacheCheckBox = new System.Windows.Forms.CheckBox(); this.saveButton = new System.Windows.Forms.Button(); this.generalGroupBox = new System.Windows.Forms.GroupBox(); + this.showContextLabelCheckBox = new System.Windows.Forms.CheckBox(); + this.showSubMenuBackgroundCheckBox = new System.Windows.Forms.CheckBox(); this.multiImageTimeGroupBox = new System.Windows.Forms.GroupBox(); this.multiIMageTimeLabel = new System.Windows.Forms.Label(); this.multiImageTimeSecLabel = new System.Windows.Forms.Label(); @@ -86,12 +88,14 @@ this.subMenuRowDownButton = new System.Windows.Forms.Button(); this.subMenuRowUpButton = new System.Windows.Forms.Button(); this.subMenuListBox = new System.Windows.Forms.ListBox(); - this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox(); this.menuGroupBox = new System.Windows.Forms.GroupBox(); + this.defaultItemRightPanel = new System.Windows.Forms.Panel(); + this.defaultItemLeftPanel = new System.Windows.Forms.Panel(); this.menuRowRemoveButton = new System.Windows.Forms.Button(); this.menuRowDownButton = new System.Windows.Forms.Button(); this.menuRowUpButton = new System.Windows.Forms.Button(); this.menuListBox = new System.Windows.Forms.ListBox(); + this.subMenuArrowPictureBox = new System.Windows.Forms.PictureBox(); this.backgroundImageTimer = new System.Windows.Forms.Timer(this.components); this.iconOpenFileDialog = new System.Windows.Forms.OpenFileDialog(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); @@ -106,8 +110,6 @@ this.updateNotifyMenuPictureBox = new System.Windows.Forms.PictureBox(); this.updateNotifySubMenuPictureBox = new System.Windows.Forms.PictureBox(); this.arrowsPictureBox = new System.Windows.Forms.PictureBox(); - this.defaultItemLeftPanel = new System.Windows.Forms.Panel(); - this.defaultItemRightPanel = new System.Windows.Forms.Panel(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); this.skinTabPage.SuspendLayout(); @@ -126,8 +128,8 @@ ((System.ComponentModel.ISupportInitialize)(this.multiImageTimeTrackBar)).BeginInit(); this.defaultMenuItemGroupBox.SuspendLayout(); this.subMenuGroupBox.SuspendLayout(); + this.menuGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).BeginInit(); - this.menuGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).BeginInit(); @@ -224,12 +226,12 @@ this.propertiesGroupBox.Controls.Add(this.captionTextBox); this.propertiesGroupBox.Controls.Add(this.backgroundGroupBox); this.propertiesGroupBox.Controls.Add(this.overlayGroupBox); - this.propertiesGroupBox.Controls.Add(this.labelTextBox); + this.propertiesGroupBox.Controls.Add(this.contextTextBox); this.propertiesGroupBox.Controls.Add(this.loadParameterLabel); this.propertiesGroupBox.Controls.Add(this.windowIdLabel); this.propertiesGroupBox.Controls.Add(this.skinFileLabel); this.propertiesGroupBox.Controls.Add(this.captionLabel); - this.propertiesGroupBox.Controls.Add(this.labelLabel); + this.propertiesGroupBox.Controls.Add(this.contextLabel); this.propertiesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.propertiesGroupBox.Location = new System.Drawing.Point(1, 3); this.propertiesGroupBox.Name = "propertiesGroupBox"; @@ -248,7 +250,7 @@ this.iconGroupBox.Size = new System.Drawing.Size(324, 94); this.iconGroupBox.TabIndex = 14; this.iconGroupBox.TabStop = false; - this.iconGroupBox.Text = "Icon"; + this.iconGroupBox.Text = "Icon (Horus Theme)"; // // iconPictureBox // @@ -488,16 +490,16 @@ this.overlayComboBox.TabIndex = 18; this.overlayComboBox.TextChanged += new System.EventHandler(this.overlayComboBox_TextChanged); // - // labelTextBox + // contextTextBox // - this.labelTextBox.BackColor = System.Drawing.SystemColors.Window; - this.labelTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelTextBox.Location = new System.Drawing.Point(110, 26); - this.labelTextBox.Name = "labelTextBox"; - this.labelTextBox.Size = new System.Drawing.Size(158, 20); - this.labelTextBox.TabIndex = 2; - this.labelTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.labelTextBox.TextChanged += new System.EventHandler(this.labelTextBox_TextChanged); + this.contextTextBox.BackColor = System.Drawing.SystemColors.Window; + this.contextTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.contextTextBox.Location = new System.Drawing.Point(110, 26); + this.contextTextBox.Name = "contextTextBox"; + this.contextTextBox.Size = new System.Drawing.Size(158, 20); + this.contextTextBox.TabIndex = 2; + this.contextTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.contextTextBox.TextChanged += new System.EventHandler(this.labelTextBox_TextChanged); // // loadParameterLabel // @@ -543,16 +545,16 @@ this.captionLabel.Text = "Caption:"; this.captionLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // labelLabel + // contextLabel // - this.labelLabel.AutoSize = true; - this.labelLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.labelLabel.Location = new System.Drawing.Point(12, 29); - this.labelLabel.Name = "labelLabel"; - this.labelLabel.Size = new System.Drawing.Size(96, 15); - this.labelLabel.TabIndex = 0; - this.labelLabel.Text = "Label (optional):"; - this.labelLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.contextLabel.AutoSize = true; + this.contextLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.contextLabel.Location = new System.Drawing.Point(12, 29); + this.contextLabel.Name = "contextLabel"; + this.contextLabel.Size = new System.Drawing.Size(85, 15); + this.contextLabel.TabIndex = 0; + this.contextLabel.Text = "Context Label:"; + this.contextLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // menuPanel // @@ -619,6 +621,8 @@ // // generalGroupBox // + this.generalGroupBox.Controls.Add(this.showContextLabelCheckBox); + this.generalGroupBox.Controls.Add(this.showSubMenuBackgroundCheckBox); this.generalGroupBox.Controls.Add(this.multiImageTimeGroupBox); this.generalGroupBox.Controls.Add(this.defaultMenuItemGroupBox); this.generalGroupBox.Controls.Add(this.backgroundAnimatedCheckBox); @@ -631,6 +635,30 @@ this.generalGroupBox.TabStop = false; this.generalGroupBox.Text = "General Properties"; // + // showContextLabelCheckBox + // + this.showContextLabelCheckBox.AutoSize = true; + this.showContextLabelCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.showContextLabelCheckBox.Location = new System.Drawing.Point(178, 42); + this.showContextLabelCheckBox.Name = "showContextLabelCheckBox"; + this.showContextLabelCheckBox.Size = new System.Drawing.Size(116, 17); + this.showContextLabelCheckBox.TabIndex = 7; + this.showContextLabelCheckBox.Text = "Show context label"; + this.showContextLabelCheckBox.UseVisualStyleBackColor = true; + this.showContextLabelCheckBox.CheckedChanged += new System.EventHandler(this.showContextLabelCheckBox_CheckedChanged); + // + // showSubMenuBackgroundCheckBox + // + this.showSubMenuBackgroundCheckBox.AutoSize = true; + this.showSubMenuBackgroundCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.showSubMenuBackgroundCheckBox.Location = new System.Drawing.Point(12, 85); + this.showSubMenuBackgroundCheckBox.Name = "showSubMenuBackgroundCheckBox"; + this.showSubMenuBackgroundCheckBox.Size = new System.Drawing.Size(250, 17); + this.showSubMenuBackgroundCheckBox.TabIndex = 6; + this.showSubMenuBackgroundCheckBox.Text = "Show sub menu background (fast systems only)"; + this.showSubMenuBackgroundCheckBox.UseVisualStyleBackColor = true; + this.showSubMenuBackgroundCheckBox.CheckedChanged += new System.EventHandler(this.showSubMenuBackgroundCheckBox_CheckedChanged); + // // multiImageTimeGroupBox // this.multiImageTimeGroupBox.Controls.Add(this.multiIMageTimeLabel); @@ -681,9 +709,9 @@ // this.defaultMenuItemGroupBox.Controls.Add(this.defaultMenuItemComboBox); this.defaultMenuItemGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.defaultMenuItemGroupBox.Location = new System.Drawing.Point(6, 31); + this.defaultMenuItemGroupBox.Location = new System.Drawing.Point(6, 20); this.defaultMenuItemGroupBox.Name = "defaultMenuItemGroupBox"; - this.defaultMenuItemGroupBox.Size = new System.Drawing.Size(144, 52); + this.defaultMenuItemGroupBox.Size = new System.Drawing.Size(144, 55); this.defaultMenuItemGroupBox.TabIndex = 4; this.defaultMenuItemGroupBox.TabStop = false; this.defaultMenuItemGroupBox.Text = "Default menu item"; @@ -703,7 +731,7 @@ // this.backgroundAnimatedCheckBox.AutoSize = true; this.backgroundAnimatedCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.backgroundAnimatedCheckBox.Location = new System.Drawing.Point(178, 66); + this.backgroundAnimatedCheckBox.Location = new System.Drawing.Point(178, 62); this.backgroundAnimatedCheckBox.Name = "backgroundAnimatedCheckBox"; this.backgroundAnimatedCheckBox.Size = new System.Drawing.Size(130, 17); this.backgroundAnimatedCheckBox.TabIndex = 2; @@ -715,7 +743,7 @@ // this.showRssCheckBox.AutoSize = true; this.showRssCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.showRssCheckBox.Location = new System.Drawing.Point(178, 43); + this.showRssCheckBox.Location = new System.Drawing.Point(178, 20); this.showRssCheckBox.Name = "showRssCheckBox"; this.showRssCheckBox.Size = new System.Drawing.Size(78, 17); this.showRssCheckBox.TabIndex = 1; @@ -785,16 +813,6 @@ this.subMenuListBox.SelectedIndexChanged += new System.EventHandler(this.subMenuListBox_SelectedIndexChanged); this.subMenuListBox.Enter += new System.EventHandler(this.subMenuListBox_Enter); // - // subMenuArrowPictureBox - // - this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight; - this.subMenuArrowPictureBox.Location = new System.Drawing.Point(148, 22); - this.subMenuArrowPictureBox.Name = "subMenuArrowPictureBox"; - this.subMenuArrowPictureBox.Size = new System.Drawing.Size(30, 30); - this.subMenuArrowPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.subMenuArrowPictureBox.TabIndex = 26; - this.subMenuArrowPictureBox.TabStop = false; - // // menuGroupBox // this.menuGroupBox.Controls.Add(this.defaultItemRightPanel); @@ -810,8 +828,29 @@ this.menuGroupBox.TabIndex = 21; this.menuGroupBox.TabStop = false; this.menuGroupBox.Text = "Menu"; - this.menuGroupBox.Enter += new System.EventHandler(this.menuGroupBox_Enter); // + // defaultItemRightPanel + // + this.defaultItemRightPanel.BackColor = System.Drawing.Color.DarkTurquoise; + this.defaultItemRightPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.defaultItemRightPanel.ForeColor = System.Drawing.Color.Black; + this.defaultItemRightPanel.Location = new System.Drawing.Point(144, 25); + this.defaultItemRightPanel.Name = "defaultItemRightPanel"; + this.defaultItemRightPanel.Size = new System.Drawing.Size(4, 17); + this.defaultItemRightPanel.TabIndex = 23; + this.defaultItemRightPanel.Visible = false; + // + // defaultItemLeftPanel + // + this.defaultItemLeftPanel.BackColor = System.Drawing.Color.DarkTurquoise; + this.defaultItemLeftPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.defaultItemLeftPanel.ForeColor = System.Drawing.Color.Black; + this.defaultItemLeftPanel.Location = new System.Drawing.Point(2, 25); + this.defaultItemLeftPanel.Name = "defaultItemLeftPanel"; + this.defaultItemLeftPanel.Size = new System.Drawing.Size(4, 17); + this.defaultItemLeftPanel.TabIndex = 22; + this.defaultItemLeftPanel.Visible = false; + // // menuRowRemoveButton // this.menuRowRemoveButton.AutoSize = true; @@ -860,6 +899,16 @@ this.menuListBox.SelectedIndexChanged += new System.EventHandler(this.menuListBox_SelectedIndexChanged); this.menuListBox.Enter += new System.EventHandler(this.menuListBox_Enter); // + // subMenuArrowPictureBox + // + this.subMenuArrowPictureBox.Image = global::ProcessPlugins.XtremeMenuEditor.Properties.Resources.MiniArrowRight; + this.subMenuArrowPictureBox.Location = new System.Drawing.Point(148, 22); + this.subMenuArrowPictureBox.Name = "subMenuArrowPictureBox"; + this.subMenuArrowPictureBox.Size = new System.Drawing.Size(30, 30); + this.subMenuArrowPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.subMenuArrowPictureBox.TabIndex = 26; + this.subMenuArrowPictureBox.TabStop = false; + // // backgroundImageTimer // this.backgroundImageTimer.Interval = 2500; @@ -996,28 +1045,6 @@ this.arrowsPictureBox.TabIndex = 26; this.arrowsPictureBox.TabStop = false; // - // defaultItemLeftPanel - // - this.defaultItemLeftPanel.BackColor = System.Drawing.Color.DarkTurquoise; - this.defaultItemLeftPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.defaultItemLeftPanel.ForeColor = System.Drawing.Color.Black; - this.defaultItemLeftPanel.Location = new System.Drawing.Point(2, 25); - this.defaultItemLeftPanel.Name = "defaultItemLeftPanel"; - this.defaultItemLeftPanel.Size = new System.Drawing.Size(4, 17); - this.defaultItemLeftPanel.TabIndex = 22; - this.defaultItemLeftPanel.Visible = false; - // - // defaultItemRightPanel - // - this.defaultItemRightPanel.BackColor = System.Drawing.Color.DarkTurquoise; - this.defaultItemRightPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.defaultItemRightPanel.ForeColor = System.Drawing.Color.Black; - this.defaultItemRightPanel.Location = new System.Drawing.Point(144, 25); - this.defaultItemRightPanel.Name = "defaultItemRightPanel"; - this.defaultItemRightPanel.Size = new System.Drawing.Size(4, 17); - this.defaultItemRightPanel.TabIndex = 23; - this.defaultItemRightPanel.Visible = false; - // // BHEditorForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1071,9 +1098,9 @@ this.defaultMenuItemGroupBox.ResumeLayout(false); this.subMenuGroupBox.ResumeLayout(false); this.subMenuGroupBox.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).EndInit(); this.menuGroupBox.ResumeLayout(false); this.menuGroupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.subMenuArrowPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propRightPictureBox)).EndInit(); @@ -1111,12 +1138,12 @@ private System.Windows.Forms.GroupBox overlayGroupBox; private System.Windows.Forms.Label overlayLabel; private System.Windows.Forms.ComboBox overlayComboBox; - private System.Windows.Forms.TextBox labelTextBox; + private System.Windows.Forms.TextBox contextTextBox; private System.Windows.Forms.Label loadParameterLabel; private System.Windows.Forms.Label windowIdLabel; private System.Windows.Forms.Label skinFileLabel; private System.Windows.Forms.Label captionLabel; - private System.Windows.Forms.Label labelLabel; + private System.Windows.Forms.Label contextLabel; private System.Windows.Forms.PictureBox propLeftPictureBox; private System.Windows.Forms.PictureBox propRightPictureBox; private System.Windows.Forms.Panel menuPanel; @@ -1165,6 +1192,8 @@ private System.Windows.Forms.Timer updateNotifyTimer; private System.Windows.Forms.Panel defaultItemLeftPanel; private System.Windows.Forms.Panel defaultItemRightPanel; + private System.Windows.Forms.CheckBox showContextLabelCheckBox; + private System.Windows.Forms.CheckBox showSubMenuBackgroundCheckBox; } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-12-02 06:05:06 UTC (rev 4694) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.cs 2013-12-03 15:44:57 UTC (rev 4695) @@ -52,7 +52,9 @@ DefaultMenuItemRefresh(); defaultMenuItemComboBox.SelectedIndex = myMenu.GeneralDefaultItemIndex; showRssCheckBox.Checked = myMenu.GeneralShowRSS; + showContextLabelCheckBox.Checked = false; backgroundAnimatedCheckBox.Checked = myMenu.GeneralBackgroundAnimated; + showSubMenuBackgroundCheckBox.Checked = false; int multiImageTime = myMenu.GeneralMultiImageTime / 1000; multiImageTimeTrackBar.Value = ((multiImageTime >= multiImageTimeTrackBar.Minimum & multiImageTime <= multiImageTimeTrackBar.Maximum) ? multiImageTime : multiImageTimeTrackBar.Maximum); multiIMageTimeLabel.Text = multiImageTimeTrackBar.Value.ToString(); @@ -109,8 +111,8 @@ { case "skinFilesListBox": //Lista files della skin propertiesGroupBox.Text = propBoxText + " (Skin Files)"; - labelTextBox.Enabled= true; - labelTextBox.Text = ""; + contextTextBox.Enabled= true; + contextTextBox.Text = ""; captionTextBox.Text = ""; skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Name; windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinFiles[selectedIndex].Id.ToString(); @@ -138,8 +140,8 @@ case "skinLinksTreeView": //Lista links predefiniti della skin propertiesGroupBox.Text = propBoxText + " (Default Links)"; - labelTextBox.Enabled= true; - labelTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Context; + contextTextBox.Enabled= true; + contextTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Context; captionTextBox.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].Caption; skinFileShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].XmlFile; windowIdShowLabel.Text = myMediaPortal.SelectedSkin.SkinLinks[selectedIndex].WindowID.ToString(); @@ -185,8 +187,8 @@ case "menuListBox": //Lista elementi di menu propertiesGroupBox.Text = propBoxText + " (Menu)"; - labelTextBox.Enabled= true; - labelTextBox.Text = myMenu.Items[selectedIndex].Context; + contextTextBox.Enabled= true; + contextTextBox.Text = myMenu.Items[selectedIndex].Context; captionTextBox.Text = myMenu.Items[selectedIndex].Caption; skinFileShowLabel.Text = myMenu.Items[selectedIndex].XmlFile; windowIdShowLabel.Text = myMenu.Items[selectedIndex].Hyperlink.ToString(); @@ -234,8 +236,8 @@ if (menuListBox.SelectedIndex < 0) return; propertiesGroupBox.Text = propBoxText + " (Sub Menu)"; - labelTextBox.Enabled = false; - labelTextBox.Text = ""; + contextTextBox.Enabled = false; + contextTextBox.Text = ""; captionTextBox.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Caption; skinFileShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].XmlFile; windowIdShowLabel.Text = myMenu.Items[menuListBox.SelectedIndex].SubMenuItems[selectedIndex].Hyperlink.ToString(); @@ -395,7 +397,7 @@ return; } MenuItem mItem = new MenuItem(); - mItem.Context = labelTextBox.Text; + mItem.Context = contextTextBox.Text; mItem.Caption = captionTextBox.Text; mItem.XmlFile = skinFileShowLabel.Text; mItem.Hyperlink = Convert.ToInt32(windowIdShowLabel.Text); @@ -440,7 +442,7 @@ return; } - if (labelTextBox.Text.Length > 0 || multiImageRadioButton.Checked || fanartRadioButton.Checked || overlayComboBox.SelectedIndex > 0) + if (contextTextBox.Text.Length > 0 || multiImageRadioButton.Checked || fanartRadioButton.Checked || overlayComboBox.SelectedIndex > 0) Tools.InfoMessage("Sub-menu items limitations:\n" + " - only support single background image (no multi-image, no fanart)\n" + " - do not support overlay\n" + @@ -772,10 +774,18 @@ { unsavedChanges = true; } + private void showContextLabelCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } private void backgroundAnimatedCheckBox_CheckedChanged(object sender, EventArgs e) { unsavedChanges = true; } + private void showSubMenuBackgroundCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } private void multiImageTimeTrackBar_ValueChanged(object sender, EventArgs e) { unsavedChanges = true; @@ -939,10 +949,5 @@ return false; } #endregion - - private void menuGroupBox_Enter(object sender, EventArgs e) - { - - } - } + } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-12-02 06:05:06 UTC (rev 4694) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/BHEditorForm.resx 2013-12-03 15:44:57 UTC (rev 4695) @@ -210,7 +210,7 @@ <metadata name="overlayComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="labelTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="contextTextBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="loadParameterLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -225,7 +225,7 @@ <metadata name="captionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="labelLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="contextLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> <metadata name="menuPanel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -246,6 +246,12 @@ <metadata name="generalGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="showContextLabelCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="showSubMenuBackgroundCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="multiImageTimeGroupBox.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. |
From: <nic...@us...> - 2013-12-05 15:27:49
|
Revision: 4697 http://sourceforge.net/p/mp-plugins/code/4697 Author: nicsergio Date: 2013-12-05 15:27:44 +0000 (Thu, 05 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-03 20:05:38 UTC (rev 4696) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-05 15:27:44 UTC (rev 4697) @@ -66,8 +66,8 @@ { Graphics mGraphics = e.Graphics; Rectangle mArea = new Rectangle(0, 0, this.Width, this.Height); - LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.FromArgb(245, 251, 251), LinearGradientMode.ForwardDiagonal); - mGraphics.FillRectangle(mLGB, mArea); + LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.FromArgb(177, 192, 192), LinearGradientMode.ForwardDiagonal); + mGraphics.FillRectangle(mLGB, mArea);//Color.FromArgb(245, 251, 251) Rectangle r = new Rectangle(-1, -1, this.Width + 1, 36); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-03 20:05:38 UTC (rev 4696) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-05 15:27:44 UTC (rev 4697) @@ -30,7 +30,6 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Release|x86 - {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -48,6 +47,7 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-12-03 20:05:38 UTC (rev 4696) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-12-05 15:27:44 UTC (rev 4697) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}</ProjectGuid> - <OutputType>Library</OutputType> + <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.ShortCuter</RootNamespace> <AssemblyName>ShortCuter</AssemblyName> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-03 20:05:38 UTC (rev 4696) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-05 15:27:44 UTC (rev 4697) @@ -54,6 +54,11 @@ this.rowAddButton = new System.Windows.Forms.Button(); this.propLeftPictureBox = new System.Windows.Forms.PictureBox(); this.saveButton = new System.Windows.Forms.Button(); + this.overridesGroupBox = new System.Windows.Forms.GroupBox(); + this.capsLockComboBox = new System.Windows.Forms.ComboBox(); + this.capsLockLabel = new System.Windows.Forms.Label(); + this.numLockComboBox = new System.Windows.Forms.Label(); + this.comboBox2 = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); @@ -64,6 +69,7 @@ this.skinFileGroupBox.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).BeginInit(); + this.overridesGroupBox.SuspendLayout(); this.SuspendLayout(); // // shortCutsDataGridView @@ -160,9 +166,9 @@ this.linkPropertiesGroupBox.Controls.Add(this.windowIdGroupBox); this.linkPropertiesGroupBox.Controls.Add(this.skinFileGroupBox); this.linkPropertiesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.linkPropertiesGroupBox.Location = new System.Drawing.Point(6, 41); + this.linkPropertiesGroupBox.Location = new System.Drawing.Point(6, 19); this.linkPropertiesGroupBox.Name = "linkPropertiesGroupBox"; - this.linkPropertiesGroupBox.Size = new System.Drawing.Size(320, 188); + this.linkPropertiesGroupBox.Size = new System.Drawing.Size(320, 175); this.linkPropertiesGroupBox.TabIndex = 31; this.linkPropertiesGroupBox.TabStop = false; this.linkPropertiesGroupBox.Text = "Link Properties"; @@ -173,7 +179,7 @@ this.loadParameterGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.loadParameterGroupBox.Location = new System.Drawing.Point(4, 103); this.loadParameterGroupBox.Name = "loadParameterGroupBox"; - this.loadParameterGroupBox.Size = new System.Drawing.Size(312, 81); + this.loadParameterGroupBox.Size = new System.Drawing.Size(312, 68); this.loadParameterGroupBox.TabIndex = 37; this.loadParameterGroupBox.TabStop = false; this.loadParameterGroupBox.Text = "Load Parameter:"; @@ -187,7 +193,7 @@ this.loadParameterTextBox.Multiline = true; this.loadParameterTextBox.Name = "loadParameterTextBox"; this.loadParameterTextBox.ReadOnly = true; - this.loadParameterTextBox.Size = new System.Drawing.Size(300, 50); + this.loadParameterTextBox.Size = new System.Drawing.Size(300, 43); this.loadParameterTextBox.TabIndex = 39; this.loadParameterTextBox.Text = "-"; this.loadParameterTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -342,11 +348,66 @@ this.saveButton.UseVisualStyleBackColor = true; this.saveButton.Click += new System.EventHandler(this.saveButton_Click); // + // overridesGroupBox + // + this.overridesGroupBox.Controls.Add(this.numLockComboBox); + this.overridesGroupBox.Controls.Add(this.comboBox2); + this.overridesGroupBox.Controls.Add(this.capsLockLabel); + this.overridesGroupBox.Controls.Add(this.capsLockComboBox); + this.overridesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.overridesGroupBox.Location = new System.Drawing.Point(6, 200); + this.overridesGroupBox.Name = "overridesGroupBox"; + this.overridesGroupBox.Size = new System.Drawing.Size(320, 68); + this.overridesGroupBox.TabIndex = 37; + this.overridesGroupBox.TabStop = false; + this.overridesGroupBox.Text = "Overrides at Start-Up"; + // + // capsLockComboBox + // + this.capsLockComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.capsLockComboBox.FormattingEnabled = true; + this.capsLockComboBox.Location = new System.Drawing.Point(4, 40); + this.capsLockComboBox.Name = "capsLockComboBox"; + this.capsLockComboBox.Size = new System.Drawing.Size(140, 21); + this.capsLockComboBox.TabIndex = 0; + // + // capsLockLabel + // + this.capsLockLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.capsLockLabel.ForeColor = System.Drawing.Color.Blue; + this.capsLockLabel.Location = new System.Drawing.Point(4, 24); + this.capsLockLabel.Name = "capsLockLabel"; + this.capsLockLabel.Size = new System.Drawing.Size(140, 13); + this.capsLockLabel.TabIndex = 3; + this.capsLockLabel.Text = "Caps Lock"; + this.capsLockLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // numLockComboBox + // + this.numLockComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.numLockComboBox.ForeColor = System.Drawing.Color.Blue; + this.numLockComboBox.Location = new System.Drawing.Point(174, 24); + this.numLockComboBox.Name = "numLockComboBox"; + this.numLockComboBox.Size = new System.Drawing.Size(140, 13); + this.numLockComboBox.TabIndex = 5; + this.numLockComboBox.Text = "Num Lock"; + this.numLockComboBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // comboBox2 + // + this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox2.FormattingEnabled = true; + this.comboBox2.Location = new System.Drawing.Point(173, 40); + this.comboBox2.Name = "comboBox2"; + this.comboBox2.Size = new System.Drawing.Size(140, 21); + this.comboBox2.TabIndex = 4; + // // ShortCuterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(794, 572); + this.Controls.Add(this.overridesGroupBox); this.Controls.Add(this.saveButton); this.Controls.Add(this.rowDownButton); this.Controls.Add(this.linkPropertiesGroupBox); @@ -379,6 +440,7 @@ this.skinFileGroupBox.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).EndInit(); + this.overridesGroupBox.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -409,6 +471,11 @@ private System.Windows.Forms.TreeView skinLinksTreeView; private System.Windows.Forms.Button saveButton; private System.Windows.Forms.TextBox loadParameterTextBox; + private System.Windows.Forms.GroupBox overridesGroupBox; + private System.Windows.Forms.ComboBox capsLockComboBox; + private System.Windows.Forms.Label numLockComboBox; + private System.Windows.Forms.ComboBox comboBox2; + private System.Windows.Forms.Label capsLockLabel; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-12-03 20:05:38 UTC (rev 4696) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-12-05 15:27:44 UTC (rev 4697) @@ -186,6 +186,21 @@ <metadata name="saveButton.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="overridesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="numLockComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="comboBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="capsLockLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="capsLockComboBox.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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-12-05 20:23:56
|
Revision: 4698 http://sourceforge.net/p/mp-plugins/code/4698 Author: nicsergio Date: 2013-12-05 20:23:53 +0000 (Thu, 05 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs Added Paths: ----------- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Skin.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -2,12 +2,11 @@ using System.Collections.Generic; using System.Drawing; using System.IO; +using System.Linq; using System.Reflection; using System.Windows.Forms; using System.Xml; -using System.Linq; - namespace My.Common { internal class MediaPortalSkin //Classe per gestione elementare skin di MediaPortal Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/Tools.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -4,7 +4,6 @@ using System.Reflection; using System.Windows.Forms; - namespace My.Common { internal static class Tools //Collezione utilità @@ -109,7 +108,7 @@ gp.AddArc(r.X, r.Y + r.Height - hRadius, wRadius, hRadius, 90, 90); winControl.Region = new Region(gp); } + #endregion #endregion - #endregion } } Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -66,9 +66,8 @@ { Graphics mGraphics = e.Graphics; Rectangle mArea = new Rectangle(0, 0, this.Width, this.Height); - LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.FromArgb(177, 192, 192), LinearGradientMode.ForwardDiagonal); - mGraphics.FillRectangle(mLGB, mArea);//Color.FromArgb(245, 251, 251) - + LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.PaleTurquoise, LinearGradientMode.ForwardDiagonal); + mGraphics.FillRectangle(mLGB, mArea); Rectangle r = new Rectangle(-1, -1, this.Width + 1, 36); mLGB = new LinearGradientBrush(r, Color.Navy, Color.MediumTurquoise, LinearGradientMode.ForwardDiagonal); Added: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs (rev 0) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -0,0 +1,161 @@ +using System; +using System.ComponentModel; +using System.Runtime.InteropServices; +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Reflection; +using System.Windows.Forms; +using System.Collections.Generic; + + +namespace ProcessPlugins.ShortCuter +{ + internal static class LockKeys //Classe per gestione attivazione/disattivazione blocco maiuscole/numeri + { + #region Dati + //bool numLockReq = false, capsLockReq = false; //--> inizializzazione parametri (richiesta di impostazione OFF) + + + + public enum ForcingType + { + [Description("Force OFF")] + Off = 0, + [Description("Force ON")] + On = 1, + [Description("Not change")] + None = 2 + } + + #region Costanti + const int KEYEVENTF_EXTENDEDKEY = 0x1; //Da impostare come flag per far precedere il codice per la scansione HW dal byte 0xE0 (tasti estesi) + const int KEYEVENTF_KEYUP = 0x2; //Da impostare come flag per ottenere l'azione di rilascio del tasto + const int VK_NUMLOCK = 0x90; //Codice VirtualKey di NumLock + const int HK_NUMLOCK = 0x45; //Codice HardwareKey di NumLock (per scansione HW -> bScan) + const int VK_CAPITAL = 0x14; //Codice VirtualKey di CapsLock + const int SC_CAPITAL = 0x3A; //Codice HardwareKey di CapsLock (per scansione HW -> bScan) + #endregion + #endregion + + public static List<string> GetForcingTypes() + { + List<string> descriptions = new List<string>(); + foreach (LockKeys.ForcingType enumValue in Enum.GetValues(typeof(LockKeys.ForcingType))) + { + descriptions.Add(enumValue.GetDescription()); + } + return descriptions; + } + /* public static string GetDescription(this Enum currentEnum) + { + string description = String.Empty; + DescriptionAttribute da; + + FieldInfo fi = currentEnum.GetType(). + GetField(currentEnum.ToString()); + da = (DescriptionAttribute)Attribute.GetCustomAttribute(fi, + typeof(DescriptionAttribute)); + if (da != null) + description = da.Description; + else + description = currentEnum.ToString(); + + return description; + } + + public static string[] GetDescription(this Enum Enumeration) + { + string Value = Enumeration.ToString(); + Type EnumType = Enumeration.GetType(); + var DescAttribute = (DescriptionAttribute[])EnumType + .GetField(Value) + .GetCustomAttributes(typeof(DescriptionAttribute), false); + return DescAttribute.Length > 0 ? DescAttribute[0].Description : Value; + }*/ + public static string GetDescription(this Enum value) + { + Type type = value.GetType(); + string name = Enum.GetName(type, value); + if (name != null) + { + FieldInfo field = type.GetField(name); + if (field != null) + { + DescriptionAttribute attr = + Attribute.GetCustomAttribute(field, + typeof(DescriptionAttribute)) as DescriptionAttribute; + if (attr != null) + { + return attr.Description; + } + } + } + return null; + } + /*public static string[] GetDescriptions(this enum value) + { + Type type = value.GetType(); + string name = Enum.GetName(type, value); + if (name != null) + { + FieldInfo field = type.GetField(name); + if (field != null) + { + DescriptionAttribute attr = + Attribute.GetCustomAttribute(field, + typeof(DescriptionAttribute)) as DescriptionAttribute; + if (attr != null) + { + return attr.Description; + } + } + } + return null; + }*/ + /*static void Main(string[] args) //Chiamata applicazione con parametri: LockKeys X Y (X->NumLock Y->Capslock) + { + #region Verifica parametri + if (args.Count() > 0) //Verifica se parametro passato da riga di comando + if (args[0] == "1") + numLockReq = true; //--> richiesta di attivare NumLock + else if (args[0] == "0") + numLockReq = false; //--> richiesta di disattivare NumLock + else + numLockReq = Console.NumberLock; //--> altrimenti lo stato rimane invariato + + if (args.Count() > 1) //Verifica se parametro passato da riga di comando + if (args[1] == "1") + capsLockReq = true; //--> richiesta di attivare CapsLock + else if (args[1] == "0") + capsLockReq = false; //--> richiesta di disattivare CapsLock + else + capsLockReq = Console.CapsLock; //--> altrimenti lo stato rimane invariato + #endregion + + #region Azioni + if (numLockReq != Console.NumberLock) //Se richiesta diversa da stato attuale + { + //Simulazione pressione del tasto NumLock + keybd_event(VK_NUMLOCK, HK_NUMLOCK, KEYEVENTF_EXTENDEDKEY, (UIntPtr)0); + //Simulazione rilascio del tasto NumLock + keybd_event(VK_NUMLOCK, HK_NUMLOCK, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP, (UIntPtr)0); + } + if (capsLockReq != Console.CapsLock) //Se richiesta diversa da stato attuale + { + //Simulazione pressione del tasto CapsLock + keybd_event(VK_CAPITAL, SC_CAPITAL, 0, (UIntPtr)0); + //Simulazione rilascio del tasto CapsLock + keybd_event(VK_CAPITAL, SC_CAPITAL, KEYEVENTF_KEYUP, (UIntPtr)0); + } + #endregion + } + */ + + + #region Importazione DLL + //Simulazione eventi di tastiera + [DllImport("user32.dll")] + static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo); + #endregion + } +} Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuter.csproj 2013-12-05 20:23:53 UTC (rev 4698) @@ -93,6 +93,7 @@ </Compile> <Compile Include="KeyboardHookWorker.cs" /> <Compile Include="KeyboardHook.cs" /> + <Compile Include="LockKeys.cs" /> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\Resources.Designer.cs"> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -55,10 +55,10 @@ this.propLeftPictureBox = new System.Windows.Forms.PictureBox(); this.saveButton = new System.Windows.Forms.Button(); this.overridesGroupBox = new System.Windows.Forms.GroupBox(); - this.capsLockComboBox = new System.Windows.Forms.ComboBox(); - this.capsLockLabel = new System.Windows.Forms.Label(); this.numLockComboBox = new System.Windows.Forms.Label(); this.comboBox2 = new System.Windows.Forms.ComboBox(); + this.capsLockLabel = new System.Windows.Forms.Label(); + this.capsLockComboBox = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); @@ -362,30 +362,10 @@ this.overridesGroupBox.TabStop = false; this.overridesGroupBox.Text = "Overrides at Start-Up"; // - // capsLockComboBox - // - this.capsLockComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.capsLockComboBox.FormattingEnabled = true; - this.capsLockComboBox.Location = new System.Drawing.Point(4, 40); - this.capsLockComboBox.Name = "capsLockComboBox"; - this.capsLockComboBox.Size = new System.Drawing.Size(140, 21); - this.capsLockComboBox.TabIndex = 0; - // - // capsLockLabel - // - this.capsLockLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.capsLockLabel.ForeColor = System.Drawing.Color.Blue; - this.capsLockLabel.Location = new System.Drawing.Point(4, 24); - this.capsLockLabel.Name = "capsLockLabel"; - this.capsLockLabel.Size = new System.Drawing.Size(140, 13); - this.capsLockLabel.TabIndex = 3; - this.capsLockLabel.Text = "Caps Lock"; - this.capsLockLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // numLockComboBox // this.numLockComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numLockComboBox.ForeColor = System.Drawing.Color.Blue; + this.numLockComboBox.ForeColor = System.Drawing.SystemColors.ControlText; this.numLockComboBox.Location = new System.Drawing.Point(174, 24); this.numLockComboBox.Name = "numLockComboBox"; this.numLockComboBox.Size = new System.Drawing.Size(140, 13); @@ -396,12 +376,34 @@ // comboBox2 // this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.comboBox2.FormattingEnabled = true; this.comboBox2.Location = new System.Drawing.Point(173, 40); this.comboBox2.Name = "comboBox2"; this.comboBox2.Size = new System.Drawing.Size(140, 21); this.comboBox2.TabIndex = 4; // + // capsLockLabel + // + this.capsLockLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.capsLockLabel.ForeColor = System.Drawing.SystemColors.ControlText; + this.capsLockLabel.Location = new System.Drawing.Point(4, 24); + this.capsLockLabel.Name = "capsLockLabel"; + this.capsLockLabel.Size = new System.Drawing.Size(140, 13); + this.capsLockLabel.TabIndex = 3; + this.capsLockLabel.Text = "Caps Lock"; + this.capsLockLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // capsLockComboBox + // + this.capsLockComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.capsLockComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.capsLockComboBox.FormattingEnabled = true; + this.capsLockComboBox.Location = new System.Drawing.Point(4, 40); + this.capsLockComboBox.Name = "capsLockComboBox"; + this.capsLockComboBox.Size = new System.Drawing.Size(140, 21); + this.capsLockComboBox.TabIndex = 0; + // // ShortCuterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -35,6 +35,7 @@ mySkin.FillTreeViewSkinLinks(skinLinksTreeView); skinLinksTreeView.CollapseAll(); FormatShortCutsGrid(); + capsLockComboBox.DataSource = LockKeys.GetForcingTypes(); toolTip.SetToolTip(skinFilesListBox, "Double click to set the link's parameter to shortcut"); toolTip.SetToolTip(skinLinksTreeView, "Double click to set the link's parameter to shortcut"); toolTip.SetToolTip(rowAddButton, "Add shortcut to list"); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-12-05 15:27:44 UTC (rev 4697) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-12-05 20:23:53 UTC (rev 4698) @@ -1,11 +1,11 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using System.IO; using System.Reflection; -using System.Collections.Generic; using System.Text; +using System.Windows.Forms; using System.Xml; -using System.Windows.Forms; using MediaPortal.Profile; using My.Common; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-12-06 14:08:16
|
Revision: 4699 http://sourceforge.net/p/mp-plugins/code/4699 Author: nicsergio Date: 2013-12-06 14:08:13 +0000 (Fri, 06 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.Designer.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -83,7 +83,7 @@ // headerLabel // this.headerLabel.BackColor = System.Drawing.Color.Transparent; - this.headerLabel.Font = new System.Drawing.Font("Alien Encounters", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.headerLabel.Font = new System.Drawing.Font("Vineta BT", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.headerLabel.ForeColor = System.Drawing.Color.White; this.headerLabel.Location = new System.Drawing.Point(0, 0); this.headerLabel.Name = "headerLabel"; @@ -119,7 +119,7 @@ // buildDateLabel // this.buildDateLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buildDateLabel.ForeColor = System.Drawing.Color.White; + this.buildDateLabel.ForeColor = System.Drawing.Color.Navy; this.buildDateLabel.Location = new System.Drawing.Point(109, 152); this.buildDateLabel.Name = "buildDateLabel"; this.buildDateLabel.Size = new System.Drawing.Size(202, 16); @@ -130,7 +130,7 @@ // authorLabel // this.authorLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.authorLabel.ForeColor = System.Drawing.Color.White; + this.authorLabel.ForeColor = System.Drawing.Color.Navy; this.authorLabel.Location = new System.Drawing.Point(109, 125); this.authorLabel.Name = "authorLabel"; this.authorLabel.Size = new System.Drawing.Size(202, 16); @@ -141,7 +141,7 @@ // descriptionLabel // this.descriptionLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.descriptionLabel.ForeColor = System.Drawing.Color.White; + this.descriptionLabel.ForeColor = System.Drawing.Color.Navy; this.descriptionLabel.Location = new System.Drawing.Point(109, 88); this.descriptionLabel.Name = "descriptionLabel"; this.descriptionLabel.Size = new System.Drawing.Size(202, 36); @@ -152,7 +152,7 @@ // titleLabel // this.titleLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.titleLabel.ForeColor = System.Drawing.Color.White; + this.titleLabel.ForeColor = System.Drawing.Color.Navy; this.titleLabel.Location = new System.Drawing.Point(109, 71); this.titleLabel.Name = "titleLabel"; this.titleLabel.Size = new System.Drawing.Size(202, 16); @@ -163,7 +163,7 @@ // fileLabel // this.fileLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fileLabel.ForeColor = System.Drawing.Color.White; + this.fileLabel.ForeColor = System.Drawing.Color.Navy; this.fileLabel.Location = new System.Drawing.Point(109, 44); this.fileLabel.Name = "fileLabel"; this.fileLabel.Size = new System.Drawing.Size(202, 16); @@ -174,7 +174,7 @@ // versionLabel // this.versionLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.versionLabel.ForeColor = System.Drawing.Color.White; + this.versionLabel.ForeColor = System.Drawing.Color.Navy; this.versionLabel.Location = new System.Drawing.Point(109, 17); this.versionLabel.Name = "versionLabel"; this.versionLabel.Size = new System.Drawing.Size(202, 16); @@ -185,7 +185,7 @@ // versionHeaderLabel // this.versionHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.versionHeaderLabel.ForeColor = System.Drawing.Color.White; + this.versionHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.versionHeaderLabel.Location = new System.Drawing.Point(16, 16); this.versionHeaderLabel.Name = "versionHeaderLabel"; this.versionHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -196,7 +196,7 @@ // buildDateHeaderLabel // this.buildDateHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.buildDateHeaderLabel.ForeColor = System.Drawing.Color.White; + this.buildDateHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.buildDateHeaderLabel.Location = new System.Drawing.Point(16, 151); this.buildDateHeaderLabel.Name = "buildDateHeaderLabel"; this.buildDateHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -207,7 +207,7 @@ // authorHeaderLabel // this.authorHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.authorHeaderLabel.ForeColor = System.Drawing.Color.White; + this.authorHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.authorHeaderLabel.Location = new System.Drawing.Point(16, 124); this.authorHeaderLabel.Name = "authorHeaderLabel"; this.authorHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -218,7 +218,7 @@ // descriptionHeaderLabel // this.descriptionHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.descriptionHeaderLabel.ForeColor = System.Drawing.Color.White; + this.descriptionHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.descriptionHeaderLabel.Location = new System.Drawing.Point(16, 97); this.descriptionHeaderLabel.Name = "descriptionHeaderLabel"; this.descriptionHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -229,7 +229,7 @@ // titleHeaderLabel // this.titleHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.titleHeaderLabel.ForeColor = System.Drawing.Color.White; + this.titleHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.titleHeaderLabel.Location = new System.Drawing.Point(16, 70); this.titleHeaderLabel.Name = "titleHeaderLabel"; this.titleHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -240,7 +240,7 @@ // fileHeaderLabel // this.fileHeaderLabel.Font = new System.Drawing.Font("Tahoma", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.fileHeaderLabel.ForeColor = System.Drawing.Color.White; + this.fileHeaderLabel.ForeColor = System.Drawing.Color.Navy; this.fileHeaderLabel.Location = new System.Drawing.Point(16, 43); this.fileHeaderLabel.Name = "fileHeaderLabel"; this.fileHeaderLabel.Size = new System.Drawing.Size(87, 19); @@ -252,6 +252,7 @@ // this.forumLinkLabel.BackColor = System.Drawing.Color.Transparent; this.forumLinkLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.forumLinkLabel.LinkColor = System.Drawing.Color.Blue; this.forumLinkLabel.Location = new System.Drawing.Point(410, 280); this.forumLinkLabel.Name = "forumLinkLabel"; this.forumLinkLabel.Size = new System.Drawing.Size(40, 15); @@ -266,6 +267,7 @@ // this.wikiLinkLabel.BackColor = System.Drawing.Color.Transparent; this.wikiLinkLabel.Font = new System.Drawing.Font("Tahoma", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.wikiLinkLabel.LinkColor = System.Drawing.Color.Blue; this.wikiLinkLabel.Location = new System.Drawing.Point(380, 280); this.wikiLinkLabel.Name = "wikiLinkLabel"; this.wikiLinkLabel.Size = new System.Drawing.Size(31, 15); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -66,7 +66,7 @@ { Graphics mGraphics = e.Graphics; Rectangle mArea = new Rectangle(0, 0, this.Width, this.Height); - LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.PaleTurquoise, LinearGradientMode.ForwardDiagonal); + LinearGradientBrush mLGB = new LinearGradientBrush(mArea, Color.FromArgb(96, 155, 173), Color.FromArgb(245, 251, 251), LinearGradientMode.ForwardDiagonal); mGraphics.FillRectangle(mLGB, mArea); Rectangle r = new Rectangle(-1, -1, this.Width + 1, 36); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/Common/VersionInfo.resx 2013-12-06 14:08:13 UTC (rev 4699) @@ -124,50 +124,50 @@ <data name="okPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> 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 - AAAAAElFTkSuQmCC + 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 + AElFTkSuQmCC </value> </data> <metadata name="logoPictureBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> @@ -215,6 +215,42 @@ <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> + <metadata name="buildDateLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="versionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="buildDateHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="authorHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="descriptionHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="titleHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> + <metadata name="fileHeaderLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <value>True</value> + </metadata> <metadata name="forumLinkLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> @@ -227,56 +263,55 @@ <data name="internetPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> 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 - CDnUhkr9VgAAAABJRU5ErkJggg== + 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 </value> </data> <metadata name="commentLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/LockKeys.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -17,15 +17,6 @@ - public enum ForcingType - { - [Description("Force OFF")] - Off = 0, - [Description("Force ON")] - On = 1, - [Description("Not change")] - None = 2 - } #region Costanti const int KEYEVENTF_EXTENDEDKEY = 0x1; //Da impostare come flag per far precedere il codice per la scansione HW dal byte 0xE0 (tasti estesi) @@ -37,81 +28,6 @@ #endregion #endregion - public static List<string> GetForcingTypes() - { - List<string> descriptions = new List<string>(); - foreach (LockKeys.ForcingType enumValue in Enum.GetValues(typeof(LockKeys.ForcingType))) - { - descriptions.Add(enumValue.GetDescription()); - } - return descriptions; - } - /* public static string GetDescription(this Enum currentEnum) - { - string description = String.Empty; - DescriptionAttribute da; - - FieldInfo fi = currentEnum.GetType(). - GetField(currentEnum.ToString()); - da = (DescriptionAttribute)Attribute.GetCustomAttribute(fi, - typeof(DescriptionAttribute)); - if (da != null) - description = da.Description; - else - description = currentEnum.ToString(); - - return description; - } - - public static string[] GetDescription(this Enum Enumeration) - { - string Value = Enumeration.ToString(); - Type EnumType = Enumeration.GetType(); - var DescAttribute = (DescriptionAttribute[])EnumType - .GetField(Value) - .GetCustomAttributes(typeof(DescriptionAttribute), false); - return DescAttribute.Length > 0 ? DescAttribute[0].Description : Value; - }*/ - public static string GetDescription(this Enum value) - { - Type type = value.GetType(); - string name = Enum.GetName(type, value); - if (name != null) - { - FieldInfo field = type.GetField(name); - if (field != null) - { - DescriptionAttribute attr = - Attribute.GetCustomAttribute(field, - typeof(DescriptionAttribute)) as DescriptionAttribute; - if (attr != null) - { - return attr.Description; - } - } - } - return null; - } - /*public static string[] GetDescriptions(this enum value) - { - Type type = value.GetType(); - string name = Enum.GetName(type, value); - if (name != null) - { - FieldInfo field = type.GetField(name); - if (field != null) - { - DescriptionAttribute attr = - Attribute.GetCustomAttribute(field, - typeof(DescriptionAttribute)) as DescriptionAttribute; - if (attr != null) - { - return attr.Description; - } - } - } - return null; - }*/ /*static void Main(string[] args) //Chiamata applicazione con parametri: LockKeys X Y (X->NumLock Y->Capslock) { #region Verifica parametri Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/Resources/XmlFiles/DefaultConfig.xml 2013-12-06 14:08:13 UTC (rev 4699) @@ -1,5 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ShortCuter> + <General> + <ResetCapsLock>1</ResetCapsLock> + <ResetNumLock>0</ResetNumLock> + </General> <Items> <Item> <Caption>Basic Home</Caption> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.Designer.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -55,10 +55,8 @@ this.propLeftPictureBox = new System.Windows.Forms.PictureBox(); this.saveButton = new System.Windows.Forms.Button(); this.overridesGroupBox = new System.Windows.Forms.GroupBox(); - this.numLockComboBox = new System.Windows.Forms.Label(); - this.comboBox2 = new System.Windows.Forms.ComboBox(); - this.capsLockLabel = new System.Windows.Forms.Label(); - this.capsLockComboBox = new System.Windows.Forms.ComboBox(); + this.resetNumLockCheckBox = new System.Windows.Forms.CheckBox(); + this.resetCapsLockCheckBox = new System.Windows.Forms.CheckBox(); ((System.ComponentModel.ISupportInitialize)(this.shortCutsDataGridView)).BeginInit(); this.itemsTabControl.SuspendLayout(); this.linksTabPage.SuspendLayout(); @@ -350,60 +348,40 @@ // // overridesGroupBox // - this.overridesGroupBox.Controls.Add(this.numLockComboBox); - this.overridesGroupBox.Controls.Add(this.comboBox2); - this.overridesGroupBox.Controls.Add(this.capsLockLabel); - this.overridesGroupBox.Controls.Add(this.capsLockComboBox); + this.overridesGroupBox.Controls.Add(this.resetNumLockCheckBox); + this.overridesGroupBox.Controls.Add(this.resetCapsLockCheckBox); this.overridesGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.overridesGroupBox.Location = new System.Drawing.Point(6, 200); + this.overridesGroupBox.Location = new System.Drawing.Point(6, 216); this.overridesGroupBox.Name = "overridesGroupBox"; - this.overridesGroupBox.Size = new System.Drawing.Size(320, 68); + this.overridesGroupBox.Size = new System.Drawing.Size(320, 45); this.overridesGroupBox.TabIndex = 37; this.overridesGroupBox.TabStop = false; this.overridesGroupBox.Text = "Overrides at Start-Up"; // - // numLockComboBox + // resetNumLockCheckBox // - this.numLockComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.numLockComboBox.ForeColor = System.Drawing.SystemColors.ControlText; - this.numLockComboBox.Location = new System.Drawing.Point(174, 24); - this.numLockComboBox.Name = "numLockComboBox"; - this.numLockComboBox.Size = new System.Drawing.Size(140, 13); - this.numLockComboBox.TabIndex = 5; - this.numLockComboBox.Text = "Num Lock"; - this.numLockComboBox.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.resetNumLockCheckBox.AutoSize = true; + this.resetNumLockCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.resetNumLockCheckBox.Location = new System.Drawing.Point(204, 22); + this.resetNumLockCheckBox.Name = "resetNumLockCheckBox"; + this.resetNumLockCheckBox.Size = new System.Drawing.Size(106, 17); + this.resetNumLockCheckBox.TabIndex = 7; + this.resetNumLockCheckBox.Text = "Reset Num-Lock"; + this.resetNumLockCheckBox.UseVisualStyleBackColor = true; + this.resetNumLockCheckBox.CheckedChanged += new System.EventHandler(this.resetNumLockCheckBox_CheckedChanged); // - // comboBox2 + // resetCapsLockCheckBox // - this.comboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.comboBox2.FormattingEnabled = true; - this.comboBox2.Location = new System.Drawing.Point(173, 40); - this.comboBox2.Name = "comboBox2"; - this.comboBox2.Size = new System.Drawing.Size(140, 21); - this.comboBox2.TabIndex = 4; + this.resetCapsLockCheckBox.AutoSize = true; + this.resetCapsLockCheckBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.resetCapsLockCheckBox.Location = new System.Drawing.Point(6, 22); + this.resetCapsLockCheckBox.Name = "resetCapsLockCheckBox"; + this.resetCapsLockCheckBox.Size = new System.Drawing.Size(108, 17); + this.resetCapsLockCheckBox.TabIndex = 6; + this.resetCapsLockCheckBox.Text = "Reset Caps-Lock"; + this.resetCapsLockCheckBox.UseVisualStyleBackColor = true; + this.resetCapsLockCheckBox.CheckedChanged += new System.EventHandler(this.resetCapsLockCheckBox_CheckedChanged); // - // capsLockLabel - // - this.capsLockLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.capsLockLabel.ForeColor = System.Drawing.SystemColors.ControlText; - this.capsLockLabel.Location = new System.Drawing.Point(4, 24); - this.capsLockLabel.Name = "capsLockLabel"; - this.capsLockLabel.Size = new System.Drawing.Size(140, 13); - this.capsLockLabel.TabIndex = 3; - this.capsLockLabel.Text = "Caps Lock"; - this.capsLockLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // capsLockComboBox - // - this.capsLockComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.capsLockComboBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.capsLockComboBox.FormattingEnabled = true; - this.capsLockComboBox.Location = new System.Drawing.Point(4, 40); - this.capsLockComboBox.Name = "capsLockComboBox"; - this.capsLockComboBox.Size = new System.Drawing.Size(140, 21); - this.capsLockComboBox.TabIndex = 0; - // // ShortCuterForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -443,6 +421,7 @@ ((System.ComponentModel.ISupportInitialize)(this.infoPictureBox)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.propLeftPictureBox)).EndInit(); this.overridesGroupBox.ResumeLayout(false); + this.overridesGroupBox.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -474,10 +453,8 @@ private System.Windows.Forms.Button saveButton; private System.Windows.Forms.TextBox loadParameterTextBox; private System.Windows.Forms.GroupBox overridesGroupBox; - private System.Windows.Forms.ComboBox capsLockComboBox; - private System.Windows.Forms.Label numLockComboBox; - private System.Windows.Forms.ComboBox comboBox2; - private System.Windows.Forms.Label capsLockLabel; + private System.Windows.Forms.CheckBox resetNumLockCheckBox; + private System.Windows.Forms.CheckBox resetCapsLockCheckBox; } } \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -35,7 +35,8 @@ mySkin.FillTreeViewSkinLinks(skinLinksTreeView); skinLinksTreeView.CollapseAll(); FormatShortCutsGrid(); - capsLockComboBox.DataSource = LockKeys.GetForcingTypes(); + resetCapsLockCheckBox.Checked = myShortCuts.GeneralResetCapsLock; + resetNumLockCheckBox.Checked = myShortCuts.GeneralResetNumLock; toolTip.SetToolTip(skinFilesListBox, "Double click to set the link's parameter to shortcut"); toolTip.SetToolTip(skinLinksTreeView, "Double click to set the link's parameter to shortcut"); toolTip.SetToolTip(rowAddButton, "Add shortcut to list"); @@ -215,6 +216,12 @@ rowDownButton.Enabled = false; } } + private bool Save() //Salvataggio configurazione plugin + { + myShortCuts.GeneralResetCapsLock = resetCapsLockCheckBox.Checked; + myShortCuts.GeneralResetNumLock = resetNumLockCheckBox.Checked; + return myShortCuts.SaveConfig(); + } #endregion #region Consumazione Eventi @@ -264,7 +271,8 @@ return; } } - myHookWorker.Stop(); //--> disattivazione hook di tastiera + if (myHookWorker != null) + myHookWorker.Stop(); //--> disattivazione hook di tastiera } #endregion #region Eventi Modifica Griglia @@ -324,7 +332,7 @@ //Gestione evento per evitare messaggi di errore (esempio se file effetto sonoro non disponibile nella skin) } #endregion - #region Eventi Modifica Shortcuts + #region Eventi Modifica Impostazioni Plugin & Shortcuts private void myShortCutsItems_ListChanged(object sender, EventArgs e) { unsavedChanges = true; @@ -355,6 +363,14 @@ { MoveItemList(false); } + private void resetCapsLockCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } + private void resetNumLockCheckBox_CheckedChanged(object sender, EventArgs e) + { + unsavedChanges = true; + } #endregion #region Eventi Liste Files & Links Skin private void itemsTabControl_SelectedIndexChanged(object sender, EventArgs e) @@ -431,12 +447,12 @@ } private void saveButton_Click(object sender, EventArgs e) { - if (myShortCuts.SaveConfig()) + if (Save()) unsavedChanges = false; } private void updateButton_Click(object sender, EventArgs e) { - if (myShortCuts.SaveConfig()) + if (Save()) { unsavedChanges = false; this.Close(); Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuterForm.resx 2013-12-06 14:08:13 UTC (rev 4699) @@ -189,18 +189,12 @@ <metadata name="overridesGroupBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="numLockComboBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="resetNumLockCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="comboBox2.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> + <metadata name="resetCapsLockCheckBox.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <value>True</value> </metadata> - <metadata name="capsLockLabel.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> - <value>True</value> - </metadata> - <metadata name="capsLockComboBox.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> Modified: trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-12-05 20:23:53 UTC (rev 4698) +++ trunk/plugins/ShortCuter&SkinEditor/Source/ShortCuter/ShortCuts.cs 2013-12-06 14:08:13 UTC (rev 4699) @@ -111,7 +111,13 @@ #region Dati private readonly string SettingsFile; //File di salvataggio impostazioni private readonly bool ConfigContext; //Utilizzo nella fase di configurazione (altrimenti plugin in esecuzione) - private BindingList<ShortCut> _items = new BindingList<ShortCut>(); //Lista (con associazione dati) degli shortcuts configurati + private struct GeneralSettings //Struttura impostazioni generali + { + public bool ResetCapsLock; //Reset attivazione Caps-Lock all'avvio + public bool ResetNumLock; //Reset attivazione Num-Lock all'avvio + } + private GeneralSettings _general = new GeneralSettings(); //Impostazioni generali plugin + private BindingList<ShortCut> _items = new BindingList<ShortCut>(); //Lista (con associazione dati) degli shortcuts configurati private bool _initialized; //Classe inizializzata #endregion @@ -204,8 +210,19 @@ xmlFile.Load(userConfig); //Lettura file xml delle ultime impostazioni userConfig.Close(); //--> chiusura file } + + XmlNode innerNode; + XmlNode generalNode = xmlFile.DocumentElement.SelectSingleNode("/ShortCuter/General"); + if (generalNode != null) //Se presente sezione "General" (implementata da V2.0.5) + { + innerNode = generalNode.SelectSingleNode("ResetCapsLock"); + if (innerNode != null) + _general.ResetCapsLock = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText)); + innerNode = generalNode.SelectSingleNode("ResetNumLock"); + if (innerNode != null) + _general.ResetNumLock = Convert.ToBoolean(Convert.ToInt16(innerNode.InnerText)); + } XmlNodeList nodeList = xmlFile.DocumentElement.SelectNodes("/ShortCuter/Items/Item"); - XmlNode innerNode; foreach (XmlNode node in nodeList) //Iterazione per memorizzazione impostazioni shortcuts { ShortCut sc = new ShortCut(); @@ -285,22 +302,26 @@ xmlSettings.WriteStartDocument(); xmlSettings.WriteStartElement("ShortCuter"); - xmlSettings.WriteStartElement("Items"); - foreach (ShortCut sc in _items) //Iterazione per salvataggio sortcuts - { - xmlSettings.WriteStartElement("Item"); - xmlSettings.WriteElementString("Caption", sc.Caption); - xmlSettings.WriteElementString("Key", sc.Key); - xmlSettings.WriteElementString("Ctrl", Convert.ToInt16(sc.Ctrl).ToString()); - xmlSettings.WriteElementString("Alt", Convert.ToInt16(sc.Alt).ToString()); - xmlSettings.WriteElementString("Shift", Convert.ToInt16(sc.Shift).ToString()); - xmlSettings.WriteElementString("WindowID", sc.WindowID.ToString()); - xmlSettings.WriteElementString("LoadParameter", sc.LoadParameter); - xmlSettings.WriteElementString("SoundEffect", sc.SoundEffect); + xmlSettings.WriteStartElement("General"); + xmlSettings.WriteElementString("ResetCapsLock", Convert.ToInt16(_general.ResetCapsLock).ToString()); + xmlSettings.WriteElementString("ResetNumLock", Convert.ToInt16(_general.ResetNumLock).ToString()); xmlSettings.WriteEndElement(); - } + xmlSettings.WriteStartElement("Items"); + foreach (ShortCut sc in _items) //Iterazione per salvataggio sortcuts + { + xmlSettings.WriteStartElement("Item"); + xmlSettings.WriteElementString("Caption", sc.Caption); + xmlSettings.WriteElementString("Key", sc.Key); + xmlSettings.WriteElementString("Ctrl", Convert.ToInt16(sc.Ctrl).ToString()); + xmlSettings.WriteElementString("Alt", Convert.ToInt16(sc.Alt).ToString()); + xmlSettings.WriteElementString("Shift", Convert.ToInt16(sc.Shift).ToString()); + xmlSettings.WriteElementString("WindowID", sc.WindowID.ToString()); + xmlSettings.WriteElementString("LoadParameter", sc.LoadParameter); + xmlSettings.WriteElementString("SoundEffect", sc.SoundEffect); + xmlSettings.WriteEndElement(); + } + xmlSettings.WriteEndElement(); xmlSettings.WriteEndElement(); - xmlSettings.WriteEndElement(); xmlSettings.Flush(); xmlSettings.Close(); @@ -321,8 +342,10 @@ #endregion #region Proprietà + public bool Initialized { get { return this._initialized; } } + public bool GeneralResetCapsLock { get { return this._general.ResetCapsLock; } set { this._general.ResetCapsLock = value; } } + public bool GeneralResetNumLock { get { return this._general.ResetNumLock; } set { this._general.ResetNumLock = value; } } public BindingList<ShortCut> Items { get { return this._items; } } - public bool Initialized { get { return this._initialized; } } #endregion } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nic...@us...> - 2013-12-12 20:09:18
|
Revision: 4709 http://sourceforge.net/p/mp-plugins/code/4709 Author: nicsergio Date: 2013-12-12 20:09:15 +0000 (Thu, 12 Dec 2013) Log Message: ----------- Modified Paths: -------------- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj Modified: trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-09 20:59:12 UTC (rev 4708) +++ trunk/plugins/ShortCuter&SkinEditor/Source/MediaPortalPlugins.sln 2013-12-12 20:09:15 UTC (rev 4709) @@ -30,6 +30,7 @@ {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Debug|x86.Build.0 = Debug|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Any CPU.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|Mixed Platforms.Build.0 = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.ActiveCfg = Release|x86 {350D17A6-0F6B-43C4-898F-33CC68EBCD75}.Release|x86.Build.0 = Release|x86 {4D76B200-01C9-48C6-BA04-DAF0845D56B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -47,7 +48,6 @@ {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.ActiveCfg = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Any CPU.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {20CEBE32-A39E-4A61-B2BD-90BF16E2AEE8}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-12-09 20:59:12 UTC (rev 4708) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/MediaPortal.cs 2013-12-12 20:09:15 UTC (rev 4709) @@ -207,7 +207,10 @@ } public string GetMenuIconPath(string iconFile) //Ottenimento path (completo o parziale) icona { - return (Path.IsPathRooted(iconFile) ? iconFile : @"Icons\" + iconFile); + if (iconFile.Length == 0) + return string.Empty; + else + return (Path.IsPathRooted(iconFile) ? iconFile : @"Icons\" + iconFile); } public string GetMenuIconFile(string iconPath) //Ottenimento nome file icona { Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml 2013-12-09 20:59:12 UTC (rev 4708) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/Resources/XmlFiles/DefaultMenu.xml 2013-12-12 20:09:15 UTC (rev 4709) @@ -22,7 +22,7 @@ <BackgroundImage /> <BackgroundFolder>pictures</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> + <Icon /> <Overlay>LatestPictures</Overlay> </Item> <Item> @@ -34,7 +34,7 @@ <BackgroundImage /> <BackgroundFolder>music</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> + <Icon /> <Overlay>LatestMusic</Overlay> <SubItems> <SubItem> @@ -80,7 +80,7 @@ <BackgroundImage /> <BackgroundFolder>movies</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> + <Icon /> <Overlay>LatestMovingPictures</Overlay> <SubItems> <SubItem> @@ -126,7 +126,7 @@ <BackgroundImage /> <BackgroundFolder>TVSeries</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> + <Icon /> <Overlay>LatestSeries</Overlay> </Item> <Item> @@ -138,8 +138,8 @@ <BackgroundImage /> <BackgroundFolder>TV</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> - <Overlay /> + <Icon /> + <Overlay>RecordedTV</Overlay> <SubItems> <SubItem> <Caption>TV RECS</Caption> @@ -168,7 +168,7 @@ <BackgroundImage /> <BackgroundFolder>weatherbg</BackgroundFolder> <FanartHandler /> - <Icon>Icons\</Icon> + <Icon /> <Overlay>WeatherPanelBig</Overlay> </Item> <Item> @@ -210,8 +210,8 @@ <BackgroundImage>hover_htpcinfo.png</BackgroundImage> <BackgroundFolder /> <FanartHandler /> - <Icon>Icons\</Icon> - <Overlay /> + <Icon /> + <Overlay>HTPCInfo</Overlay> </Item> </Items> </CustomMenu> \ No newline at end of file Modified: trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj =================================================================== --- trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-12-09 20:59:12 UTC (rev 4708) +++ trunk/plugins/ShortCuter&SkinEditor/Source/XtremeMenuEditor/XtremeMenuEditor.csproj 2013-12-12 20:09:15 UTC (rev 4709) @@ -6,7 +6,7 @@ <ProductVersion>8.0.30703</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{350D17A6-0F6B-43C4-898F-33CC68EBCD75}</ProjectGuid> - <OutputType>WinExe</OutputType> + <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>ProcessPlugins.XtremeMenuEditor</RootNamespace> <AssemblyName>XtremeMenuEditor</AssemblyName> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |