From: <che...@us...> - 2010-02-23 19:31:54
|
Revision: 3463 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3463&view=rev Author: chemelli_sf Date: 2010-02-23 19:30:55 +0000 (Tue, 23 Feb 2010) Log Message: ----------- Cleanup: - Moved gfx under "Media\MyWorldMap" - Renamed all resources to MyWorldMap Modified Paths: -------------- trunk/plugins/WorldMap/Installer/Worldmap.xmp trunk/plugins/WorldMap/LocalizeStrings.cs trunk/plugins/WorldMap/MAPS/MapFunctions.cs trunk/plugins/WorldMap/MAPS/MapTiles.cs trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs trunk/plugins/WorldMap/MAPS/TileCacheDatabase.cs trunk/plugins/WorldMap/MyWorldMap.csproj trunk/plugins/WorldMap/PlugInBase.cs trunk/plugins/WorldMap/Properties/AssemblyInfo.cs trunk/plugins/WorldMap/Properties/Resources.Designer.cs trunk/plugins/WorldMap/Settings.cs trunk/plugins/WorldMap/WorldMap.cs trunk/plugins/WorldMap/WorldMapSearchResults.cs trunk/plugins/WorldMap/WorldmapConfig.Designer.cs trunk/plugins/WorldMap/WorldmapConfig.cs trunk/plugins/WorldMap/WorldmapMenu.cs trunk/plugins/WorldMap/WorldmapSearch.cs Added Paths: ----------- trunk/plugins/WorldMap/Installer/MyWorldmap.xml trunk/plugins/WorldMap/myworldmap_disabled.png trunk/plugins/WorldMap/myworldmap_enabled.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/ trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMIPBlocked.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMTileNotAvailable.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMTilePlaceholder.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMprogressBarActive.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMprogressBarQueued.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMprogressDummy.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/hover_myworldmap.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/ trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMIPBlocked.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMTileNotAvailable.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMTilePlaceholder.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMprogressBarActive.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMprogressBarQueued.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WMprogressDummy.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/hover_myworldmap.png Removed Paths: ------------- trunk/plugins/WorldMap/Installer/GUIWorldmap.xml trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMIPBlocked.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMTileNotAvailable.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMTilePlaceholder.jpeg trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressBarActive.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressBarQueued.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressDummy.png trunk/plugins/WorldMap/skinFiles/Blue3/Media/hover_worldmap.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMIPBlocked.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMTileNotAvailable.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMTilePlaceholder.jpeg trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMprogressBarActive.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMprogressBarQueued.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/WMprogressDummy.png trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/hover_worldmap.png trunk/plugins/WorldMap/worldmap_disabled.png trunk/plugins/WorldMap/worldmap_enabled.png Deleted: trunk/plugins/WorldMap/Installer/GUIWorldmap.xml =================================================================== --- trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2010-02-23 19:30:55 UTC (rev 3463) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<profile> - <section name="MyWorldmap"> - <entry name="parmgmaurl">http://khm{0}.google.com/kh?v=45&t={1}</entry> - <entry name="parmgmrurl">http://mt{0}.google.com/vt?v=w2.107&x={1}&y={2}&zoom={3}</entry> - <entry name="parmgmhurl">http://mt{0}.google.com/vt?v=w2t.107&x={1}&y={2}&zoom={3}</entry> - <entry name="parmgmturl">http://mt{0}.google.com/vt?v=w2p.107&x={1}&y={2}&zoom={3}</entry> - <entry name="parmveurl">http://{0}{1}.ortho.tiles.virtualearth.net/tiles/{0}{2}{3}?g=1</entry> - </section> -</profile> \ No newline at end of file Copied: trunk/plugins/WorldMap/Installer/MyWorldmap.xml (from rev 3439, trunk/plugins/WorldMap/Installer/GUIWorldmap.xml) =================================================================== --- trunk/plugins/WorldMap/Installer/MyWorldmap.xml (rev 0) +++ trunk/plugins/WorldMap/Installer/MyWorldmap.xml 2010-02-23 19:30:55 UTC (rev 3463) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<profile> + <section name="MyWorldmap"> + <entry name="parmgmaurl">http://khm{0}.google.com/kh?v=45&t={1}</entry> + <entry name="parmgmrurl">http://mt{0}.google.com/vt?v=w2.107&x={1}&y={2}&zoom={3}</entry> + <entry name="parmgmhurl">http://mt{0}.google.com/vt?v=w2t.107&x={1}&y={2}&zoom={3}</entry> + <entry name="parmgmturl">http://mt{0}.google.com/vt?v=w2p.107&x={1}&y={2}&zoom={3}</entry> + <entry name="parmveurl">http://{0}{1}.ortho.tiles.virtualearth.net/tiles/{0}{2}{3}?g=1</entry> + </section> +</profile> \ No newline at end of file Modified: trunk/plugins/WorldMap/Installer/Worldmap.xmp =================================================================== --- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2010-02-23 19:30:55 UTC (rev 3463) @@ -2,274 +2,274 @@ <ver>1.00.000</ver> <FileList> <File> - <FileName>GUIWorldmap.dll</FileName> - <Type>Plugin</Type> - <SubType>Window</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\bin\Release\GUIWorldmap.dll</Source> - <Id>01010</Id> - <Option /> - <Guid>acad4747-027c-4a00-9c0c-bfad7f771420</Guid> - </File> - <File> - <FileName>GUIWorldmap.xml</FileName> + <FileName>hover_worldmap.png</FileName> <Type>Other</Type> - <SubType>%Config%</SubType> - <Source>GUIWorldmap.xml</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\hover_worldmap.png</Source> <Id>04010</Id> <Option /> - <Guid>d0034489-b9c9-48d2-a534-6fabc04fe260</Guid> + <Guid>bead9c8e-8e75-4116-a72e-d79e70b739b0</Guid> </File> <File> <FileName>hover_worldmap.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\hover_worldmap.png</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\hover_worldmap.png</Source> <Id>04010</Id> <Option /> - <Guid>02eaf5e2-86ab-4f04-b6a4-ca3a0d581ff6</Guid> + <Guid>6ae8c3c9-a5dc-41f6-a217-7670ed973547</Guid> </File> <File> - <FileName>hover_worldmap.png</FileName> + <FileName>MyWorldMap.dll</FileName> + <Type>Plugin</Type> + <SubType>Window</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\bin\Release\MyWorldMap.dll</Source> + <Id>01010</Id> + <Option /> + <Guid>22b0392d-8cc3-490c-a3e8-fa3a1b93ba77</Guid> + </File> + <File> + <FileName>MyWorldMap.xml</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\hover_worldmap.png</Source> + <SubType>%Config%</SubType> + <Source>MyWorldMap.xml</Source> <Id>04010</Id> <Option /> - <Guid>852d81f8-2813-4030-a9ba-8e933bd3eced</Guid> + <Guid>175c3cdb-40ec-4017-86d5-dfe320ec7154</Guid> </File> <File> <FileName>MyWorldMap.xml</FileName> <Type>Skin</Type> <SubType>Blue3</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\MyWorldMap.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldMap.xml</Source> <Id>02010</Id> <Option /> - <Guid>a3f4581d-ae32-44be-b9fd-3bff6995aaa3</Guid> + <Guid>e462834c-b92b-4cf3-b9e6-b8a9213562cc</Guid> </File> <File> <FileName>MyWorldMap.xml</FileName> <Type>Skin</Type> <SubType>Blue3wide</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\MyWorldMap.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldMap.xml</Source> <Id>02010</Id> <Option /> - <Guid>22ffcfd4-a1e6-4964-82e6-bdc22378fc12</Guid> + <Guid>34c7c42f-4979-4e7a-8ea1-94c523b9d7a9</Guid> </File> <File> <FileName>MyWorldmapMenu.xml</FileName> <Type>Skin</Type> <SubType>Blue3</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\MyWorldmapMenu.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapMenu.xml</Source> <Id>02010</Id> <Option /> - <Guid>2d03c3b9-27ef-4647-87a9-e82a77f7e94f</Guid> + <Guid>657462c5-f72c-4967-a72b-ab682a282a57</Guid> </File> <File> <FileName>MyWorldmapMenu.xml</FileName> <Type>Skin</Type> <SubType>Blue3wide</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\MyWorldmapMenu.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapMenu.xml</Source> <Id>02010</Id> <Option /> - <Guid>880e9080-1409-477e-9689-a82a92bcf386</Guid> + <Guid>f6617e78-fe99-4734-b96d-9faf5a0083ce</Guid> </File> <File> <FileName>MyWorldmapSearch.xml</FileName> <Type>Skin</Type> <SubType>Blue3</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\MyWorldmapSearch.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapSearch.xml</Source> <Id>02010</Id> <Option /> - <Guid>49ecaa6e-094d-468f-a7fc-2c330c5627a8</Guid> + <Guid>65584a02-506f-4e63-ba36-1c1b6e04c4fd</Guid> </File> <File> <FileName>MyWorldmapSearch.xml</FileName> <Type>Skin</Type> <SubType>Blue3wide</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\MyWorldmapSearch.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapSearch.xml</Source> <Id>02010</Id> <Option /> - <Guid>5c17bcfd-e335-4ff1-8314-282203ee7fff</Guid> + <Guid>370c2771-82e3-4b78-9ac0-12d0af1371d8</Guid> </File> <File> <FileName>MyWorldmapSearchResults.xml</FileName> <Type>Skin</Type> <SubType>Blue3</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\MyWorldmapSearchResults.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapSearchResults.xml</Source> <Id>02010</Id> <Option /> - <Guid>88e02dd4-1703-449f-9b56-f1685764384b</Guid> + <Guid>1dfa345d-93b9-4988-ad87-c0bf33ad6e3a</Guid> </File> <File> <FileName>MyWorldmapSearchResults.xml</FileName> <Type>Skin</Type> <SubType>Blue3wide</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\MyWorldmapSearchResults.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapSearchResults.xml</Source> <Id>02010</Id> <Option /> - <Guid>d0d328c9-46bc-4291-bdec-086b7e01809e</Guid> + <Guid>5ca46c24-a053-44ef-8771-e8bdfd67b797</Guid> </File> <File> <FileName>strings_de.xml</FileName> <Type>Other</Type> <SubType>%Language%\MyWorldmap</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\language\MyWorldmap\strings_de.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_de.xml</Source> <Id>02010</Id> <Option /> - <Guid>839e7db9-152d-4341-9f01-a605059165b4</Guid> + <Guid>c4ed5a58-80d9-42a0-816c-e38f6e65e943</Guid> </File> <File> <FileName>strings_en.xml</FileName> <Type>Other</Type> <SubType>%Language%\MyWorldmap</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\language\MyWorldmap\strings_en.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_en.xml</Source> <Id>02010</Id> <Option /> - <Guid>df797bdb-d331-4b09-a75f-9bed57d5415b</Guid> + <Guid>eac4c941-ba83-46bd-937d-913908c4a5e4</Guid> </File> <File> <FileName>strings_fr.xml</FileName> <Type>Other</Type> <SubType>%Language%\MyWorldmap</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\language\MyWorldmap\strings_fr.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_fr.xml</Source> <Id>02010</Id> <Option /> - <Guid>9e561874-862f-4ee8-821e-bcfd3e4bac26</Guid> + <Guid>9b7dad3a-a47c-469d-8687-a66fb5fabd3c</Guid> </File> <File> <FileName>strings_it.xml</FileName> <Type>Other</Type> <SubType>%Language%\MyWorldmap</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\language\MyWorldmap\strings_it.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_it.xml</Source> <Id>02010</Id> <Option /> - <Guid>2e4d834a-7449-4cd1-9353-59bd776884a5</Guid> + <Guid>99f7fd71-4ff4-4fff-a754-3cd82e63bca8</Guid> </File> <File> <FileName>strings_no.xml</FileName> <Type>Other</Type> <SubType>%Language%\MyWorldmap</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\language\MyWorldmap\strings_no.xml</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_no.xml</Source> <Id>02010</Id> <Option /> - <Guid>fa8071b5-a5ef-4e8f-8700-1630a58e3793</Guid> + <Guid>242b78cd-a6de-4461-89dd-29bc92f88741</Guid> </File> <File> <FileName>System.Data.SQLite.DLL</FileName> <Type>Plugin</Type> <SubType>Window</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\bin\Release\System.Data.SQLite.DLL</Source> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\bin\Release\System.Data.SQLite.DLL</Source> <Id>01010</Id> <Option /> - <Guid>9c078257-ff0a-4867-a1fd-ad93373e90f2</Guid> + <Guid>31275733-5b13-4772-a929-033cb6051de6</Guid> </File> <File> <FileName>WMIPBlocked.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMIPBlocked.jpeg</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMIPBlocked.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>ae6fa049-3a9b-472b-8f27-2873d8202254</Guid> + <Guid>c8c9da13-d69a-4c93-8f45-2fec1c14cf9a</Guid> </File> <File> <FileName>WMIPBlocked.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMIPBlocked.jpeg</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMIPBlocked.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>67ff4419-887e-47a5-91ce-b11908fba864</Guid> + <Guid>e59da8a3-926b-4053-be36-85083dbfd59c</Guid> </File> <File> <FileName>WMprogressBarActive.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMprogressBarActive.png</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMprogressBarActive.png</Source> <Id>04010</Id> <Option /> - <Guid>f13c412d-a3b5-4c54-b0de-a66cbf8d1b6a</Guid> + <Guid>66a1a1a4-d2a8-4f76-8dd2-2c7d7ac6a3fa</Guid> </File> <File> <FileName>WMprogressBarActive.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMprogressBarActive.png</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMprogressBarActive.png</Source> <Id>04010</Id> <Option /> - <Guid>b167fb28-71cb-45e8-9a58-5ef494ae4b94</Guid> + <Guid>9a5ecb56-ef26-442b-a1b4-c8b022372545</Guid> </File> <File> <FileName>WMprogressBarQueued.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMprogressBarQueued.png</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMprogressBarQueued.png</Source> <Id>04010</Id> <Option /> - <Guid>79339423-00d8-4625-85f9-0662fc1a8d8f</Guid> + <Guid>9c868021-51d1-48b7-80d8-121ae55e89db</Guid> </File> <File> <FileName>WMprogressBarQueued.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMprogressBarQueued.png</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMprogressBarQueued.png</Source> <Id>04010</Id> <Option /> - <Guid>b6543c88-1f9b-49eb-954b-666be7a4988d</Guid> + <Guid>cf55ec24-7161-4c55-afcc-2bbaf94976cf</Guid> </File> <File> <FileName>WMprogressDummy.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMprogressDummy.png</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMprogressDummy.png</Source> <Id>04010</Id> <Option /> - <Guid>6f19c9dd-4424-4db4-9ef0-1eee046a31ba</Guid> + <Guid>a97e087d-ad2b-457a-a069-4301d2eea15c</Guid> </File> <File> <FileName>WMprogressDummy.png</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMprogressDummy.png</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMprogressDummy.png</Source> <Id>04010</Id> <Option /> - <Guid>c5a19619-80de-4a57-a2a7-7d43ce6c5ebb</Guid> + <Guid>caf6ed3f-528f-4a34-b18a-723912ad3a31</Guid> </File> <File> <FileName>WMTileNotAvailable.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMTileNotAvailable.jpeg</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMTileNotAvailable.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>935b6215-fcb2-48bf-91be-9704a5b753f1</Guid> + <Guid>7e8de7fe-1565-45fc-a439-560a4f459c42</Guid> </File> <File> <FileName>WMTileNotAvailable.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMTileNotAvailable.jpeg</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMTileNotAvailable.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>8d43533e-b87d-4bca-b2d6-305ebc600c4b</Guid> + <Guid>117d6238-61dd-4648-a3a9-4b6d3f948cc1</Guid> </File> <File> <FileName>WMTilePlaceholder.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3\Media\WMTilePlaceholder.jpeg</Source> + <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\MyWorldMap\WMTilePlaceholder.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>b4ece685-298d-4307-a623-f8e664694e14</Guid> + <Guid>54f088a5-11ab-499a-856a-695d52173a8b</Guid> </File> <File> <FileName>WMTilePlaceholder.jpeg</FileName> <Type>Other</Type> - <SubType>%Skin%\Blue3wide\Media</SubType> - <Source>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\skinFiles\Blue3Wide\Media\WMTilePlaceholder.jpeg</Source> + <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType> + <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\MyWorldMap\WMTilePlaceholder.jpeg</Source> <Id>04010</Id> <Option /> - <Guid>a7f7c851-d271-4269-b975-e5eb2b804c99</Guid> + <Guid>2d831d1e-2cbe-427a-9a12-ac6ce4256d42</Guid> </File> </FileList> <StringList /> @@ -277,12 +277,12 @@ <SetupGroups /> <SetupGroupMappings /> <Option> - <BuildFileName>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\Installer\Worldmap.mpi</BuildFileName> - <ProiectFileName>C:\svnroot\mp-plugins\trunk\plugins\WorldMap\Installer\Worldmap.xmp</ProiectFileName> - <ProiectName>Worldmap</ProiectName> + <BuildFileName>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\Installer\MyWorldmap.mpi</BuildFileName> + <ProiectFileName>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\Installer\Worldmap.xmp</ProiectFileName> + <ProiectName>MyWorldmap</ProiectName> <Author>LKuech & Chemelli</Author> <UpdateURL>http://www.team-mediaportal.com</UpdateURL> - <Version>1.0 RC4</Version> + <Version>1.0 RC5</Version> <Description>Browse the whole world via your remote and watch Road maps, Satellite images or a hybrid image from Google maps or Microsoft Virtual Earth.</Description> <Group>Web</Group> <Release>Beta</Release> @@ -297,9 +297,9 @@ <ForumURL /> <WebURL /> <WikiURL /> - <CreationDate>10-10-08</CreationDate> + <CreationDate>23-02-10</CreationDate> <SingleGroupSelect>False</SingleGroupSelect> - <ClearSkinCache>False</ClearSkinCache> + <ClearSkinCache>True</ClearSkinCache> <UseRealPathInPackage>False</UseRealPathInPackage> </Properties> </MPinstaler> \ No newline at end of file Modified: trunk/plugins/WorldMap/LocalizeStrings.cs =================================================================== --- trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -88,7 +88,7 @@ string cultureName = null; if (language != null) cultureName = GetCultureName(language); - Log.Info("[Worldmap]: Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, + Log.Info("[MyWorldMap]: Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, cultureName, language, isPrefixEnabled); _stringProvider = new LocalisationProvider(directory, cultureName, isPrefixEnabled); @@ -142,9 +142,9 @@ } catch (FormatException e) { - Log.Error("[Worldmap]: Error formatting translation with id {0}", dwCode); - Log.Error("[Worldmap]: Unformatted translation: {0}", translation); - Log.Error("[Worldmap]: " + e); + Log.Error("[MyWorldMap]: Error formatting translation with id {0}", dwCode); + Log.Error("[MyWorldMap]: Unformatted translation: {0}", translation); + Log.Error("[MyWorldMap]: " + e); return translation; } } @@ -165,7 +165,7 @@ if (translation == null) { - Log.Error("[Worldmap]: No translation found for id {0}", dwCode); + Log.Error("[MyWorldMap]: No translation found for id {0}", dwCode); return String.Empty; } @@ -193,7 +193,7 @@ } catch (FormatException e) { - Log.Error("[Worldmap]:" + e); + Log.Error("[MyWorldMap]:" + e); strLabel = String.Empty; return; } @@ -201,7 +201,7 @@ strLabel = _stringProvider.GetString("unmapped", dwLabelID); if (strLabel == null) { - Log.Error("[Worldmap]: No translation found for id {0}", dwLabelID); + Log.Error("[MyWorldMap]: No translation found for id {0}", dwLabelID); strLabel = String.Empty; } } Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -190,7 +190,7 @@ break; } } - catch (Exception err) + catch (Exception) { } @@ -290,7 +290,7 @@ break; } } - catch (Exception err) + catch (Exception) { } @@ -329,7 +329,7 @@ break; } } - catch (Exception err) + catch (Exception) { } @@ -368,7 +368,7 @@ break; } } - catch (Exception err) + catch (Exception) { } @@ -446,7 +446,7 @@ { url = string.Format(curConfig.VEUrl, mapTypePreFix, quadKey[quadKey.Length - 1], quadKey, mapExtension); } - catch (Exception err) + catch (Exception) { } return url; Modified: trunk/plugins/WorldMap/MAPS/MapTiles.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/MapTiles.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MAPS/MapTiles.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -77,7 +77,7 @@ TileCountX = CalcTileCount(ImageResulotionX + 256); TileCountY = CalcTileCount(ImageResulotionY + 256); - combinedTiles = new Bitmap(TileCountX*256, TileCountY*256); + combinedTiles = new Bitmap(TileCountX * 256, TileCountY * 256); } public event CombinedImageChangedEventHandler CombinedImageChangedEvent; @@ -88,7 +88,7 @@ { CombinedImageChangedEvent(this, e); } - catch (NullReferenceException err) + catch (NullReferenceException) { } } @@ -98,8 +98,8 @@ int CenterTileX = MapFunctions.ConvertLongitudeToTileX(Longitude, ZoomLevel); int CenterTileY = MapFunctions.ConvertLatitudeToTileY(Latitude, ZoomLevel); - StartTileX = CenterTileX - ((int) (TileCountX/2)); - StartTileY = CenterTileY - ((int) (TileCountY/2)); + StartTileX = CenterTileX - ((int)(TileCountX / 2)); + StartTileY = CenterTileY - ((int)(TileCountY / 2)); var tmpTile = new MapTile(mapType, CenterTileX, CenterTileY, ZoomLevel); @@ -107,13 +107,13 @@ tmpLongitudeDelta = Longitude - tmpTile.LeftLongitude; if (tmpLongitudeDelta < 0) tmpLongitudeDelta *= -1; - OffsetX = (int) (256*(((100/tmpTile.TileWidthDegree)*tmpLongitudeDelta)/100)); + OffsetX = (int)(256 * (((100 / tmpTile.TileWidthDegree) * tmpLongitudeDelta) / 100)); double tmpLatitudeDelta; tmpLatitudeDelta = Latitude - tmpTile.TopLatitude; if (tmpLatitudeDelta < 0) tmpLatitudeDelta *= -1; - OffsetY = (int) (256*(((100/tmpTile.TileHeightDegree)*tmpLatitudeDelta)/100)); + OffsetY = (int)(256 * (((100 / tmpTile.TileHeightDegree) * tmpLatitudeDelta) / 100)); Tiles = new MapTile[TileCountX][]; @@ -138,27 +138,27 @@ lock (combinedTiles) { bool newTiles = false; - var tmpTile = (MapTile) sender; + var tmpTile = (MapTile)sender; try { if (tmpTile == null) { return; } - int insertX = (tmpTile.PosX - StartTileX)*256; - int insertY = (tmpTile.PosY - StartTileY)*256; + int insertX = (tmpTile.PosX - StartTileX) * 256; + int insertY = (tmpTile.PosY - StartTileY) * 256; Graphics graphics = Graphics.FromImage(combinedTiles); graphics.DrawImage(tmpTile.Image, insertX, insertY, tmpTile.Image.Width, tmpTile.Image.Height); newTiles = true; } - catch (NullReferenceException err) + catch (NullReferenceException) { } - catch (InvalidOperationException err) + catch (InvalidOperationException) { } - catch (ArgumentOutOfRangeException err) + catch (ArgumentOutOfRangeException) { } @@ -167,10 +167,10 @@ croppedCombinedTiles = new Bitmap(ImageResolutionX, ImageResolutionY); Graphics cropGraphics = Graphics.FromImage(croppedCombinedTiles); - int cropPosX = (((combinedTiles.Width/2) - 128) + OffsetX) - (ImageResolutionX/2); - //(((combinedTiles.Width / 2) - (ImageResolutionX / 2)) + 128) - OffsetX; - int cropPosY = (((combinedTiles.Height/2) - 128) + OffsetY) - (ImageResolutionY/2); - // (((combinedTiles.Height / 2) - (ImageResolutionY / 2)) + 128) - OffsetY; + int cropPosX = (((combinedTiles.Width / 2) - 128) + OffsetX) - (ImageResolutionX / 2); + //(((combinedTiles.Width / 2) - (ImageResolutionX / 2)) + 128) - OffsetX; + int cropPosY = (((combinedTiles.Height / 2) - 128) + OffsetY) - (ImageResolutionY / 2); + // (((combinedTiles.Height / 2) - (ImageResolutionY / 2)) + 128) - OffsetY; //System.Diagnostics.Debug.WriteLine(OffsetX + " : " + OffsetY + " :: " + cropPosX + " : " + cropPosY); var tmpSource = new Rectangle(cropPosX, cropPosY, ImageResolutionX, ImageResolutionY); @@ -184,9 +184,9 @@ public int CalcTileCount(int Pixel) { - var ret = (int) (Pixel/256); - if ((Pixel%256) != 0) ret++; // if the division does not fit - if ((ret%2) == 0) ret++; // if the the tile count is unpair + var ret = (int)(Pixel / 256); + if ((Pixel % 256) != 0) ret++; // if the division does not fit + if ((ret % 2) == 0) ret++; // if the the tile count is unpair return ret; } Modified: trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -62,7 +62,7 @@ { string ret = null; - var httpRequest = (HttpWebRequest) WebRequest.Create(url); + var httpRequest = (HttpWebRequest)WebRequest.Create(url); httpRequest.UserAgent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.0)"; httpRequest.Timeout = 15000; httpRequest.ReadWriteTimeout = 15000; @@ -72,7 +72,7 @@ try { - httpResponse = (HttpWebResponse) httpRequest.GetResponse(); + httpResponse = (HttpWebResponse)httpRequest.GetResponse(); Stream tmpStream = httpResponse.GetResponseStream(); using (var reader = new StreamReader(tmpStream)) @@ -104,7 +104,7 @@ XmlNodeList nodes = doc.DocumentElement.ChildNodes; CultureInfo ci = CultureInfo.InstalledUICulture; - var ni = (NumberFormatInfo) ci.NumberFormat.Clone(); + var ni = (NumberFormatInfo)ci.NumberFormat.Clone(); ni.NumberDecimalSeparator = "."; ni.NumberGroupSeparator = ","; @@ -139,7 +139,7 @@ XmlNodeList nodes = doc.DocumentElement.ChildNodes; CultureInfo ci = CultureInfo.InstalledUICulture; - var ni = (NumberFormatInfo) ci.NumberFormat.Clone(); + var ni = (NumberFormatInfo)ci.NumberFormat.Clone(); ni.NumberDecimalSeparator = "."; ni.NumberGroupSeparator = ","; @@ -153,7 +153,7 @@ { tmpGeoCode.Name += " (" + node["adminName1"].InnerText + ")"; } - catch (Exception err) + catch (Exception) { } tmpGeoCode.Country = node["countryName"].InnerText; @@ -181,7 +181,7 @@ CultureInfo ci = CultureInfo.InstalledUICulture; - var ni = (NumberFormatInfo) ci.NumberFormat.Clone(); + var ni = (NumberFormatInfo)ci.NumberFormat.Clone(); ni.NumberDecimalSeparator = "."; ni.NumberGroupSeparator = ","; @@ -189,7 +189,7 @@ { if (node.Name == "Status") { - Debug.WriteLine(String.Format("WorldMap Google GeoCodeSearch. Request:{0} ReturnCode: {1}", + Debug.WriteLine(String.Format("MyWorldMap Google GeoCodeSearch. Request:{0} ReturnCode: {1}", node["request"].InnerText, node["code"].InnerText)); } @@ -200,8 +200,8 @@ XmlNode PointNode = node["Point"]; string Coordinates = PointNode.FirstChild.InnerText; - string longitude = Coordinates.Split(new[] {','})[0]; - string latitude = Coordinates.Split(new[] {','})[1]; + string longitude = Coordinates.Split(new[] { ',' })[0]; + string latitude = Coordinates.Split(new[] { ',' })[1]; tmpGeoCode.Longitude = double.Parse(longitude, ni); tmpGeoCode.Latitude = double.Parse(latitude, ni); SearchResult.Add(tmpGeoCode); @@ -211,7 +211,7 @@ public Uri GetYahooAdress() { - string url = "http://local.yahooapis.com/MapsService/V1/geocode?appid=MediaPortalWorldmap&output=xml"; + string url = "http://local.yahooapis.com/MapsService/V1/geocode?appid=MediaPortalMyWorldMap&output=xml"; if (Street != "") url += "&street=" + Street; if (City != "") url += "&city=" + City; @@ -280,7 +280,7 @@ if (safeChars.Contains(Char.ToString())) ret += Char; else { - ret += String.Format("%{0:X2}", (int) Char); + ret += String.Format("%{0:X2}", (int)Char); } // convert to % plus the "hex value" } Modified: trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -72,7 +72,7 @@ return; } } - catch (NullReferenceException err) + catch (NullReferenceException) { } catch (Exception err) @@ -129,11 +129,9 @@ } } } - catch (Exception err) + catch (Exception) { - // Debug.WriteLine(err.ToString()); } - ; return ret; } @@ -168,7 +166,7 @@ break; } } - catch (Exception err) + catch (Exception) { } @@ -183,13 +181,13 @@ var t = new Thread(new ParameterizedThreadStart(ImageThread)); t.Priority = ThreadPriority.BelowNormal; - t.Name = "WorldMapTileDownloader"; + t.Name = "MyWorldMap-TileDownloader"; t.IsBackground = true; ImageDownloadThreads.Add(t); t.Start(tmpTile); } - catch (Exception err) + catch (Exception) { } @@ -214,7 +212,7 @@ //ImageDownloadThreads.RemoveAt(0); } - catch (Exception err) + catch (Exception) { } } @@ -239,7 +237,7 @@ { ret |= ImageDownloadThreads[i].IsAlive; } - catch (Exception err) + catch (Exception) { } } @@ -258,12 +256,12 @@ { ImageDownloadThreads.RemoveAt(i); } - catch (Exception err) + catch (Exception) { } } } - catch (Exception err) + catch (Exception) { } } @@ -338,7 +336,7 @@ { tmpTileImage = cacheDatabase.GetImage("gma", tmpImage.PosX, tmpImage.PosY, tmpImage.ZoomLevel); } - catch (Exception err) + catch (Exception) { } } @@ -405,7 +403,7 @@ { httpRequest.Abort(); } - catch (Exception err2) + catch (Exception) { } } Modified: trunk/plugins/WorldMap/MAPS/TileCacheDatabase.cs =================================================================== --- trunk/plugins/WorldMap/MAPS/TileCacheDatabase.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MAPS/TileCacheDatabase.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -113,7 +113,7 @@ if (CurrentConnection.State == ConnectionState.Closed) CurrentConnection.Open(); cmd.ExecuteNonQuery(); } - catch (Exception err) + catch (Exception) { } finally @@ -166,16 +166,16 @@ // get the latest row myRow = ds.Tables["MapTileImage"].Rows[ds.Tables["MapTileImage"].Rows.Count - 1]; - var imageBytes = (byte[]) myRow["image"]; + var imageBytes = (byte[])myRow["image"]; ms = new MemoryStream(imageBytes); tmpImage = new Bitmap(ms); ms.Close(); } - catch (IndexOutOfRangeException err) + catch (IndexOutOfRangeException) { Debug.WriteLine("The map tile was not in the database!"); } - catch (Exception err) + catch (Exception) { } finally @@ -205,7 +205,7 @@ { CurrentConnection.Open(); } - catch (InvalidOperationException err) + catch (InvalidOperationException) { } Modified: trunk/plugins/WorldMap/MyWorldMap.csproj =================================================================== --- trunk/plugins/WorldMap/MyWorldMap.csproj 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/MyWorldMap.csproj 2010-02-23 19:30:55 UTC (rev 3463) @@ -7,8 +7,8 @@ <ProjectGuid>{857D8A0C-FB95-4A26-8ED6-8E51586D2116}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>MyWorldmap</RootNamespace> - <AssemblyName>GUIWorldmap</AssemblyName> + <RootNamespace>MyWorldMap</RootNamespace> + <AssemblyName>MyWorldMap</AssemblyName> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -106,11 +106,9 @@ </EmbeddedResource> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="worldmap_disabled.png"> - <CustomToolNamespace>MyWorldmap</CustomToolNamespace> + <EmbeddedResource Include="myworldmap_disabled.png"> </EmbeddedResource> - <EmbeddedResource Include="worldmap_enabled.png"> - <CustomToolNamespace>MyWorldmap</CustomToolNamespace> + <EmbeddedResource Include="myworldmap_enabled.png"> </EmbeddedResource> </ItemGroup> <ItemGroup> Modified: trunk/plugins/WorldMap/PlugInBase.cs =================================================================== --- trunk/plugins/WorldMap/PlugInBase.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/PlugInBase.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -24,7 +24,7 @@ public string PluginName() { - return "My Worldmap"; + return "MyWorldmap"; } // Returns the description of the plugin is shown in the plugin menu @@ -87,7 +87,7 @@ strButtonText = GUILocalizeStrings.Get(0); strButtonImage = String.Empty; strButtonImageFocus = String.Empty; - strPictureImage = @"hover_worldmap.png"; + strPictureImage = @"hover_myworldmap.png"; return true; } @@ -97,7 +97,7 @@ public bool ShowDefaultHome() { - return false; + return true; } #endregion Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -5,11 +5,11 @@ // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("WorldMap")] +[assembly: AssemblyTitle("MyWorldMap")] [assembly: AssemblyDescription("plugin for MediaPortal")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WorldMap")] +[assembly: AssemblyProduct("MyWorldMap")] [assembly: AssemblyCopyright("(c) 2008 - 2010")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -34,5 +34,5 @@ // Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern // übernehmen, indem Sie "*" eingeben: -[assembly: AssemblyVersion("0.9.4.1")] -[assembly: AssemblyFileVersion("0.9.4.1")] \ No newline at end of file +[assembly: AssemblyVersion("1.0.0.*")] +[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file Modified: trunk/plugins/WorldMap/Properties/Resources.Designer.cs =================================================================== --- trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -8,7 +8,7 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace MyWorldmap.Properties { +namespace MyWorldMap.Properties { using System; @@ -39,7 +39,7 @@ internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MyWorldmap.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MyWorldMap.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; Modified: trunk/plugins/WorldMap/Settings.cs =================================================================== --- trunk/plugins/WorldMap/Settings.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/Settings.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -137,7 +137,7 @@ GenerateActionLogEntries = reader.GetValueAsBool(SectionName, ParmGenerateLogEntries, false); } - using (var reader = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml")) + using (var reader = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\MyWorldmap.xml")) { GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?v=99&t={1}"); GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, @@ -190,7 +190,7 @@ public void SaveMapUrls() { - using (var xmlwriter = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml") + using (var xmlwriter = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\MyWorldmap.xml") ) { xmlwriter.SetValue(SectionName, ParmGMAUrl, GMAUrl); Modified: trunk/plugins/WorldMap/WorldMap.cs =================================================================== --- trunk/plugins/WorldMap/WorldMap.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/WorldMap.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -11,8 +11,8 @@ namespace MyWorldmap { - [PluginIcons("MyWorldmap.worldmap_enabled.png", "MyWorldmap.worldmap_disabled.png")] - public class WorldMap : PlugInBase + [PluginIcons("MyWorldMap.myworldmap_enabled.png", "MyWorldMap.myworldmap_disabled.png")] + public class MyWorldMap : PlugInBase { #region ZoomMode enum @@ -69,7 +69,7 @@ public void RefreshImageTiles() { - Log.Debug("[Worldmap]: Refreshing Mapimage. lon:lat:zoomL:zoomF:mapT {0}:{1}:{2}:{3}:{4}", currentLongitude, + Log.Debug("[MyWorldMap]: Refreshing Mapimage. lon:lat:zoomL:zoomF:mapT {0}:{1}:{2}:{3}:{4}", currentLongitude, currentLatitude, currentZoomLevel, currentZoomFactor, currentMapType); mapTiles.ClearTileDownloadQueue(); @@ -103,9 +103,9 @@ public override bool Init() { - Log.Debug("[Worldmap]: Start to initialize Worldmap plugin Windows"); + Log.Debug("[MyWorldMap]: Start to initialize Worldmap plugin Windows"); - Log.Debug("[Worldmap]: Initialize Worldmap menu"); + Log.Debug("[MyWorldMap]: Initialize Worldmap menu"); Menu = new WorldmapMenu(); Menu.Init(); @@ -113,14 +113,14 @@ { var win = (GUIWindow)Menu; GUIWindowManager.Add(ref win); - Log.Debug("[Worldmap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); + Log.Debug("[MyWorldMap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); } else { - Log.Error("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Menu); + Log.Error("[MyWorldMap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Menu); } - Log.Debug("[Worldmap]: Initialize Worldmap search"); + Log.Debug("[MyWorldMap]: Initialize Worldmap search"); Search = new WorldmapSearch(); Search.Init(); @@ -128,14 +128,14 @@ { var win = (GUIWindow)Search; GUIWindowManager.Add(ref win); - Log.Debug("[Worldmap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); + Log.Debug("[MyWorldMap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); } else { - Log.Error("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Search); + Log.Error("[MyWorldMap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Search); } - Log.Debug("[Worldmap]: Initialize Worldmap searchresult"); + Log.Debug("[MyWorldMap]: Initialize Worldmap searchresult"); SearchResults = new WorldMapSearchResults(); SearchResults.Init(); @@ -143,11 +143,11 @@ { var win = (GUIWindow)SearchResults; GUIWindowManager.Add(ref win); - Log.Debug("[Worldmap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); + Log.Debug("[MyWorldMap]: Window with the ID {0} has been added to the windowmanager!", win.GetID); } else { - Log.Error("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.SearchResults); + Log.Error("[MyWorldMap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.SearchResults); } @@ -160,7 +160,7 @@ { mapConfig = new MapConfig(); - string tmpWorldmapFolder = Config.GetFolder(Config.Dir.Cache) + "\\Worldmap\\"; + string tmpWorldmapFolder = Config.GetFolder(Config.Dir.Cache) + "\\MyWorldMap\\"; if (!Directory.Exists(tmpWorldmapFolder)) { @@ -206,7 +206,7 @@ mapConfig.GMTUrl = settings.GMTUrl; mapConfig.VEUrl = settings.VEUrl; - string tmpSkinFolder = Config.GetSubFolder(Config.Dir.Skin, GUIGraphicsContext.Skin) + "\\Media"; + string tmpSkinFolder = Config.GetSubFolder(Config.Dir.Skin, GUIGraphicsContext.Skin) + "\\Media\\MyWorldMap"; string[] media = { Path.Combine(tmpSkinFolder, "WMprogressBarActive.png"), @@ -220,7 +220,7 @@ { if (!File.Exists(s)) { - Log.Error("[Worldmap]: Cannot find skin file {0}", s); + Log.Error("[MyWorldMap]: Cannot find skin file {0}", s); } } @@ -234,7 +234,7 @@ } catch (Exception err) { - Log.Error("[Worldmap]: Error \"{0}\" during texture/bitmap creation", err.Message); + Log.Error("[MyWorldMap]: Error \"{0}\" during texture/bitmap creation", err.Message); } LastGraphicContextWidth = GUIGraphicsContext.Width; @@ -325,7 +325,7 @@ public override void OnAction(Action action) { - if (settings.GenerateActionLogEntries) Log.Info("[Worldmap]: Detected Action: {0} ID: {1}", action, action.wID); + if (settings.GenerateActionLogEntries) Log.Info("[MyWorldMap]: Detected Action: {0} ID: {1}", action, action.wID); if (action.wID == settings.ActionMoveRight) { @@ -503,7 +503,7 @@ private void SetWorldOverview() { - //Log.Debug("[Worldmap]: Calculating the widest zoome mode"); + //Log.Debug("[MyWorldMap]: Calculating the widest zoome mode"); //currentMapType = MapFunctions.MapType.VEHybrid; currentLongitude = 0; currentLatitude = 35; @@ -523,7 +523,7 @@ } currentZoomLevel = tmpZoomLevel; - Log.Debug("[Worldmap]: Calculation result: ScreenWidth:MinZoomLevel:mapTiles {0}:{1}:{2}", + Log.Debug("[MyWorldMap]: Calculation result: ScreenWidth:MinZoomLevel:mapTiles {0}:{1}:{2}", GUIGraphicsContext.Width, MinZoomLevel, tmpMapTiles); } @@ -629,7 +629,7 @@ if ((!DisableOSD) && ((LastImageRefresh + 5000) >= Environment.TickCount)) base.Render(timePassed); } - catch (NullReferenceException err) + catch (NullReferenceException) { } } @@ -720,7 +720,7 @@ } catch (Exception err) { - Log.Error("[Worldmap]: " + err); + Log.Error("[MyWorldMap]: " + err); } } Modified: trunk/plugins/WorldMap/WorldMapSearchResults.cs =================================================================== --- trunk/plugins/WorldMap/WorldMapSearchResults.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/WorldMapSearchResults.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -8,28 +8,30 @@ internal class WorldMapSearchResults : GUIWindow { public int LastWindowID = -1; - [SkinControl(24)] protected GUILabelControl lblHeader; - [SkinControl(5)] protected GUIListControl listview; + [SkinControl(24)] + protected GUILabelControl lblHeader; + [SkinControl(5)] + protected GUIListControl listview; public List<GeoCode> SearchResults = new List<GeoCode>(); public int SuggestedZoomLevel; public WorldMapSearchResults() { - GetID = (int) WorldmapWindowIDs.SearchResults; + GetID = (int)WorldmapWindowIDs.SearchResults; } public override bool Init() { bool bResult = Load(GUIGraphicsContext.Skin + @"\MyWorldmapSearchResults.xml"); - GetID = (int) WorldmapWindowIDs.SearchResults; + GetID = (int)WorldmapWindowIDs.SearchResults; return bResult; } protected override void OnPageLoad() { - var tmpMainWindow = (WorldMap) GUIWindowManager.GetWindow((int) WorldmapWindowIDs.MainWindow); + var tmpMainWindow = (MyWorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow); if (tmpMainWindow.mapTiles == null) { tmpMainWindow.FillMapTileRessources(); @@ -42,7 +44,7 @@ public override void Render(float timePassed) { - var tmpMainWindow = (WorldMap) GUIWindowManager.GetWindow((int) WorldmapWindowIDs.MainWindow); + var tmpMainWindow = (MyWorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow); tmpMainWindow.Render(timePassed); base.Render(timePassed); @@ -54,7 +56,7 @@ { case Action.ActionType.ACTION_PREVIOUS_MENU: { - var tmpMainWindow = (WorldMap) GUIWindowManager.GetWindow((int) WorldmapWindowIDs.MainWindow); + var tmpMainWindow = (MyWorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow); tmpMainWindow.DisableOSD = true; GUIWindowManager.ShowPreviousWindow(); @@ -94,7 +96,7 @@ protected override void OnPageDestroy(int new_windowId) { - var tmpMainWindow = (WorldMap) GUIWindowManager.GetWindow((int) WorldmapWindowIDs.MainWindow); + var tmpMainWindow = (MyWorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow); if (tmpMainWindow.IsNotWorldmapWindow(new_windowId)) { @@ -110,7 +112,7 @@ GUIListItem item = listview.SelectedListItem; if (item == null) return; - var tmpMainWindow = (WorldMap) GUIWindowManager.GetWindow((int) WorldmapWindowIDs.MainWindow); + var tmpMainWindow = (MyWorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow); tmpMainWindow.currentLongitude = SearchResults[item.ItemId].Longitude; tmpMainWindow.currentLatitude = SearchResults[item.ItemId].Latitude; Modified: trunk/plugins/WorldMap/WorldmapConfig.Designer.cs =================================================================== --- trunk/plugins/WorldMap/WorldmapConfig.Designer.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/WorldmapConfig.Designer.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -874,8 +874,8 @@ this.Controls.Add(this.btnOk); this.Controls.Add(this.tbConfig); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.Name = "WorldmapConfig"; - this.Text = "Worldmap Configuration"; + this.Name = "MyWorldMapConfig"; + this.Text = "MyWorldMap Configuration"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.WorldmapConfig_FormClosed); this.Load += new System.EventHandler(this.WorldmapConfig_Load); this.tbConfig.ResumeLayout(false); Modified: trunk/plugins/WorldMap/WorldmapConfig.cs =================================================================== --- trunk/plugins/WorldMap/WorldmapConfig.cs 2010-02-23 08:07:49 UTC (rev 3462) +++ trunk/plugins/WorldMap/WorldmapConfig.cs 2010-02-23 19:30:55 UTC (rev 3463) @@ -19,8 +19,8 @@ private ArrayList GenerateActionList() { var ret = new ArrayList(); - string[] names = Enum.GetNames(typeof (Action.ActionType)); - var values = (int[]) Enum.GetValues(typeof (Action.ActionType)); + string[] names = Enum.GetNames(typeof(Action.ActionType)); + var values = (int[])Enum.GetValues(typeof(Action.ActionType)); for (int i = 0; i < names.Length; i++) { @@ -82,25 +82,25 @@ settings = new Settings(); settings.LoadSettings(); - uadGMR.Value = (int) settings.ThreadCountGMR; - uadGMA.Value = (int) settings.ThreadCountGMA; - uadGMH.Value = (int) settings.ThreadCountGMH; - uadGMT.Value = (int) settings.ThreadCountGMT; - uadVER.Value = (int) settings.ThreadCountVER; - uadVEA.Value = (int) settings.ThreadCountVEA; - uadVEH.Value = (int) settings.ThreadCountVEH; + uadGMR.Value = (int)settings.ThreadCountGMR; + uadGMA.Value = (int)settings.ThreadCountGMA; + uadGMH.Value = (int)settings.ThreadCountGMH; + uadGMT.Value = (int)settings.ThreadCountGMT; + uadVER.Value = (int)settings.ThreadCountVER; + uadVEA.Value = (int)settings.ThreadCountVEA; + uadVEH.Value = (int)settings.ThreadCountVEH; - cmbMoveUp.SelectedValue = (int) settings.ActionMoveUp; - cmbMoveDown.SelectedValue = (int) settings.ActionMoveDown; - cmbMoveLeft.SelectedValue = (int) settings.ActionMoveLeft; - cmbMoveRight.SelectedValue = (int) settings.ActionMoveRight; - cmbZoomIn.SelectedValue = (int) settings.ActionZoomIn; - cmbZoomOut.SelectedValue = (int) settings.ActionZoomOut; - cmbToggleZoomMode.SelectedValue = (int) settings.ActionToggleZoomMode; - cmbToggleRoad.SelectedValue = (int) settings.ActionToggleRoad; - cmbToggleSatellite.SelectedValue = (int) settings.ActionToggleSatellite; - cmbToggleHybrid.SelectedValue = (int) settings.ActionToggleHybrid; - cmbWorldOverview.SelectedValue = (int) settings.ActionWorldOverview; + cmbMoveUp.SelectedValue = (int)settings.ActionMoveUp; + cmbMoveDown.SelectedValue = (int)settings.ActionMoveDown; + cmbMoveLeft.SelectedValue = (int)settings.ActionMoveLeft; + cmbMoveRight.SelectedValue = (int)settings.ActionMoveRight; + cmbZoomIn.SelectedValue = (int)settings.ActionZoomIn; + cmbZoomOut.SelectedValue = (int)settings.ActionZoomOut; + cmbToggleZoomMode.SelectedValue = (int)settings.ActionToggleZoomMode; + cmbToggleRoad.SelectedValue = (int)settings.ActionToggleRoad; + cmbToggleSatellite.SelectedValue = (int)settings.ActionToggleSatellite; + cmbToggleHybrid.SelectedValue = (int)settings.ActionToggleHybrid; + cmbWorldOverview.SelectedValue = (int)settings.ActionWorldOverview; cbGenerateActionLogEntries.Checked = settings.GenerateActionLogEntries; @@ -122,25 +122,25 @@ { //settings = new Settings(); - settings.ThreadCountGMR = (int) uadGMR.Value; - settings.ThreadCountGMA = (int) uadGMA.Value; - settings.ThreadCountGMH = (int) uadGMH.Value; - settings.ThreadCountGMT = (int) uadGMT.Value; - settings.ThreadCountVER = (int) uadVER.Value; - settings.ThreadCountVEA = (int) uadVEA.Value; - settings.ThreadCountVEH = (int) uadVEH.Value; + settings.ThreadCountGMR = (int)uadGMR.Value; + settings.ThreadCountGMA = (int)uadGMA.Value; + settings.ThreadCountGMH = (int)uadGMH.Value; + settings.ThreadCountGMT = (int)uadGMT.Value; + settings.ThreadCountVER = (int)uadVER.Value; + settings.ThreadCountVEA = (int)uadVEA.Value; + settings.ThreadCountVEH = (int)uadVEH.Value; - settings.ActionMoveUp = (Action.ActionType) cmbMoveUp.SelectedValue; - settings.ActionMoveDown = (Action.ActionType) cmbMoveDown.SelectedValue; - settings.ActionMoveLeft = (Action.ActionType) cmbMoveLeft.SelectedValue; - settings.ActionMoveRight = (Action.ActionType) cmbMoveRight.SelectedValue; - settings.ActionZoomIn = (Action.ActionType) cmbZoomIn.SelectedValue; - settings.ActionZoomOut = (Action.ActionType) cmbZoomOut.SelectedValue; - settings.ActionToggleZoomMode = (Action.ActionType) cmbToggleZoomMode.SelectedValue; - settings.ActionToggleRoad = (Action.ActionType) cmbToggleRoad.SelectedValue; - settings.ActionToggleSatellite = (Action.ActionType) cmbToggleSatellite.SelectedValue; - settings.ActionToggleHybrid = (Action.ActionType) cmbToggleHybrid.SelectedValue; - settings.ActionWorldOverview = (Action.ActionType) cmbWorldOverview.SelectedValue; + settings.ActionMoveUp = (Action.ActionType)cmbMoveUp.SelectedValue; + settings.ActionMoveDown = (Action.ActionType)cmbMoveDown.SelectedValue; + settings.ActionMoveLeft = (Action.ActionType)cmbMoveLeft.SelectedValue; + settings.ActionMoveRight = (Action.ActionType)cmbMoveRight.SelectedValue; + settings.ActionZoomIn = (Action.ActionType)cmbZoomIn.SelectedValue; + settings.ActionZoomOut = (Action.ActionType)cmbZoomOut.SelectedValue; + settings.ActionToggleZoomMode = (Action.ActionType)cmbToggleZoomMode.SelectedValue; + settings.ActionToggleRoad = (Action.ActionType)cmbToggleRoad.SelectedValue; + settings.ActionToggleSatellite = (Action.ActionType)cmbToggleSatellite.SelectedValue; + settings.ActionToggleHybrid = (Action.ActionType)cmbToggleHybrid.SelectedValue; + settings.ActionWorldOverview = (Action.ActionType)cmbWorldOverview.SelectedValue; settings.GenerateActionLogEntries = cbGenerateActionLogEntries.Checked; @@ -155,7 +155,7 @@ settings.DaysToKeepCachedOverviewTiles = Convert.To... [truncated message content] |