Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1153] trunk/plugins/WorldMap
|
From: <lk...@us...> - 2007-12-13 14:07:22
|
Revision: 1153
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1153&view=rev
Author: lkuech
Date: 2007-12-13 06:07:17 -0800 (Thu, 13 Dec 2007)
Log Message:
-----------
Made the new Terrain maps default for new setups (that did start for the first time)
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/Worldmap.xmp
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/WorldMap.cs
Modified: trunk/plugins/WorldMap/Installer/Worldmap.xmp
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2007-12-13 12:36:28 UTC (rev 1152)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2007-12-13 14:07:17 UTC (rev 1153)
@@ -8,7 +8,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\bin\Release\GUIWorldmap.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>b396f951-e4bc-41ee-b375-ada7c418bfb4</Guid>
+ <Guid>060956a8-cef0-4726-a19a-c2aa727883df</Guid>
</File>
<File>
<FileName>GUIWorldmap.xml</FileName>
@@ -17,7 +17,7 @@
<Source>GUIWorldmap.xml</Source>
<Id>01010</Id>
<Option />
- <Guid>65f941d2-2c3b-4dee-ad0e-7e8d6b7c1c8a</Guid>
+ <Guid>f5fbf236-5f4b-455f-a3c5-c0ede150e845</Guid>
</File>
<File>
<FileName>hover_worldmap.png</FileName>
@@ -26,7 +26,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\hover_worldmap.png</Source>
<Id>04010</Id>
<Option />
- <Guid>c8a1358c-d6e2-46ba-8339-f482f3fb2241</Guid>
+ <Guid>5efcfc7b-ae78-426a-b026-50b6da4c97a8</Guid>
</File>
<File>
<FileName>hover_worldmap.png</FileName>
@@ -35,7 +35,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\hover_worldmap.png</Source>
<Id>04010</Id>
<Option />
- <Guid>e990ac65-8765-4ab2-b48e-5e3ef67c8d25</Guid>
+ <Guid>e7103781-cd4d-49a9-8972-7fc938df9580</Guid>
</File>
<File>
<FileName>MyWorldMap.xml</FileName>
@@ -44,7 +44,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\MyWorldMap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>7147f317-d3bc-4106-b823-eb46a122d59b</Guid>
+ <Guid>d4049b41-fb28-4d1a-80fc-c9e4a7685200</Guid>
</File>
<File>
<FileName>MyWorldMap.xml</FileName>
@@ -53,7 +53,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldMap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>0abe1190-123f-4c08-8708-4c57bb835a79</Guid>
+ <Guid>62e37304-b2da-4495-9c91-3dff72f00ef6</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -62,7 +62,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\MyWorldmapMenu.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>f0c73f77-a2ac-4b23-8b95-d62aa14546ca</Guid>
+ <Guid>8e1093e2-328f-4514-8a60-d290e314023e</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -71,7 +71,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapMenu.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>3a6a3022-051c-4354-9033-60103e5d72d6</Guid>
+ <Guid>7580710c-618d-4e6e-b2d4-8337750321c4</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -80,7 +80,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\MyWorldmapSearch.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>635a1ffc-455e-4080-a82c-04dfb14e5b62</Guid>
+ <Guid>759c15b5-b888-4fbe-8add-eae4b54d2929</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -89,7 +89,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapSearch.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>e9635e86-313f-4d13-bfe1-c0f3f824c25d</Guid>
+ <Guid>15bae91a-e4b8-4dbb-8ba1-7c9198766f4b</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -98,7 +98,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\MyWorldmapSearchResults.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>7b3f1cc2-4c84-4add-af89-1663900c1d67</Guid>
+ <Guid>bf3a08f2-df5d-4595-8ea8-62d138d08e19</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -107,7 +107,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapSearchResults.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>ec0d2048-9809-4ef5-9037-e79bc5ccad1b</Guid>
+ <Guid>9c43a7b1-7544-45f6-bdba-7f7dc3202cbd</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -116,7 +116,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\language\MyWorldmap\strings_de.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>0b1b2d38-18ba-4a45-9304-e0603b76e6c4</Guid>
+ <Guid>006e62f7-3f40-4bfd-9e99-16aadf75c366</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -125,7 +125,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\language\MyWorldmap\strings_en.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>0f8839ed-3be5-4355-af53-4e474ab17130</Guid>
+ <Guid>05e3828b-426b-4097-a3af-e720d645999e</Guid>
</File>
<File>
<FileName>strings_no.xml</FileName>
@@ -134,7 +134,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\language\MyWorldmap\strings_no.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>5d56d92e-b22e-4925-a753-843b6d6d0ef1</Guid>
+ <Guid>1afcc8bb-aa8d-4452-848d-8f0a1f26b153</Guid>
</File>
<File>
<FileName>System.Data.SQLite.DLL</FileName>
@@ -143,7 +143,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\System.Data.SQLite.DLL</Source>
<Id>01010</Id>
<Option />
- <Guid>b1876242-ceae-40b9-97d0-1ea7452006ad</Guid>
+ <Guid>0d9db766-c802-4e2c-92e1-fe3c472d054b</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -152,7 +152,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMIPBlocked.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>579aa1e7-fbdc-4727-a9c9-b7e101a86ad6</Guid>
+ <Guid>afa4c48c-b10a-46c0-bb6e-dc07034185d5</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -161,7 +161,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMIPBlocked.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>ce545f0d-8d2e-446d-9f17-45b771238317</Guid>
+ <Guid>767b59db-2c06-49ab-a87c-5abf3e6248c7</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -170,7 +170,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMprogressBarActive.png</Source>
<Id>04010</Id>
<Option />
- <Guid>b94ad3f0-9325-451e-b632-4bb29e544254</Guid>
+ <Guid>2abf5200-59ff-466f-99f9-d5ae1209e5be</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -179,7 +179,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMprogressBarActive.png</Source>
<Id>04010</Id>
<Option />
- <Guid>ea337f95-2234-4779-8d65-b8a071c00f6c</Guid>
+ <Guid>c8470867-c6f5-4ae8-8edd-457c8bd5efaa</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -188,7 +188,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMprogressBarQueued.png</Source>
<Id>04010</Id>
<Option />
- <Guid>79a23ddd-96cd-43dc-9780-98a4f1abd747</Guid>
+ <Guid>0a72a995-224e-466c-b611-1ca1f9c2f2f8</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -197,7 +197,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMprogressBarQueued.png</Source>
<Id>04010</Id>
<Option />
- <Guid>f064559f-7c3f-4081-bd07-e29d712ca17b</Guid>
+ <Guid>4c0a8640-061d-4642-a481-53a196492d56</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -206,7 +206,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMprogressDummy.png</Source>
<Id>04010</Id>
<Option />
- <Guid>603d736a-69bf-4cd3-affc-2558b78878cb</Guid>
+ <Guid>336af7f3-0145-4e67-8b1f-cfbad75e1a84</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -215,7 +215,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMprogressDummy.png</Source>
<Id>04010</Id>
<Option />
- <Guid>32efb54b-353f-41a3-87c3-b0323f3309c0</Guid>
+ <Guid>d8cf6a5c-fa35-4640-8b24-417a3b73fa94</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -224,7 +224,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMTileNotAvailable.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>19b33326-8325-4f12-965e-ea81cac54b36</Guid>
+ <Guid>ba43f235-de94-4987-991a-9bc17f631424</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -233,7 +233,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMTileNotAvailable.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>fcff0e34-e85d-4832-bdbc-546bbb82d306</Guid>
+ <Guid>2301a2e2-7406-424a-bc4b-32bbaa974bc3</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -242,7 +242,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo wide\Media\WMTilePlaceholder.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>1355fd07-5491-443b-a738-06b93a1db27e</Guid>
+ <Guid>34a80876-17b1-41b9-a399-37b990e962c4</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -251,7 +251,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\Media\WMTilePlaceholder.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>0ed81b8e-03fe-4fad-82d2-c31f75832d08</Guid>
+ <Guid>afa3d399-5515-48f8-a93f-43b633b71f77</Guid>
</File>
</FileList>
<StringList />
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2007-12-13 12:36:28 UTC (rev 1152)
+++ trunk/plugins/WorldMap/Settings.cs 2007-12-13 14:07:17 UTC (rev 1153)
@@ -97,7 +97,7 @@
LastZoomLevel = reader.GetValueAsInt(SectionName, ParmLastZoomLevel, 0);
LastZoomFactor = double.Parse(reader.GetValueAsString(SectionName, ParmLastZoomFactor, "2"));
if (LastZoomFactor < 1f) LastZoomFactor = 1f;
- LastMapType = IntToMapType(reader.GetValueAsInt(SectionName, ParmLastMapType, 5));
+ LastMapType = IntToMapType(reader.GetValueAsInt(SectionName, ParmLastMapType, 1));
ThreadCountGMR = reader.GetValueAsInt(SectionName, ParmThreadCountGMR, 5);
ThreadCountGMA = reader.GetValueAsInt(SectionName, ParmThreadCountGMA, 5);
@@ -187,7 +187,7 @@
private MapFunctions.MapType IntToMapType(int intMapType)
{
Array tmpMapTypes = Enum.GetValues(typeof(MapFunctions.MapType));
- if ((intMapType > tmpMapTypes.Length - 1) || (intMapType <0)) intMapType = 5;
+ if ((intMapType > tmpMapTypes.Length - 1) || (intMapType <0)) intMapType = 1;
return (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), intMapType));
}
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2007-12-13 12:36:28 UTC (rev 1152)
+++ trunk/plugins/WorldMap/WorldMap.cs 2007-12-13 14:07:17 UTC (rev 1153)
@@ -86,7 +86,7 @@
public ZoomMode currentZoomMode = ZoomMode.Level;
- public MapFunctions.MapType currentMapType = MapFunctions.MapType.VEHybrid;
+ public MapFunctions.MapType currentMapType = MapFunctions.MapType.GMTerrain;
int LastImageRefresh = System.Environment.TickCount;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
