Menu
▾
▴
mp-plugins-svn
|
From: <lk...@us...> - 2008-07-30 07:42:18
|
Revision: 1982
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1982&view=rev
Author: lkuech
Date: 2008-07-30 07:42:15 +0000 (Wed, 30 Jul 2008)
Log Message:
-----------
fixed url for GMAerial maps
Updated mpi file (RC1)
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/GUIWorldmap.xml
trunk/plugins/WorldMap/Installer/Worldmap.xml
trunk/plugins/WorldMap/Installer/Worldmap.xmp
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
trunk/plugins/WorldMap/Settings.cs
Modified: trunk/plugins/WorldMap/Installer/GUIWorldmap.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2008-07-30 07:40:32 UTC (rev 1981)
+++ trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2008-07-30 07:42:15 UTC (rev 1982)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<profile>
<section name="MyWorldmap">
- <entry name="parmgmaurl">http://kh{0}.google.com/kh?n=404&v=99&t={1}</entry>
+ <entry name="parmgmaurl">http://khm{0}.google.com/kh?n=404&v=99&t={1}</entry>
<entry name="parmgmrurl">http://mt{0}.google.com/mt?n=404&v=w2.99&x={1}&y={2}&zoom={3}</entry>
<entry name="parmgmhurl">http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}</entry>
<entry name="parmgmturl">http://mt{0}.google.com/mt?n=404&v=w2p.99&x={1}&y={2}&zoom={3}</entry>
Modified: trunk/plugins/WorldMap/Installer/Worldmap.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xml 2008-07-30 07:40:32 UTC (rev 1981)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xml 2008-07-30 07:42:15 UTC (rev 1982)
@@ -5,7 +5,7 @@
<FileName>Worldmap.mpi</FileName>
<Name>Worldmap</Name>
<URL>http://www.team-mediaportal.com</URL>
- <Version>0.5</Version>
+ <Version>1.0 RC1</Version>
<Author>LKuech</Author>
<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>
Modified: trunk/plugins/WorldMap/Installer/Worldmap.xmp
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-07-30 07:40:32 UTC (rev 1981)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-07-30 07:42:15 UTC (rev 1982)
@@ -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>38597bb0-0df2-4f2e-a4d4-79ae4e74c809</Guid>
+ <Guid>3cbd7a20-b779-4da6-b817-93f3bcc461fb</Guid>
</File>
<File>
<FileName>GUIWorldmap.xml</FileName>
@@ -17,7 +17,7 @@
<Source>GUIWorldmap.xml</Source>
<Id>01010</Id>
<Option />
- <Guid>e37454ad-9e1d-480d-bae5-32a5c9fab8d2</Guid>
+ <Guid>f818ce66-b9b5-456c-a7a7-32dfea3d2dfd</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>d344ee1f-acba-4404-9f60-43a92272caa3</Guid>
+ <Guid>3c560da3-66f2-4507-b007-abf877adbb41</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>6ad61fbb-2cf6-46b4-9a01-bb9842dfd610</Guid>
+ <Guid>5cd58b08-9e21-4fb7-9bc5-c86717fa67f3</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>142e2e32-de00-497b-b604-0a577a5be997</Guid>
+ <Guid>fdc42f59-018a-4658-ab32-26bad7909113</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>31117dab-ec31-4841-a97b-c7e22b9657f2</Guid>
+ <Guid>b8cea928-a93c-41ab-afff-8bc27c381188</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>db1b7706-caf3-4ad1-8b60-4b7c46e66ad0</Guid>
+ <Guid>aa490911-fb8b-4179-9e6a-f2370fb38b88</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>decc2347-47e5-4686-a267-d727db9fad39</Guid>
+ <Guid>dd649f41-da58-4d6d-adf9-3fbeee31dfcd</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>6be93826-21ee-4e3b-b299-8399ba315fd1</Guid>
+ <Guid>d6fd7ae2-5bcc-4014-b963-fb0cf67f912e</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>4210f654-03d1-4ffb-adcb-a0341efefa76</Guid>
+ <Guid>b8df8726-9873-4577-8a1c-8b7cf6fb94de</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>87859a8c-81e3-43fb-be97-8135253bb426</Guid>
+ <Guid>923d8a97-9357-483e-ae97-b91c85da4b98</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>a4382150-b791-46fc-bb24-abe5a0142735</Guid>
+ <Guid>187fdb26-f921-441a-ad2e-99762bd02c64</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>54c487c2-b583-4e5f-9836-5422fa461a2c</Guid>
+ <Guid>e7a77301-ea14-4f6a-a4df-a9acf643a7d6</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>69d9dce4-fbe3-4ba3-be93-cfd83443123d</Guid>
+ <Guid>a3a7a6da-ac43-4c1d-a6f0-3488d3c8b0f4</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>f89f9b66-c052-4278-ab42-01c3eeacf9a8</Guid>
+ <Guid>a737b9ce-20d4-4d76-9bd4-230550c8bb3a</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>cf84758b-6d66-44d4-93bf-0df51d301e9f</Guid>
+ <Guid>175a4736-976a-4da5-a636-a8725cb8a44c</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>b505eee3-23c4-4884-871c-47b1f8c84b2e</Guid>
+ <Guid>d13e2311-68c1-4211-aec6-dc4cbb250c01</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>a21d1942-08cc-4bc2-926c-23a7f22688de</Guid>
+ <Guid>8e1de429-aaa6-40b5-8ac6-d06b88bd6ce3</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>3d832a2d-8bf5-469a-9ecf-90d009c806fe</Guid>
+ <Guid>b37e7732-f640-40d5-a69a-261f656be6e8</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>a6d65a8e-8c71-4257-9e0a-7b685c50e7eb</Guid>
+ <Guid>44c5a590-f57d-475d-aaa5-d90697d269c9</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>8d30c1fd-323c-4359-b6eb-9df287872cf4</Guid>
+ <Guid>d1f1a6a5-25a7-443a-858e-d1a9fcb7d094</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>fb1fc111-e803-44a6-a6ec-accdedebcfc2</Guid>
+ <Guid>8547c2c4-e0b6-4dcd-a10b-26268b515aa7</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>76d87e83-3fc2-4858-ac08-25ab9a9254e6</Guid>
+ <Guid>312d7b62-07e4-4f42-a7fe-221ce6159336</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>c9eb9885-9290-4f4f-a100-0f4a675f1150</Guid>
+ <Guid>6b5e3246-070d-48e4-98e7-f59faf8dde77</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>751dbf71-cb22-4cfc-8353-860b0efcf5ce</Guid>
+ <Guid>a8e5abe3-6cf1-42aa-84f6-a8cdcda74ed2</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>59edd262-7382-4914-8464-941b56ec201a</Guid>
+ <Guid>246822b1-e78d-4439-9040-6d2f604f99fe</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>7c527f26-1779-4a28-8429-5bd30dde8ef2</Guid>
+ <Guid>d4d3b902-3bd6-403a-bdb1-1fdc47bfdd19</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>aaf0cb82-9b25-4f61-b140-ebdbd1a3c865</Guid>
+ <Guid>5a9160d8-3639-4406-a419-d0a4edc996ed</Guid>
</File>
</FileList>
<StringList />
@@ -264,7 +264,7 @@
<ProiectName>Worldmap</ProiectName>
<Author>LKuech</Author>
<UpdateURL>http://www.team-mediaportal.com</UpdateURL>
- <Version>0.5</Version>
+ <Version>1.0 RC1</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>
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-07-30 07:40:32 UTC (rev 1981)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-07-30 07:42:15 UTC (rev 1982)
@@ -5,11 +5,11 @@
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("MyWorldMap")]
+[assembly: AssemblyTitle("WorldMap")]
[assembly: AssemblyDescription("plugin for MediaPortal")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("MyWorldMap")]
+[assembly: AssemblyProduct("WorldMap")]
[assembly: AssemblyCopyright("(c) 2008")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -31,5 +31,5 @@
//
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("0.5.1.0")]
-[assembly: AssemblyFileVersion("0.5.1.0")]
+[assembly: AssemblyVersion("0.9.0.0")]
+[assembly: AssemblyFileVersion("0.9.0.0")]
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2008-07-30 07:40:32 UTC (rev 1981)
+++ trunk/plugins/WorldMap/Settings.cs 2008-07-30 07:42:15 UTC (rev 1982)
@@ -127,7 +127,7 @@
using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins,"Windows") + "\\GUIWorldmap.xml"))
{
- GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://kh{0}.google.com/kh?n=404&v=99&t={1}");
+ GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?n=404&v=99&t={1}");
GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?n=404&v=w2.99&x={1}&y={2}&zoom={3}");
GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}");
GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?n=404&v=w2p.99&x={1}&y={2}&zoom={3}");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-08-22 12:29:31
|
Revision: 2069
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2069&view=rev
Author: lkuech
Date: 2008-08-22 12:29:28 +0000 (Fri, 22 Aug 2008)
Log Message:
-----------
WorldMap: Some more small adaption concerning the VirtualKeyboard
Modified Paths:
--------------
trunk/plugins/WorldMap/NewVirtualKeyboard.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
Modified: trunk/plugins/WorldMap/NewVirtualKeyboard.cs
===================================================================
--- trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2008-08-22 12:08:23 UTC (rev 2068)
+++ trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2008-08-22 12:29:28 UTC (rev 2069)
@@ -378,6 +378,7 @@
};
#endregion
+
class Key
{
public Xkey xKey; // virtual key code
@@ -569,12 +570,10 @@
_searchKind = (int)SearchKinds.SEARCH_CONTAINS; // default search Contains
- Location = new MediaPortal.Drawing.Point(64, 208);
-
int y = 411;
int x = 40;
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
BUTTON_Y_POS = x; // button text line
BUTTON_X_OFFSET = y; // space between button and text
@@ -636,7 +635,7 @@
int x1 = (int)Location.X;
int y1 = (int)Location.Y + 42;
//int y1 = 250, x1 = 64;
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
float fY = y1;
ArrayList keyBoard = (ArrayList)_keyboardList[(int)_currentKeyboard];
for (int row = 0; row < _maxRows; ++row, fY += _keyHeight)
@@ -1726,7 +1725,7 @@
void DrawText(int x, int y)
{
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
x += GUIGraphicsContext.OffsetX;
y += GUIGraphicsContext.OffsetY;
string textLine = _textEntered;
@@ -1764,13 +1763,13 @@
int tmpX = (int)(Location.X);
int tmpY = (int)Location.Y;
- DrawTextBox(timePassed, (int)(tmpX * SkinRatio), tmpY, (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + tmpX) * SkinRatio), tmpY + 40);
+ DrawTextBox(timePassed, (int)(tmpX * SkinRatio), tmpY - 10 , (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + tmpX) * SkinRatio), tmpY + 30);
DrawText((int)(tmpX + 4 * SkinRatio), tmpY);
int x1 = (int)(tmpX*SkinRatio);
int y1 = tmpY + 42;
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
x1 += GUIGraphicsContext.OffsetX;
y1 += GUIGraphicsContext.OffsetY;
// Draw each row
Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs 2008-08-22 12:08:23 UTC (rev 2068)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs 2008-08-22 12:29:28 UTC (rev 2069)
@@ -199,7 +199,7 @@
keyboard.Reset();
keyboard.IsSearchKeyboard = false;
int x = (int)tmpLabel.Location.X;// +25;
- int y = (int)tmpLabel.Location.Y - 5;
+ int y = (int)tmpLabel.Location.Y + 5;
keyboard.Location = new MediaPortal.Drawing.Point(x, y);
keyboard.Text = tmpLabel.Label;
keyboard.DoModal(GetID); // show it...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-09-25 11:03:28
|
Revision: 2139
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2139&view=rev
Author: lkuech
Date: 2008-09-25 11:03:20 +0000 (Thu, 25 Sep 2008)
Log Message:
-----------
WorldMap: Fixed some positioning bug is the NewVirtualKeyboard class. This should avoid the different appearance compared to the original VirtualKeyboard.
WorldMap: Fixed a potential NullException
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
trunk/plugins/WorldMap/NewVirtualKeyboard.cs
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
Modified: trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2008-09-24 17:36:51 UTC (rev 2138)
+++ trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2008-09-25 11:03:20 UTC (rev 2139)
@@ -154,19 +154,20 @@
{
if (QueuedImageDownloads.Count > 0)
{
- MapTile tmpTile = QueuedImageDownloads[0];
- QueuedImageDownloads.RemoveAt(0);
-
- Thread t = new Thread(new ParameterizedThreadStart(ImageThread));
- t.Priority = ThreadPriority.BelowNormal;
- t.Name = "MapTileDownloader";
- t.IsBackground = true;
- ImageDownloadThreads.Add(t);
try
{
+ MapTile tmpTile = QueuedImageDownloads[0];
+ QueuedImageDownloads.RemoveAt(0);
+
+ Thread t = new Thread(new ParameterizedThreadStart(ImageThread));
+ t.Priority = ThreadPriority.BelowNormal;
+ t.Name = "MapTileDownloader";
+ t.IsBackground = true;
+ ImageDownloadThreads.Add(t);
+
t.Start(tmpTile);
}
- catch (ThreadStartException err)
+ catch (Exception err)
{ }
//if(QueuedImageDownloads.Count>0) QueuedImageDownloads.RemoveAt(0);
Modified: trunk/plugins/WorldMap/NewVirtualKeyboard.cs
===================================================================
--- trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2008-09-24 17:36:51 UTC (rev 2138)
+++ trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2008-09-25 11:03:20 UTC (rev 2139)
@@ -460,6 +460,7 @@
bool _password = false;
GUIImage image;
bool _useSearchLayout = false;
+ bool _locationChangedManually = false;
// added by Agree
int _searchKind; // 0=Starts with, 1=Contains, 2=Ends with
@@ -507,6 +508,9 @@
// construct search def.
_searchKind = (int)SearchKinds.SEARCH_CONTAINS; // default search Contains
+ Location = new MediaPortal.Drawing.Point((int)(64 * SkinRatio), 250);
+ _locationChangedManually = false;
+
if (GUIGraphicsContext.DX9Device != null)
InitBoard();
}
@@ -585,9 +589,18 @@
GUIGraphicsContext.ScaleHorizontal(ref width);
fTEXTBOX_WIDTH = width;
+ Location = new MediaPortal.Drawing.Point((int)(64 * SkinRatio), 250);
+ _locationChangedManually = false;
+
InitBoard();
}
+ public void SetLocation(MediaPortal.Drawing.Point location)
+ {
+ Location = location;
+ _locationChangedManually = true;
+ }
+
public bool Password
{
get { return _password; }
@@ -632,7 +645,7 @@
public void SelectActiveButton(float x, float y)
{
// Draw each row
- int x1 = (int)Location.X;
+ int x1 = (int)(Location.X);
int y1 = (int)Location.Y + 42;
//int y1 = 250, x1 = 64;
GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
@@ -1699,8 +1712,8 @@
{
//long lColor=0xaaffffff;
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
- //GUIGraphicsContext.ScalePosToScreenResolution(ref x2, ref y2);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
+ GUIGraphicsContext.ScalePosToScreenResolution(ref x2, ref y2);
x1 += GUIGraphicsContext.OffsetX;
x2 += GUIGraphicsContext.OffsetX;
@@ -1756,17 +1769,13 @@
void RenderKeyboardLatin(float timePassed)
{
// Show text and caret
-// DrawTextBox(timePassed, (int)(64 * SkinRatio), 208, (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + 67.0f) * SkinRatio), 248); //- 64.0f - 4.0f - 4.0f - 10.0f
-// DrawText((int)(82 * SkinRatio), 208);
-
-
int tmpX = (int)(Location.X);
int tmpY = (int)Location.Y;
- DrawTextBox(timePassed, (int)(tmpX * SkinRatio), tmpY - 10 , (int)((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10 + tmpX) * SkinRatio), tmpY + 30);
- DrawText((int)(tmpX + 4 * SkinRatio), tmpY);
+ DrawTextBox(timePassed, (int)(tmpX), tmpY - 5, (int)(((MODEKEY_WIDTH + GAP_WIDTH * 9 + GAP2_WIDTH + KEY_WIDTH * 10) * SkinRatio) + Location.X), tmpY + 35);
+ DrawText((int)(tmpX + 4), tmpY);
- int x1 = (int)(tmpX*SkinRatio);
+ int x1 = (int)(tmpX);
int y1 = tmpY + 42;
GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-09-24 17:36:51 UTC (rev 2138)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-09-25 11:03:20 UTC (rev 2139)
@@ -31,5 +31,5 @@
//
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]
Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs 2008-09-24 17:36:51 UTC (rev 2138)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs 2008-09-25 11:03:20 UTC (rev 2139)
@@ -200,7 +200,7 @@
keyboard.IsSearchKeyboard = false;
int x = (int)tmpLabel.Location.X;// +25;
int y = (int)tmpLabel.Location.Y + 5;
- keyboard.Location = new MediaPortal.Drawing.Point(x, y);
+ keyboard.SetLocation(new MediaPortal.Drawing.Point(x, y));
keyboard.Text = tmpLabel.Label;
keyboard.DoModal(GetID); // show it...
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-10-09 13:15:22
|
Revision: 2178
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2178&view=rev
Author: lkuech
Date: 2008-10-09 13:15:15 +0000 (Thu, 09 Oct 2008)
Log Message:
-----------
WorldMap: First changes to respect the changes Google did to their URL's (more to come)
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/MapFunctions.cs
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/WorldMap.cs
Property Changed:
----------------
trunk/plugins/WorldMap/
Property changes on: trunk/plugins/WorldMap
___________________________________________________________________
Added: svn:ignore
+ bin
obj
Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2008-10-06 20:54:42 UTC (rev 2177)
+++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2008-10-09 13:15:15 UTC (rev 2178)
@@ -364,7 +364,7 @@
public static string GetGMapTileCode(int TileX, int TileY, int zoomLevel)
{
- int localzoom = (17 - zoomLevel);
+ int localzoom = zoomLevel;//(17 - zoomLevel);
string tileid = "";
double numLong = (int)TileX;
double numLat = (int)TileY;
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2008-10-06 20:54:42 UTC (rev 2177)
+++ trunk/plugins/WorldMap/Settings.cs 2008-10-09 13:15:15 UTC (rev 2178)
@@ -128,9 +128,9 @@
using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins,"Windows") + "\\GUIWorldmap.xml"))
{
GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?n=404&v=99&t={1}");
- GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?n=404&v=w2.99&x={1}&y={2}&zoom={3}");
+ GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?v=w2.83&x={1}&y={2}&z={3}");
GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}");
- GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?n=404&v=w2p.99&x={1}&y={2}&zoom={3}");
+ GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?v=app.81&x={1}&y={2}&z={3}");
VEUrl = reader.GetValueAsString(SectionName, ParmVEUrl, "http://{0}{1}.ortho.tiles.virtualearth.net/tiles/{0}{2}{3}?g=1");
}
}
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2008-10-06 20:54:42 UTC (rev 2177)
+++ trunk/plugins/WorldMap/WorldMap.cs 2008-10-09 13:15:15 UTC (rev 2178)
@@ -655,8 +655,8 @@
0, 0,//width/height
1,//mipslevels
0,//Usage.Dynamic,
- Format.X8R8G8B8,
- Pool.Managed,
+ Format.A8R8G8B8,
+ GUIGraphicsContext.GetTexturePoolType(),
Filter.None,
Filter.None,
(int)0,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-10-10 06:39:23
|
Revision: 2181
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2181&view=rev
Author: lkuech
Date: 2008-10-10 06:39:13 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
WoWorldMap: Some more url related changes
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/MapFunctions.cs
trunk/plugins/WorldMap/MyWorldMap.csproj
trunk/plugins/WorldMap/Settings.cs
Removed Paths:
-------------
trunk/plugins/WorldMap/System.Data.SQLite.DLL
Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2008-10-10 06:39:13 UTC (rev 2181)
@@ -364,7 +364,7 @@
public static string GetGMapTileCode(int TileX, int TileY, int zoomLevel)
{
- int localzoom = zoomLevel;//(17 - zoomLevel);
+ int localzoom = (17 - zoomLevel);
string tileid = "";
double numLong = (int)TileX;
double numLat = (int)TileY;
Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj 2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj 2008-10-10 06:39:13 UTC (rev 2181)
@@ -36,6 +36,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Dialogs\bin\Debug\Dialogs.dll</HintPath>
</Reference>
+ <Reference Include="GUIWorldMap.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\GUIWorldMap.SQLite.DLL</HintPath>
+ </Reference>
<Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\MediaPortal.Base\Microsoft.DirectX.Direct3D.dll</HintPath>
</Reference>
@@ -48,10 +52,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
- <Reference Include="System.Data.SQLite, Version=1.0.41.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>.\System.Data.SQLite.DLL</HintPath>
- </Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2008-10-09 17:31:15 UTC (rev 2180)
+++ trunk/plugins/WorldMap/Settings.cs 2008-10-10 06:39:13 UTC (rev 2181)
@@ -99,13 +99,13 @@
if (LastZoomFactor < 1f) LastZoomFactor = 1f;
LastMapType = IntToMapType(reader.GetValueAsInt(SectionName, ParmLastMapType, 1));
- ThreadCountGMR = reader.GetValueAsInt(SectionName, ParmThreadCountGMR, 5);
- ThreadCountGMA = reader.GetValueAsInt(SectionName, ParmThreadCountGMA, 5);
- ThreadCountGMH = reader.GetValueAsInt(SectionName, ParmThreadCountGMH, 5);
- ThreadCountGMT = reader.GetValueAsInt(SectionName, ParmThreadCountGMT, 5);
- ThreadCountVER = reader.GetValueAsInt(SectionName, ParmThreadCountVER, 5);
- ThreadCountVEA = reader.GetValueAsInt(SectionName, ParmThreadCountVEA, 5);
- ThreadCountVEH = reader.GetValueAsInt(SectionName, ParmThreadCountVEH, 5);
+ ThreadCountGMR = reader.GetValueAsInt(SectionName, ParmThreadCountGMR, 1);
+ ThreadCountGMA = reader.GetValueAsInt(SectionName, ParmThreadCountGMA, 1);
+ ThreadCountGMH = reader.GetValueAsInt(SectionName, ParmThreadCountGMH, 1);
+ ThreadCountGMT = reader.GetValueAsInt(SectionName, ParmThreadCountGMT, 1);
+ ThreadCountVER = reader.GetValueAsInt(SectionName, ParmThreadCountVER, 1);
+ ThreadCountVEA = reader.GetValueAsInt(SectionName, ParmThreadCountVEA, 1);
+ ThreadCountVEH = reader.GetValueAsInt(SectionName, ParmThreadCountVEH, 1);
DaysToKeepCachedDetailedTiles = reader.GetValueAsInt(SectionName, ParmDaysToKeepCachedDetailedTiles, 30);
DaysToKeepCachedOverviewTiles = reader.GetValueAsInt(SectionName, ParmDaysToKeepCachedOverviewTiles, 200);
@@ -125,12 +125,12 @@
GenerateActionLogEntries = reader.GetValueAsBool(SectionName, ParmGenerateLogEntries, false);
}
- using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins,"Windows") + "\\GUIWorldmap.xml"))
+ using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml"))
{
- GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?n=404&v=99&t={1}");
- GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?v=w2.83&x={1}&y={2}&z={3}");
- GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}");
- GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?v=app.81&x={1}&y={2}&z={3}");
+ GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://khm{0}.google.com/kh?v=99&t={1}");
+ GMRUrl = reader.GetValueAsString(SectionName, ParmGMRUrl, "http://mt{0}.google.com/mt?v=w2.99&x={1}&y={2}&zoom={3}");
+ GMHUrl = reader.GetValueAsString(SectionName, ParmGMHUrl, "http://mt{0}.google.com/mt?v=w2t.99&x={1}&y={2}&zoom={3}");
+ GMTUrl = reader.GetValueAsString(SectionName, ParmGMTUrl, "http://mt{0}.google.com/mt?v=w2p.99&x={1}&y={2}&zoom={3}");
VEUrl = reader.GetValueAsString(SectionName, ParmVEUrl, "http://{0}{1}.ortho.tiles.virtualearth.net/tiles/{0}{2}{3}?g=1");
}
}
@@ -174,7 +174,7 @@
public void SaveMapUrls()
{
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetSubFolder(Config.Dir.Plugins, "Windows") + "\\GUIWorldmap.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFolder(Config.Dir.Config) + "\\GUIWorldmap.xml"))
{
xmlwriter.SetValue(SectionName, ParmGMAUrl, GMAUrl);
xmlwriter.SetValue(SectionName, ParmGMRUrl, GMRUrl);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-10-10 06:42:29
|
Revision: 2182
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2182&view=rev
Author: lkuech
Date: 2008-10-10 06:42:26 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Worldmap: New version of the System.Data.SQLite.DLL
Modified Paths:
--------------
trunk/plugins/WorldMap/MyWorldMap.csproj
Added Paths:
-----------
trunk/plugins/WorldMap/System.Data.SQLite.DLL
Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj 2008-10-10 06:39:13 UTC (rev 2181)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj 2008-10-10 06:42:26 UTC (rev 2182)
@@ -36,10 +36,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Dialogs\bin\Debug\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="GUIWorldMap.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>.\GUIWorldMap.SQLite.DLL</HintPath>
- </Reference>
<Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<HintPath>..\MediaPortal.Base\Microsoft.DirectX.Direct3D.dll</HintPath>
</Reference>
@@ -52,6 +48,10 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
+ <Reference Include="System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>.\System.Data.SQLite.DLL</HintPath>
+ </Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Property changes on: trunk/plugins/WorldMap/System.Data.SQLite.DLL
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lk...@us...> - 2008-10-10 07:47:35
|
Revision: 2183
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2183&view=rev
Author: lkuech
Date: 2008-10-10 07:47:18 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Worldmap: Preparing the new version installer
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/GUIWorldmap.xml
trunk/plugins/WorldMap/Installer/Worldmap.xml
trunk/plugins/WorldMap/Installer/Worldmap.xmp
Added Paths:
-----------
trunk/plugins/WorldMap/skinFiles/Blue3/
trunk/plugins/WorldMap/skinFiles/Blue3/Media/
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/Blue3/MyWorldMap.xml
trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapMenu.xml
trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapSearch.xml
trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapSearchResults.xml
Modified: trunk/plugins/WorldMap/Installer/GUIWorldmap.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2008-10-10 06:42:26 UTC (rev 2182)
+++ trunk/plugins/WorldMap/Installer/GUIWorldmap.xml 2008-10-10 07:47:18 UTC (rev 2183)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<profile>
<section name="MyWorldmap">
- <entry name="parmgmaurl">http://khm{0}.google.com/kh?n=404&v=99&t={1}</entry>
- <entry name="parmgmrurl">http://mt{0}.google.com/mt?n=404&v=w2.99&x={1}&y={2}&zoom={3}</entry>
- <entry name="parmgmhurl">http://mt{0}.google.com/mt?n=404&v=w2t.99&x={1}&y={2}&zoom={3}</entry>
- <entry name="parmgmturl">http://mt{0}.google.com/mt?n=404&v=w2p.99&x={1}&y={2}&zoom={3}</entry>
+ <entry name="parmgmaurl">http://khm{0}.google.com/kh?v=99&t={1}</entry>
+ <entry name="parmgmrurl">http://mt{0}.google.com/mt?v=w2.99&x={1}&y={2}&zoom={3}</entry>
+ <entry name="parmgmhurl">http://mt{0}.google.com/mt?v=w2t.99&x={1}&y={2}&zoom={3}</entry>
+ <entry name="parmgmturl">http://mt{0}.google.com/mt?v=w2p.99&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.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xml 2008-10-10 06:42:26 UTC (rev 2182)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xml 2008-10-10 07:47:18 UTC (rev 2183)
@@ -5,7 +5,7 @@
<FileName>Worldmap.mpi</FileName>
<Name>Worldmap</Name>
<URL>http://www.team-mediaportal.com</URL>
- <Version>1.0 RC1</Version>
+ <Version>1.0 RC2</Version>
<Author>LKuech</Author>
<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>
@@ -17,7 +17,7 @@
<MaxExtensionVersion />
<ForumURL />
<WebURL />
- <CreationDate>Monday, December 10, 2007 12:00:00 AM</CreationDate>
+ <CreationDate>10-10-08</CreationDate>
<SingleGroupSelect>False</SingleGroupSelect>
</Properties>
<Uninstall />
Modified: trunk/plugins/WorldMap/Installer/Worldmap.xmp
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-10-10 06:42:26 UTC (rev 2182)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-10-10 07:47:18 UTC (rev 2183)
@@ -8,16 +8,16 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\bin\Release\GUIWorldmap.dll</Source>
<Id>01010</Id>
<Option />
- <Guid>3cbd7a20-b779-4da6-b817-93f3bcc461fb</Guid>
+ <Guid>03e885f4-bfdb-481f-baea-d4e2568c5858</Guid>
</File>
<File>
<FileName>GUIWorldmap.xml</FileName>
- <Type>Plugin</Type>
- <SubType>Window</SubType>
+ <Type>Other</Type>
+ <SubType>%Config%</SubType>
<Source>GUIWorldmap.xml</Source>
- <Id>01010</Id>
+ <Id>04010</Id>
<Option />
- <Guid>f818ce66-b9b5-456c-a7a7-32dfea3d2dfd</Guid>
+ <Guid>9fc0bc0f-94da-411c-a944-ab065a623bb5</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>3c560da3-66f2-4507-b007-abf877adbb41</Guid>
+ <Guid>9c95673f-6987-45de-9c47-b41400cdd1a8</Guid>
</File>
<File>
<FileName>hover_worldmap.png</FileName>
@@ -35,16 +35,25 @@
<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>5cd58b08-9e21-4fb7-9bc5-c86717fa67f3</Guid>
+ <Guid>297ff35d-2949-41b3-9bcd-96463861e2e5</Guid>
</File>
<File>
+ <FileName>hover_worldmap.png</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\hover_worldmap.png</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>cb073ca2-126c-4962-9423-cf538de5f384</Guid>
+ </File>
+ <File>
<FileName>MyWorldMap.xml</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide</SubType>
<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>fdc42f59-018a-4658-ab32-26bad7909113</Guid>
+ <Guid>bcc63875-9f47-4d43-9e66-c484d1b2b818</Guid>
</File>
<File>
<FileName>MyWorldMap.xml</FileName>
@@ -53,16 +62,25 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldMap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>b8cea928-a93c-41ab-afff-8bc27c381188</Guid>
+ <Guid>3868a2a1-f7c1-478f-a61d-2d3f224d6c2b</Guid>
</File>
<File>
+ <FileName>MyWorldMap.xml</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldMap.xml</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>748fcfcd-2379-4ab0-bf2e-333be909fea5</Guid>
+ </File>
+ <File>
<FileName>MyWorldmapMenu.xml</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide</SubType>
<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>aa490911-fb8b-4179-9e6a-f2370fb38b88</Guid>
+ <Guid>c13aaa1b-582c-4363-8a52-4ff8f6a61bd2</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -71,16 +89,25 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapMenu.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>dd649f41-da58-4d6d-adf9-3fbeee31dfcd</Guid>
+ <Guid>542a809c-a1db-4c3e-b50f-568e29ecfff6</Guid>
</File>
<File>
+ <FileName>MyWorldmapMenu.xml</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapMenu.xml</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>757e9902-b60d-4aec-8f4e-4d0d02806a27</Guid>
+ </File>
+ <File>
<FileName>MyWorldmapSearch.xml</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide</SubType>
<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>d6fd7ae2-5bcc-4014-b963-fb0cf67f912e</Guid>
+ <Guid>ee358b30-7778-4042-bbf7-aaf563dadfba</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -89,16 +116,25 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapSearch.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>b8df8726-9873-4577-8a1c-8b7cf6fb94de</Guid>
+ <Guid>4b8d8109-889a-460f-83b4-87c054b608a7</Guid>
</File>
<File>
+ <FileName>MyWorldmapSearch.xml</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapSearch.xml</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>0224aa2f-339b-450c-ab99-f92c2a2993df</Guid>
+ </File>
+ <File>
<FileName>MyWorldmapSearchResults.xml</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide</SubType>
<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>923d8a97-9357-483e-ae97-b91c85da4b98</Guid>
+ <Guid>64b660a4-7d2a-4eec-9258-6d0f9460d148</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -107,16 +143,25 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\BlueTwo\MyWorldmapSearchResults.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>187fdb26-f921-441a-ad2e-99762bd02c64</Guid>
+ <Guid>d1b75301-ac61-4c63-9f73-3989868a4c4f</Guid>
</File>
<File>
+ <FileName>MyWorldmapSearchResults.xml</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapSearchResults.xml</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>8f969d4a-a7b1-4a96-95f4-44fefd4c8e4e</Guid>
+ </File>
+ <File>
<FileName>strings_de.xml</FileName>
<Type>Other</Type>
<SubType>%Language%\MyWorldmap</SubType>
<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>e7a77301-ea14-4f6a-a4df-a9acf643a7d6</Guid>
+ <Guid>deadf031-d3e8-454b-9464-e264b5a56538</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -125,7 +170,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>a3a7a6da-ac43-4c1d-a6f0-3488d3c8b0f4</Guid>
+ <Guid>02ddeb18-6b8d-4532-9e1d-0d39ef105e1b</Guid>
</File>
<File>
<FileName>strings_no.xml</FileName>
@@ -134,7 +179,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>a737b9ce-20d4-4d76-9bd4-230550c8bb3a</Guid>
+ <Guid>03f81c69-b950-4bdb-ae43-1c5aeb9c972c</Guid>
</File>
<File>
<FileName>System.Data.SQLite.DLL</FileName>
@@ -143,7 +188,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>175a4736-976a-4da5-a636-a8725cb8a44c</Guid>
+ <Guid>4ac756ee-5eb9-49b7-ae75-f2ae71ba31ff</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -152,7 +197,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>d13e2311-68c1-4211-aec6-dc4cbb250c01</Guid>
+ <Guid>4524995c-3017-4518-94f9-03ada34dacc4</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -161,16 +206,25 @@
<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>8e1de429-aaa6-40b5-8ac6-d06b88bd6ce3</Guid>
+ <Guid>17388d6a-d651-4871-981d-3e48258aa8dd</Guid>
</File>
<File>
+ <FileName>WMIPBlocked.jpeg</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMIPBlocked.jpeg</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>ae804ad3-2639-4ba7-af32-3aef7f22e190</Guid>
+ </File>
+ <File>
<FileName>WMprogressBarActive.png</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide\Media</SubType>
<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>b37e7732-f640-40d5-a69a-261f656be6e8</Guid>
+ <Guid>ff74b9c4-2b3c-44c5-bac5-b8d3cc632030</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -179,16 +233,25 @@
<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>44c5a590-f57d-475d-aaa5-d90697d269c9</Guid>
+ <Guid>72ddb8b6-6a18-4f32-8a87-d93cb40bb20a</Guid>
</File>
<File>
+ <FileName>WMprogressBarActive.png</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressBarActive.png</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>5740b4b8-43ca-4652-9987-b9366f60fccb</Guid>
+ </File>
+ <File>
<FileName>WMprogressBarQueued.png</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide\Media</SubType>
<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>d1f1a6a5-25a7-443a-858e-d1a9fcb7d094</Guid>
+ <Guid>e79f4505-e62d-40b7-afd2-07087b981f8c</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -197,16 +260,25 @@
<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>8547c2c4-e0b6-4dcd-a10b-26268b515aa7</Guid>
+ <Guid>2dc759ed-5a1f-4254-860a-55938b81ad88</Guid>
</File>
<File>
+ <FileName>WMprogressBarQueued.png</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressBarQueued.png</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>6fc2c223-91db-49e8-b0a7-865558bf6b5a</Guid>
+ </File>
+ <File>
<FileName>WMprogressDummy.png</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide\Media</SubType>
<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>312d7b62-07e4-4f42-a7fe-221ce6159336</Guid>
+ <Guid>bc983cda-0858-4404-8dc9-cf6dbd34b934</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -215,16 +287,25 @@
<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>6b5e3246-070d-48e4-98e7-f59faf8dde77</Guid>
+ <Guid>7bb841a6-9b4e-4b31-864c-0c83981cb0b4</Guid>
</File>
<File>
+ <FileName>WMprogressDummy.png</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressDummy.png</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>b427fbb4-8d1a-4844-a3fe-554e542a016c</Guid>
+ </File>
+ <File>
<FileName>WMTileNotAvailable.jpeg</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide\Media</SubType>
<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>a8e5abe3-6cf1-42aa-84f6-a8cdcda74ed2</Guid>
+ <Guid>9b377054-133b-45f6-87f2-dfbcca6f82cc</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -233,16 +314,25 @@
<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>246822b1-e78d-4439-9040-6d2f604f99fe</Guid>
+ <Guid>81fbf121-6d38-4fb3-aec3-ff76d9ef5cfd</Guid>
</File>
<File>
+ <FileName>WMTileNotAvailable.jpeg</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMTileNotAvailable.jpeg</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>244cfa39-76b2-401e-88a6-b053abda406e</Guid>
+ </File>
+ <File>
<FileName>WMTilePlaceholder.jpeg</FileName>
<Type>Other</Type>
<SubType>%Skin%\BlueTwo wide\Media</SubType>
<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>d4d3b902-3bd6-403a-bdb1-1fdc47bfdd19</Guid>
+ <Guid>6ac10a71-89d1-4b30-abe2-938dd45293fd</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -251,8 +341,17 @@
<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>5a9160d8-3639-4406-a419-d0a4edc996ed</Guid>
+ <Guid>8d05024e-e86a-4cd4-95be-54f5e87321e5</Guid>
</File>
+ <File>
+ <FileName>WMTilePlaceholder.jpeg</FileName>
+ <Type>Other</Type>
+ <SubType>%Skin%\Blue3\Media</SubType>
+ <Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMTilePlaceholder.jpeg</Source>
+ <Id>04010</Id>
+ <Option />
+ <Guid>eaf28786-b25f-4d58-b813-978d0ac349b3</Guid>
+ </File>
</FileList>
<StringList />
<Actions />
@@ -264,7 +363,7 @@
<ProiectName>Worldmap</ProiectName>
<Author>LKuech</Author>
<UpdateURL>http://www.team-mediaportal.com</UpdateURL>
- <Version>1.0 RC1</Version>
+ <Version>1.0 RC2</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>
@@ -277,7 +376,7 @@
<MaxExtensionVersion />
<ForumURL />
<WebURL />
- <CreationDate>Monday, December 10, 2007 12:00:00 AM</CreationDate>
+ <CreationDate>10-10-08</CreationDate>
<SingleGroupSelect>False</SingleGroupSelect>
</Properties>
</MPinstaler>
\ No newline at end of file
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMIPBlocked.jpeg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMTileNotAvailable.jpeg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMTilePlaceholder.jpeg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressBarActive.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressBarQueued.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/WMprogressDummy.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/hover_worldmap.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldMap.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldMap.xml (rev 0)
+++ trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldMap.xml 2008-10-10 07:47:18 UTC (rev 2183)
@@ -0,0 +1,77 @@
+<window>
+ <id>10234</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>25</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>720</width>
+ <height>130</height>
+ <texture>osd_bg.png</texture>
+ </control>
+
+ <control>
+ <description>Longitude</description>
+ <type>label</type>
+ <id>3</id>
+ <posX>60</posX>
+ <posY>30</posY>
+ <label>Longitude</label>
+ <font>font16</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <description>Latitude</description>
+ <type>label</type>
+ <id>4</id>
+ <posX>60</posX>
+ <posY>60</posY>
+ <label>Latitude</label>
+ <font>font16</font>
+ <align>left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <description>MapType</description>
+ <type>label</type>
+ <id>2</id>
+ <posX>644</posX>
+ <posY>30</posY>
+ <label>Map type</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <description>Zoom Mode</description>
+ <type>label</type>
+ <id>5</id>
+ <posX>644</posX>
+ <posY>60</posY>
+ <label>Zoom Mode</label>
+ <font>font16</font>
+ <align>right</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <description>Progressbar Placeholder (gives skinners the chance to define the position of the progressbar)</description>
+ <type>image</type>
+ <id>99</id>
+ <posX>20</posX>
+ <posY>515</posY>
+ <width>25</width>
+ <height>25</height>
+ <texture>WMprogressDummy.png</texture>
+ </control>
+
+ </controls>
+</window>
Added: trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapMenu.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapMenu.xml (rev 0)
+++ trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapMenu.xml 2008-10-10 07:47:18 UTC (rev 2183)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>10235</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
+ <controls>
+ <control>
+ <description>background</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>260</width>
+ <height>576</height>
+ <texture>osd_bg_settings.png</texture>
+ </control>
+
+ <control>
+ <description>Search...</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>25</posX>
+ <posY>100</posY>
+ <label>Search...</label>
+ </control>
+
+ <control>
+ <description>Search address or Location using Yahoo!</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>20</posX>
+ <posY>150</posY>
+ <width>220</width>
+ <label>Address or Location</label>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <onup>10</onup>
+ <ondown>3</ondown>
+ </control>
+
+ <control>
+ <description>Search placename using Geonames.org</description>
+ <type>button</type>
+ <id>3</id>
+ <posX>20</posX>
+ <posY>200</posY>
+ <width>220</width>
+ <label>Placename</label>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>2</onup>
+ <ondown>8</ondown>
+ </control>
+
+ <control>
+ <description>Last Search Result</description>
+ <type>button</type>
+ <id>5</id>
+ <posX>20</posX>
+ <posY>270</posY>
+ <width>220</width>
+ <label>Last Search Result</label>
+ <onleft>5</onleft>
+ <onright>5</onright>
+ <onup>3</onup>
+ <ondown>6</ondown>
+ </control>
+
+ <control>
+ <description>Placemarks</description>
+ <type>button</type>
+ <id>6</id>
+ <posX>20</posX>
+ <posY>330</posY>
+ <width>220</width>
+ <label>Placemarks</label>
+ <onleft>6</onleft>
+ <onright>6</onright>
+ <onup>5</onup>
+ <ondown>8</ondown>
+ </control>
+
+ <control>
+ <description>Toggle ZoomMode</description>
+ <type>button</type>
+ <id>8</id>
+ <posX>20</posX>
+ <posY>410</posY>
+ <width>220</width>
+ <label>Switch To ...</label>
+ <onleft>8</onleft>
+ <onright>8</onright>
+ <onup>6</onup>
+ <ondown>10</ondown>
+ </control>
+
+ <control>
+ <description>Choose a maptype</description>
+ <type>button</type>
+ <id>10</id>
+ <posX>20</posX>
+ <posY>440</posY>
+ <width>220</width>
+ <label>Choose maptype</label>
+ <onleft>10</onleft>
+ <onright>10</onright>
+ <onup>8</onup>
+ <ondown>12</ondown>
+ </control>
+
+ <control>
+ <description>Options</description>
+ <type>button</type>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>470</posY>
+ <width>220</width>
+ <label>Options</label>
+ <onleft>12</onleft>
+ <onright>12</onright>
+ <onup>10</onup>
+ <ondown>2</ondown>
+ </control>
+
+ </controls>
+</window>
Added: trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapSearch.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapSearch.xml (rev 0)
+++ trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapSearch.xml 2008-10-10 07:47:18 UTC (rev 2183)
@@ -0,0 +1,144 @@
+<window>
+ <id>10236</id>
+ <defaultcontrol>2</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
+ <controls>
+ <control>
+ <type>image</type>
+ <id>25</id>
+ <posX>60</posX>
+ <posY>63</posY>
+ <width>600</width>
+ <height>450</height>
+ <texture>osd_dialog_big.png</texture>
+ </control>
+ <control>
+ <type>label</type>
+ <id>24</id>
+ <posX>100</posX>
+ <posY>133</posY>
+ <label>Search for address or location</label>
+ <font>font16</font>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>button</type>
+ <id>2</id>
+ <posX>110</posX>
+ <posY>170</posY>
+ <onleft>2</onleft>
+ <onright>21</onright>
+ <onup>2</onup>
+ <ondown>3</ondown>
+ <animation>unfocus</animation>
+ <label>Street:</label>
+ <textcolor>ffffffff</textcolor>
+ <width>144</width>
+ <height>40</height>
+ </control>
+ <control>
+ <type>label</type>
+ <id>12</id>
+ <posX>259</posX>
+ <posY>173</posY>
+ <label>x</label>
+ </control>
+ <control>
+ <type>button</type>
+ <id>3</id>
+ <posX>110</posX>
+ <posY>210</posY>
+ <onleft>3</onleft>
+ <onright>21</onright>
+ <onup>2</onup>
+ <ondown>4</ondown>
+ <animation>unfocus</animation>
+ <label>City:</label>
+ <textcolor>ffffffff</textcolor>
+ <width>144</width>
+ <height>40</height>
+ </control>
+ <control>
+ <type>label</type>
+ <id>13</id>
+ <posX>259</posX>
+ <posY>213</posY>
+ <label>x</label>
+ </control>
+ <control>
+ <type>button</type>
+ <id>4</id>
+ <posX>110</posX>
+ <posY>250</posY>
+ <onleft>4</onleft>
+ <onright>21</onright>
+ <onup>3</onup>
+ <ondown>5</ondown>
+ <animation>unfocus</animation>
+ <label>Country:</label>
+ <textcolor>ffffffff</textcolor>
+ <width>144</width>
+ <height>40</height>
+ </control>
+ <control>
+ <type>label</type>
+ <id>14</id>
+ <posX>259</posX>
+ <posY>253</posY>
+ <label>x</label>
+ </control>
+ <control>
+ <type>button</type>
+ <id>5</id>
+ <posX>110</posX>
+ <posY>290</posY>
+ <onleft>5</onleft>
+ <onright>21</onright>
+ <onup>4</onup>
+ <ondown>21</ondown>
+ <animation>unfocus</animation>
+ <label>Placename:...
[truncated message content] |
|
From: <lk...@us...> - 2008-10-10 07:52:19
|
Revision: 2184
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=2184&view=rev
Author: lkuech
Date: 2008-10-10 07:52:09 +0000 (Fri, 10 Oct 2008)
Log Message:
-----------
Worldmap: Updated assembly version. Final installation xmp
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/Worldmap.xmp
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
Modified: trunk/plugins/WorldMap/Installer/Worldmap.xmp
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-10-10 07:47:18 UTC (rev 2183)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2008-10-10 07:52:09 UTC (rev 2184)
@@ -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>03e885f4-bfdb-481f-baea-d4e2568c5858</Guid>
+ <Guid>b03f326c-763c-4a37-b4e0-392bec6ebbce</Guid>
</File>
<File>
<FileName>GUIWorldmap.xml</FileName>
@@ -17,7 +17,7 @@
<Source>GUIWorldmap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>9fc0bc0f-94da-411c-a944-ab065a623bb5</Guid>
+ <Guid>734c253d-8158-4aa6-81e6-e54ab7b23339</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>9c95673f-6987-45de-9c47-b41400cdd1a8</Guid>
+ <Guid>97efe6f2-34bd-4b30-8a57-3ad2a0788ea6</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>297ff35d-2949-41b3-9bcd-96463861e2e5</Guid>
+ <Guid>74aa85f6-0074-4625-98a1-e4641a7b7868</Guid>
</File>
<File>
<FileName>hover_worldmap.png</FileName>
@@ -44,7 +44,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\hover_worldmap.png</Source>
<Id>04010</Id>
<Option />
- <Guid>cb073ca2-126c-4962-9423-cf538de5f384</Guid>
+ <Guid>0ab0b73c-41ee-4ebe-92de-bd2bdcf449b6</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 wide\MyWorldMap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>bcc63875-9f47-4d43-9e66-c484d1b2b818</Guid>
+ <Guid>1259505a-adb0-4431-a697-6d0fe92ffbfe</Guid>
</File>
<File>
<FileName>MyWorldMap.xml</FileName>
@@ -62,7 +62,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>3868a2a1-f7c1-478f-a61d-2d3f224d6c2b</Guid>
+ <Guid>09d743ff-5a4d-4f19-9101-843804620225</Guid>
</File>
<File>
<FileName>MyWorldMap.xml</FileName>
@@ -71,7 +71,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldMap.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>748fcfcd-2379-4ab0-bf2e-333be909fea5</Guid>
+ <Guid>8ab5d384-24c8-4914-b803-4acdb7e4139c</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -80,7 +80,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>c13aaa1b-582c-4363-8a52-4ff8f6a61bd2</Guid>
+ <Guid>9e1012c4-a1c1-478b-8719-2150c2399372</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -89,7 +89,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>542a809c-a1db-4c3e-b50f-568e29ecfff6</Guid>
+ <Guid>8c332c7c-8259-4428-aff5-5416f3fce4af</Guid>
</File>
<File>
<FileName>MyWorldmapMenu.xml</FileName>
@@ -98,7 +98,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapMenu.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>757e9902-b60d-4aec-8f4e-4d0d02806a27</Guid>
+ <Guid>fb286703-f342-4408-b83f-e99d528f0cf5</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -107,7 +107,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>ee358b30-7778-4042-bbf7-aaf563dadfba</Guid>
+ <Guid>6cc96ec6-ce8f-4711-9d5d-8c3bb86416f8</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -116,7 +116,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>4b8d8109-889a-460f-83b4-87c054b608a7</Guid>
+ <Guid>f87ae6a6-a03a-4d7a-a35f-d49b2e2ded24</Guid>
</File>
<File>
<FileName>MyWorldmapSearch.xml</FileName>
@@ -125,7 +125,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapSearch.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>0224aa2f-339b-450c-ab99-f92c2a2993df</Guid>
+ <Guid>899736bd-85b1-4d45-a526-a2a6e4edbb61</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -134,7 +134,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>64b660a4-7d2a-4eec-9258-6d0f9460d148</Guid>
+ <Guid>739f2b23-0eb7-48ac-8bfc-e9427a281a86</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -143,7 +143,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>d1b75301-ac61-4c63-9f73-3989868a4c4f</Guid>
+ <Guid>35fe2e4d-025e-43b9-91b7-e82cae885c8f</Guid>
</File>
<File>
<FileName>MyWorldmapSearchResults.xml</FileName>
@@ -152,7 +152,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\MyWorldmapSearchResults.xml</Source>
<Id>04010</Id>
<Option />
- <Guid>8f969d4a-a7b1-4a96-95f4-44fefd4c8e4e</Guid>
+ <Guid>057295a8-818f-47ad-af4d-c492726ec186</Guid>
</File>
<File>
<FileName>strings_de.xml</FileName>
@@ -161,7 +161,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>deadf031-d3e8-454b-9464-e264b5a56538</Guid>
+ <Guid>c21f2490-efc7-4b74-a1d3-9feb31e19b9b</Guid>
</File>
<File>
<FileName>strings_en.xml</FileName>
@@ -170,7 +170,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>02ddeb18-6b8d-4532-9e1d-0d39ef105e1b</Guid>
+ <Guid>31be1784-e397-4358-b114-55e85c169e75</Guid>
</File>
<File>
<FileName>strings_no.xml</FileName>
@@ -179,7 +179,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>03f81c69-b950-4bdb-ae43-1c5aeb9c972c</Guid>
+ <Guid>b6cfad3e-17cd-4c8e-86d4-3c1fe28dcc66</Guid>
</File>
<File>
<FileName>System.Data.SQLite.DLL</FileName>
@@ -188,7 +188,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>4ac756ee-5eb9-49b7-ae75-f2ae71ba31ff</Guid>
+ <Guid>e9a25259-7694-4153-a68f-d19e3e614280</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -197,7 +197,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>4524995c-3017-4518-94f9-03ada34dacc4</Guid>
+ <Guid>52f67791-a030-49ad-ba8b-a9b0292e34d8</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -206,7 +206,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>17388d6a-d651-4871-981d-3e48258aa8dd</Guid>
+ <Guid>3f527e0e-34f0-4fe0-9502-915a331bd9c3</Guid>
</File>
<File>
<FileName>WMIPBlocked.jpeg</FileName>
@@ -215,7 +215,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMIPBlocked.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>ae804ad3-2639-4ba7-af32-3aef7f22e190</Guid>
+ <Guid>8d910a90-0229-42e0-bf8f-c40f7a3c584a</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -224,7 +224,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>ff74b9c4-2b3c-44c5-bac5-b8d3cc632030</Guid>
+ <Guid>a9f1b665-fe81-4b87-983c-59acf4b1a530</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -233,7 +233,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>72ddb8b6-6a18-4f32-8a87-d93cb40bb20a</Guid>
+ <Guid>831331b5-409d-4333-8683-fe85a63b70a0</Guid>
</File>
<File>
<FileName>WMprogressBarActive.png</FileName>
@@ -242,7 +242,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressBarActive.png</Source>
<Id>04010</Id>
<Option />
- <Guid>5740b4b8-43ca-4652-9987-b9366f60fccb</Guid>
+ <Guid>75cfd2cf-74f6-448c-87da-32ab6e62aa03</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -251,7 +251,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>e79f4505-e62d-40b7-afd2-07087b981f8c</Guid>
+ <Guid>130dff0c-f9cf-4181-b420-94de83ae4c22</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -260,7 +260,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>2dc759ed-5a1f-4254-860a-55938b81ad88</Guid>
+ <Guid>ad372195-871b-47d7-a580-f68d2a295947</Guid>
</File>
<File>
<FileName>WMprogressBarQueued.png</FileName>
@@ -269,7 +269,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressBarQueued.png</Source>
<Id>04010</Id>
<Option />
- <Guid>6fc2c223-91db-49e8-b0a7-865558bf6b5a</Guid>
+ <Guid>252c24a5-edbf-4510-b17f-da51ad9824dc</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -278,7 +278,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>bc983cda-0858-4404-8dc9-cf6dbd34b934</Guid>
+ <Guid>4a392bd5-4fac-40ba-aa13-cd14a093634d</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -287,7 +287,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>7bb841a6-9b4e-4b31-864c-0c83981cb0b4</Guid>
+ <Guid>ea27ae29-6770-4520-8566-d5ce202db865</Guid>
</File>
<File>
<FileName>WMprogressDummy.png</FileName>
@@ -296,7 +296,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMprogressDummy.png</Source>
<Id>04010</Id>
<Option />
- <Guid>b427fbb4-8d1a-4844-a3fe-554e542a016c</Guid>
+ <Guid>2ca426f5-3579-482b-8eac-5c23c56ef1e9</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -305,7 +305,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>9b377054-133b-45f6-87f2-dfbcca6f82cc</Guid>
+ <Guid>cff844ee-bde3-4fee-b758-b8c581c82281</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -314,7 +314,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>81fbf121-6d38-4fb3-aec3-ff76d9ef5cfd</Guid>
+ <Guid>04726147-8f66-486c-98bd-a3e72647aa85</Guid>
</File>
<File>
<FileName>WMTileNotAvailable.jpeg</FileName>
@@ -323,7 +323,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMTileNotAvailable.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>244cfa39-76b2-401e-88a6-b053abda406e</Guid>
+ <Guid>73409b55-b510-482d-8823-2072d44cfe32</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -332,7 +332,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>6ac10a71-89d1-4b30-abe2-938dd45293fd</Guid>
+ <Guid>c5cd0bef-45d1-427b-86fa-cfa202d78369</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -341,7 +341,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>8d05024e-e86a-4cd4-95be-54f5e87321e5</Guid>
+ <Guid>6fbd2e8d-4c42-4052-a214-e49bae95e105</Guid>
</File>
<File>
<FileName>WMTilePlaceholder.jpeg</FileName>
@@ -350,7 +350,7 @@
<Source>C:\Users\TH10KX\Documents\Visual Studio 2005\Projects\MP Source\MediaPortal.Org\GUIWorldMap\skinFiles\Blue3\Media\WMTilePlaceholder.jpeg</Source>
<Id>04010</Id>
<Option />
- <Guid>eaf28786-b25f-4d58-b813-978d0ac349b3</Guid>
+ <Guid>9564b87c-d7b6-4ace-be70-cb58fefbd702</Guid>
</File>
</FileList>
<StringList />
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-10-10 07:47:18 UTC (rev 2183)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2008-10-10 07:52:09 UTC (rev 2184)
@@ -31,5 +31,5 @@
//
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-02-01 18:01:07
|
Revision: 3400
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3400&view=rev
Author: chemelli_sf
Date: 2010-02-01 18:00:56 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
- Project converted to VS2008
- Path references updated to standard tree:
..\mp-plugins\trunk\plugins\WorldMap
..\mediaportal\trunk\mediaportal
Modified Paths:
--------------
trunk/plugins/WorldMap/MyWorldMap.csproj
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
trunk/plugins/WorldMap/Properties/Resources.Designer.cs
Added Paths:
-----------
trunk/plugins/WorldMap/MyWorldMap.sln
Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj 2010-02-01 17:43:11 UTC (rev 3399)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj 2010-02-01 18:00:56 UTC (rev 3400)
@@ -1,8 +1,8 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{857D8A0C-FB95-4A26-8ED6-8E51586D2116}</ProjectGuid>
<OutputType>Library</OutputType>
@@ -27,25 +27,29 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>
+ </DefineConstants>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+ <PlatformTarget>x86</PlatformTarget>
+ <OutputPath>bin\Release\</OutputPath>
+ <Optimize>true</Optimize>
+ </PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=0.2.2.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Core, Version=1.0.4.41510, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Core\bin\Debug\Core.dll</HintPath>
+ <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath>
</Reference>
- <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Dialogs, Version=1.0.4.41523, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Dialogs\bin\Debug\Dialogs.dll</HintPath>
+ <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <HintPath>..\MediaPortal.Base\Microsoft.DirectX.Direct3D.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.DirectX.Direct3DX, Version=1.0.2911.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\MediaPortal.Base\Microsoft.DirectX.Direct3DX.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.DirectX.DirectDraw, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <HintPath>..\MediaPortal.Base\Microsoft.DirectX.DirectDraw.dll</HintPath>
- </Reference>
+ <Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <Reference Include="Microsoft.DirectX.Direct3DX, Version=1.0.2911.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
+ <Reference Include="Microsoft.DirectX.DirectDraw, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite, Version=1.0.60.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
@@ -55,9 +59,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.1.2.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="Utils, Version=2.2.7.41503, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\Utils\bin\Debug\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
@@ -80,7 +84,6 @@
<Compile Include="MAPS\SearchGeoCodes.cs" />
<Compile Include="MAPS\ThreadedDownload.cs" />
<Compile Include="MAPS\TileCacheDatabase.cs" />
- <Compile Include="NewVirtualKeyboard.cs" />
<Compile Include="Settings.cs" />
<Compile Include="WorldMap.cs" />
<Compile Include="PlugInBase.cs" />
Added: trunk/plugins/WorldMap/MyWorldMap.sln
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.sln (rev 0)
+++ trunk/plugins/WorldMap/MyWorldMap.sln 2010-02-01 18:00:56 UTC (rev 3400)
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyWorldMap", "MyWorldMap.csproj", "{857D8A0C-FB95-4A26-8ED6-8E51586D2116}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x86 = Debug|x86
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.ActiveCfg = Debug|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.Build.0 = Debug|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.Build.0 = Release|x86
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-01 17:43:11 UTC (rev 3399)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-01 18:00:56 UTC (rev 3400)
@@ -1,10 +1,10 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die mit einer Assembly verknüpft sind.
+
[assembly: AssemblyTitle("WorldMap")]
[assembly: AssemblyDescription("plugin for MediaPortal")]
[assembly: AssemblyConfiguration("")]
@@ -17,9 +17,11 @@
// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar
// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von
// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
+
[assembly: ComVisible(false)]
// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+
[assembly: Guid("c2bb8f87-7cfc-4c21-8e10-f294c3fdc53e")]
// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
@@ -31,5 +33,6 @@
//
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
+
[assembly: AssemblyVersion("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
\ No newline at end of file
Modified: trunk/plugins/WorldMap/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2010-02-01 17:43:11 UTC (rev 3399)
+++ trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2010-02-01 18:00:56 UTC (rev 3400)
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
-// Dieser Code wurde von einem Tool generiert.
-// Laufzeitversion:2.0.50727.312
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.4927
//
-// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-// der Code erneut generiert wird.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
@@ -13,12 +13,12 @@
/// <summary>
- /// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+ /// A strongly-typed resource class, for looking up localized strings, etc.
/// </summary>
- // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
- // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
- // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
- // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@
}
/// <summary>
- /// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+ /// Returns the cached ResourceManager instance used by this class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@
}
/// <summary>
- /// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
- /// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-02-01 18:13:05
|
Revision: 3401
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3401&view=rev
Author: chemelli_sf
Date: 2010-02-01 18:12:59 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Using standard MP virtual keyboard
Modified Paths:
--------------
trunk/plugins/WorldMap/WorldmapSearch.cs
Removed Paths:
-------------
trunk/plugins/WorldMap/NewVirtualKeyboard.cs
Deleted: trunk/plugins/WorldMap/NewVirtualKeyboard.cs
===================================================================
--- trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2010-02-01 18:00:56 UTC (rev 3400)
+++ trunk/plugins/WorldMap/NewVirtualKeyboard.cs 2010-02-01 18:12:59 UTC (rev 3401)
@@ -1,1876 +0,0 @@
-#region Copyright (C) 2005-2008 Team MediaPortal
-
-/*
- * Copyright (C) 2005-2007 Team MediaPortal
- * http://www.team-mediaportal.com
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- */
-
-#endregion
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Collections;
-using MediaPortal.GUI.Library;
-using Microsoft.DirectX;
-using Microsoft.DirectX.Direct3D;
-using Direct3D = Microsoft.DirectX.Direct3D;
-
-namespace MediaPortal.Dialogs
-{
- /// <summary>
- ///
- /// </summary>
- public class NewVirtualKeyboard : GUIWindow, IRenderLayer
- {
- #region constants
- const int GAP_WIDTH = 0;
- const int GAP2_WIDTH = 4;
- int MODEKEY_WIDTH = 110;
- const int KEY_INSET = 1;
-
- const int MAX_KEYS_PER_ROW = 14;
-
- // Must be this far from center on 0.0 - 1.0 scale
- const float JOY_THRESHOLD = 0.25f;
-
- // How often (per second) the caret blinks
- const float fCARET_BLINK_RATE = 1.0f;
-
- // During the blink period, the amount the caret is visible. 0.5 equals
- // half the time, 0.75 equals 3/4ths of the time, etc.
- const float fCARET_ON_RATIO = 0.75f;
-
- // Text colors for keys
- const long COLOR_SEARCHTEXT = 0xff000000; // black (0xff10e010)
- const long COLOR_HIGHLIGHT = 0xff00ff00; // green
- const long COLOR_PRESSED = 0xff808080; // gray
- const long COLOR_NORMAL = 0xff000000; // black
- const long COLOR_DISABLED = 0xffffffff; // white
- const long COLOR_HELPTEXT = 0xffffffff; // white
- const long COLOR_FONT_DISABLED = 0xff808080; // gray
- const long COLOR_INVISIBLE = 0xff0000ff; // blue
- const long COLOR_RED = 0xffff0000; // red
- // Font sizes
- const int FONTSIZE_BUTTONCHARS = 24;
- const int FONTSIZE_BUTTONSTRINGS = 18;
- const int FONTSIZE_SEARCHTEXT = 20;
-
- // Controller repeat values
- const float fINITIAL_REPEAT = 0.333f; // 333 mS recommended for first repeat
- const float fSTD_REPEAT = 0.085f; // 85 mS recommended for repeat rate
-
- // Maximum number of characters in string
- const int MAX_CHARS = 64;
-
- // Width of text box
- float fTEXTBOX_WIDTH = 576.0f - 64.0f - 4.0f - 4.0f - 10.0f - 80.0f;
- float BUTTON_Y_POS = 411.0f; // button text line
- float BUTTON_X_OFFSET = 40.0f; // space between button and text
-
- const long BUTTONTEXT_COLOR = 0xffffffff;
- const float FIXED_JSL_SIZE = 3.0f;
-
- const int KEY_WIDTH = 34; // width of std key in pixels
-
- //Default Skin Ratio, recalculated by VirtualKeyboard()
- float SkinRatio = 1.0f;
-
- #endregion
-
- bool UseSmsStyleTextIsertion = true;
-
- string[] smsKeyMap =
- {
- " 0",
- ".!?-*_\\/1",
- "abc\xE4\xE1\xE02",
- "def\xE9\xE83",
- "ghi4",
- "jkl5",
- "mno\xF66",
- "pqrs\xDF7",
- "tuv\xFC8",
- "wxyz9"
- };
-
- int smsLastKeyPressTime = 0;
- int smsLastKeyPressed = -1;
- int smsLastKeyInternalPos = 0;
- bool smsLastShiftState = false;
-
- #region enums
- public enum SearchKinds
- {
- SEARCH_STARTS_WITH = 0,
- SEARCH_CONTAINS,
- SEARCH_ENDS_WITH,
- SEARCH_IS
- }
-
- enum KeyboardTypes
- {
- TYPE_ALPHABET = 0,
- TYPE_SYMBOLS,
- TYPE_ACCENTS,
-
- TYPE_HIRAGANA,
- TYPE_KATAKANA,
- TYPE_ANS,
-
- TYPE_MAX
- };
-
- enum State
- {
- STATE_BACK, // Main menu
- STATE_KEYBOARD, // Keyboard display
- STATE_MAX
- };
-
-
-
- enum Event
- {
- EV_NULL, // No events
- EV_A_BUTTON, // A button
- EV_START_BUTTON, // Start button
- EV_B_BUTTON, // B button
- EV_BACK_BUTTON, // Back button
- EV_X_BUTTON, // X button
- EV_Y_BUTTON, // Y button
- EV_WHITE_BUTTON, // White button
- EV_BLACK_BUTTON, // Black button
- EV_LEFT_BUTTON, // Left trigger
- EV_RIGHT_BUTTON, // Right trigger
- EV_UP, // Up Dpad or left joy
- EV_DOWN, // Down Dpad or left joy
- EV_LEFT, // Left Dpad or left joy
- EV_RIGHT, // Right Dpad or left joy
-
- EVENT_MAX
- };
-
- enum Xkey
- {
- XK_NULL = 0,
-
- XK_SPACE = ' ',
- XK_LBRACK = '[',
- XK_RBRACK = ']',
- XK_LBRACE = '{',
- XK_RBRACE = '}',
- XK_LPAREN = '(',
- XK_RPAREN = ')',
- XK_FSLASH = '/',
- XK_BSLASH = '\\',
- XK_LT = '<',
- XK_GT = '>',
- XK_AT = '@',
- XK_SEMI = ';',
- XK_COLON = ':',
- XK_QUOTE = '\'',
- XK_DQUOTE = '\"',
- XK_AMPER = '&',
- XK_STAR = '*',
- XK_QMARK = '?',
- XK_COMMA = ',',
- XK_PERIOD = '.',
- XK_DASH = '-',
- XK_UNDERS = '_',
- XK_PLUS = '+',
- XK_EQUAL = '=',
- XK_DOLLAR = '$',
- XK_PERCENT = '%',
- XK_CARET = '^',
- XK_TILDE = '~',
- XK_APOS = '`',
- XK_EXCL = '!',
- XK_VERT = '|',
- XK_NSIGN = '#',
-
- // Numbers
- XK_0 = '0',
- XK_1,
- XK_2,
- XK_3,
- XK_4,
- XK_5,
- XK_6,
- XK_7,
- XK_8,
- XK_9,
-
- // Letters
- XK_A = 'A',
- XK_B,
- XK_C,
- XK_D,
- XK_E,
- XK_F,
- XK_G,
- XK_H,
- XK_I,
- XK_J,
- XK_K,
- XK_L,
- XK_M,
- XK_N,
- XK_O,
- XK_P,
- XK_Q,
- XK_R,
- XK_S,
- XK_T,
- XK_U,
- XK_V,
- XK_W,
- XK_X,
- XK_Y,
- XK_Z,
-
- // Accented characters and other special characters
-
- XK_INVERTED_EXCL = 0xA1, // \xA1
- XK_CENT_SIGN = 0xA2, // \xA2
- XK_POUND_SIGN = 0xA3, // \xA3
- XK_YEN_SIGN = 0xA5, // \xA5
- XK_COPYRIGHT_SIGN = 0xA9, // \xA9
- XK_LT_DBL_ANGLE_QUOTE = 0xAB, // <<
- XK_REGISTERED_SIGN = 0xAE, // \xAE
- XK_SUPERSCRIPT_TWO = 0xB2, // \xB2
- XK_SUPERSCRIPT_THREE = 0xB3, // \xB3
- XK_ACUTE_ACCENT = 0xB4, // \xB4
- XK_MICRO_SIGN = 0xB5, // \xB5
- XK_SUPERSCRIPT_ONE = 0xB9, // \xB9
- XK_RT_DBL_ANGLE_QUOTE = 0xBB, // >>
- XK_INVERTED_QMARK = 0xBF, // \xBF
- XK_CAP_A_GRAVE = 0xC0, // \xC0
- XK_CAP_A_ACUTE = 0xC1, // \xC1
- XK_CAP_A_CIRCUMFLEX = 0xC2, // \xC2
- XK_CAP_A_TILDE = 0xC3, // \xC3
- XK_CAP_A_DIAERESIS = 0xC4, // \xC4
- XK_CAP_A_RING = 0xC5, // \xC5
- XK_CAP_AE = 0xC6, // \xC6
- XK_CAP_C_CEDILLA = 0xC7, // \xC7
- XK_CAP_E_GRAVE = 0xC8, // \xC8
- XK_CAP_E_ACUTE = 0xC9, // \xC9
- XK_CAP_E_CIRCUMFLEX = 0xCA, // \xCA
- XK_CAP_E_DIAERESIS = 0xCB, // \xCB
- XK_CAP_I_GRAVE = 0xCC, // \xCC
- XK_CAP_I_ACUTE = 0xCD, // \xCD
- XK_CAP_I_CIRCUMFLEX = 0xCE, // \xCE
- XK_CAP_I_DIAERESIS = 0xCF, // \xCF
- XK_CAP_N_TILDE = 0xD1, // \xD1
- XK_CAP_O_GRAVE = 0xD2, // \xD2
- XK_CAP_O_ACUTE = 0xD3, // \xD3
- XK_CAP_O_CIRCUMFLEX = 0xD4, // \xD4
- XK_CAP_O_TILDE = 0xD5, // \xD5
- XK_CAP_O_DIAERESIS = 0xD6, // \xD6
- XK_CAP_O_STROKE = 0xD8, // \xD8
- XK_CAP_U_GRAVE = 0xD9, // \xD9
- XK_CAP_U_ACUTE = 0xDA, // \xDA
- XK_CAP_U_CIRCUMFLEX = 0xDB, // \xDB
- XK_CAP_U_DIAERESIS = 0xDC, // \xDC
- XK_CAP_Y_ACUTE = 0xDD, // \xDD
- XK_SM_SHARP_S = 0xDF, // \xDF
- XK_SM_A_GRAVE = 0xE0, // \xE0
- XK_SM_A_ACUTE = 0xE1, // \xE1
- XK_SM_A_CIRCUMFLEX = 0xE2, // \xE2
- XK_SM_A_TILDE = 0xE3, // \xE3
- XK_SM_A_DIAERESIS = 0xE4, // \xE4
- XK_SM_A_RING = 0xE5, // \xE5
- XK_SM_AE = 0xE6, // \xE6
- XK_SM_C_CEDILLA = 0xE7, // \xE7
- XK_SM_E_GRAVE = 0xE8, // \xE8
- XK_SM_E_ACUTE = 0xE9, // \xE9
- XK_SM_E_CIRCUMFLEX = 0xEA, // \xEA
- XK_SM_E_DIAERESIS = 0xEB, // \xEB
- XK_SM_I_GRAVE = 0xEC, // \xEC
- XK_SM_I_ACUTE = 0xED, // \xED
- XK_SM_I_CIRCUMFLEX = 0xEE, // \xEE
- XK_SM_I_DIAERESIS = 0xEF, // \xEF
- XK_SM_N_TILDE = 0xF1, // \xF1
- XK_SM_O_GRAVE = 0xF2, // \xF2
- XK_SM_O_ACUTE = 0xF3, // \xF3
- XK_SM_O_CIRCUMFLEX = 0xF4, // \xF4
- XK_SM_O_TILDE = 0xF5, // \xF5
- XK_SM_O_DIAERESIS = 0xF6, // \xF6
- XK_SM_O_STROKE = 0xF8, // \xF8
- XK_SM_U_GRAVE = 0xF9, // \xF9
- XK_SM_U_ACUTE = 0xFA, // \xFA
- XK_SM_U_CIRCUMFLEX = 0xFB, // \xFB
- XK_SM_U_DIAERESIS = 0xFC, // \xFC
- XK_SM_Y_ACUTE = 0xFD, // \xFD
- XK_SM_Y_DIAERESIS = 0xFF, // \xFF
-
- // Unicode
- XK_CAP_Y_DIAERESIS = 0x0178, // Y umlaut
- XK_EURO_SIGN = 0x20AC, // Euro symbol
- XK_ARROWLEFT = '<', // left arrow
- XK_ARROWRIGHT = '>', // right arrow
-
- // Special
- XK_BACKSPACE = 0x10000, // backspace
- XK_DELETE, // delete // !!!
- XK_SHIFT, // shift
- XK_CAPSLOCK, // caps lock
- XK_ALPHABET, // alphabet
- XK_SYMBOLS, // symbols
- XK_ACCENTS, // accents
- XK_OK, // "done"
- XK_HIRAGANA, // Hiragana
- XK_KATAKANA, // Katakana
- XK_ANS, // Alphabet/numeral/symbol
-
- // Special Search-Keys
- XK_SEARCH_START_WITH = 0x11000, // to search music that starts with string
- XK_SEARCH_CONTAINS, // ...contains string
- XK_SEARCH_ENDS_WITH, // ...ends with string
- XK_SEARCH_IS, // is the search text
- XK_SEARCH_ALBUM, // search for album
- XK_SEARCH_TITLE, // search for title
- XK_SEARCH_ARTIST, // search for artist
- XK_SEARCH_GENERE // search for genere
- };
-
- enum StringID
- {
- STR_MENU_KEYBOARD_NAME,
- STR_MENU_CHOOSE_KEYBOARD,
- STR_MENU_ILLUSTRATIVE_GRAPHICS,
- STR_MENU_A_SELECT,
- STR_MENU_B_BACK,
- STR_MENU_Y_HELP,
- STR_KEY_SPACE,
- STR_KEY_BACKSPACE,
- STR_KEY_SHIFT,
- STR_KEY_CAPSLOCK,
- STR_KEY_ALPHABET,
- STR_KEY_SYMBOLS,
- STR_KEY_ACCENTS,
- STR_KEY_DONE,
- STR_HELP_SELECT,
- STR_HELP_CANCEL,
- STR_HELP_TOGGLE,
- STR_HELP_HELP,
- STR_HELP_BACKSPACE,
- STR_HELP_SPACE,
- STR_HELP_TRIGGER,
-
- STR_MAX,
- };
- #endregion
-
-
- class Key
- {
- public Xkey xKey; // virtual key code
- public int dwWidth = KEY_WIDTH; // width of the key
- public string name = ""; // name of key when vKey >= 0x10000
- public Key(Xkey key)
- {
- xKey = key;
- }
- public Key(Xkey key, int iwidth)
- {
- xKey = key;
- dwWidth = iwidth;
-
- // Special keys get their own names
- switch (xKey)
- {
- case Xkey.XK_SPACE:
- name = "SPACE";
- break;
- case Xkey.XK_BACKSPACE:
- name = "BKSP";
- break;
- case Xkey.XK_SHIFT:
- name = "SHIFT";
- break;
- case Xkey.XK_CAPSLOCK:
- name = "CAPS";
- break;
- case Xkey.XK_ALPHABET:
- name = "ALPHABET";
- break;
- case Xkey.XK_SYMBOLS:
- name = "SYMB";
- break;
- case Xkey.XK_ACCENTS:
- name = "ACCENTS";
- break;
- case Xkey.XK_OK:
- name = GUILocalizeStrings.Get(804);
- break;
- case Xkey.XK_SEARCH_CONTAINS:
- name = GUILocalizeStrings.Get(801);
- break;
- case Xkey.XK_SEARCH_ENDS_WITH:
- name = GUILocalizeStrings.Get(802);
- break;
- case Xkey.XK_SEARCH_START_WITH:
- name = GUILocalizeStrings.Get(800);
- break;
- case Xkey.XK_SEARCH_IS:
- name = GUILocalizeStrings.Get(803);
- break;
- }
- }
- };
-
- #region variables
- string _textEntered = "";
- bool _capsLockTurnedOn = false;
- bool _shiftTurnedOn = false;
- State _state;
- int _position;
- KeyboardTypes _currentKeyboard;
- int _currentRow;
- int _currentKey;
- int _lastColumn;
- //float m_fRepeatDelay;
- CachedTexture.Frame _keyTexture = null;
- float _keyHeight;
- int _maxRows;
- bool _pressedEnter;
- GUIFont _font18 = null;
- GUIFont _font12 = null;
- GUIFont _fontButtons = null;
- GUIFont _fontSearchText = null;
- DateTime _caretTimer = DateTime.Now;
- bool _previousOverlayVisible = true;
- bool _password = false;
- GUIImage image;
- bool _useSearchLayout = false;
- bool _locationChangedManually = false;
-
- // added by Agree
- int _searchKind; // 0=Starts with, 1=Contains, 2=Ends with
- //
-
- ArrayList _keyboardList = new ArrayList(); // list of rows = keyboard
-
- #endregion
-
-
- #region Base Dialog Variables
- bool _isVisible = false;
- int _parentWindowId = 0;
- GUIWindow _parentWindow = null;
- #endregion
-
- // lets do some event stuff
- public delegate void TextChangedEventHandler(int kindOfSearch, string evtData);
- public event TextChangedEventHandler TextChanged;
- //
-
- public NewVirtualKeyboard()
- {
- GetID = (int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD;
- _capsLockTurnedOn = false;
- _shiftTurnedOn = false;
- _state = State.STATE_KEYBOARD;
- _position = 0;
- _currentKeyboard = KeyboardTypes.TYPE_ALPHABET;
- _currentRow = 0;
- _currentKey = 0;
- _lastColumn = 0;
- //m_fRepeatDelay = fINITIAL_REPEAT;
- _keyTexture = null;
-
- int tempwidth = (int)(576.0f - 64.0f - 4.0f - 4.0f - 10.0f - 80.0f);
- GUIGraphicsContext.ScaleHorizontal(ref tempwidth);
- fTEXTBOX_WIDTH = tempwidth;
-
- SkinRatio = (float)GUIGraphicsContext.SkinSize.Width / 720.0f;
- _keyHeight = 42.0f * SkinRatio;
- _maxRows = 5;
- _pressedEnter = false;
- _caretTimer = DateTime.Now;
- // construct search def.
- _searchKind = (int)SearchKinds.SEARCH_CONTAINS; // default search Contains
-
- Location = new MediaPortal.Drawing.Point((int)(64 * SkinRatio), 250);
- _locationChangedManually = false;
-
- if (GUIGraphicsContext.DX9Device != null)
- InitBoard();
- }
-
- public override bool Init()
- {
- return true;
- }
-
- public bool IsConfirmed
- {
- get { return _pressedEnter; }
- }
-
- public bool IsSearchKeyboard
- {
- set { _useSearchLayout = value; }
- }
-
- void Initialize()
- {
- _font12 = GUIFontManager.GetFont("font12");
- _font18 = GUIFontManager.GetFont("font18");
- _fontButtons = GUIFontManager.GetFont("dingbats");
- _fontSearchText = GUIFontManager.GetFont("font14");
-
- int iTextureWidth, iTextureHeight;
- int iImages = GUITextureManager.Load("keyNF.bmp", 0, 0, 0);
- if (iImages == 1)
- {
- _keyTexture = GUITextureManager.GetTexture("keyNF.bmp", 0, out iTextureWidth, out iTextureHeight);
- }
- image = new GUIImage(this.GetID, 1, 0, 0, 10, 10, "white.bmp", 1);
- image.AllocResources();
- }
-
- void DeInitialize()
- {
- if (image != null) image.FreeResources();
- image = null;
- }
-
- public void Reset()
- {
- _password = false;
- _pressedEnter = false;
- _capsLockTurnedOn = false;
- _shiftTurnedOn = false;
- _state = State.STATE_KEYBOARD;
- _position = 0;
- _currentKeyboard = KeyboardTypes.TYPE_ALPHABET;
- _currentRow = 0;
- _currentKey = 0;
- _lastColumn = 0;
- //m_fRepeatDelay = fINITIAL_REPEAT;
- _keyHeight = 42.0f * SkinRatio;
- _maxRows = 5;
- _position = 0;
- _textEntered = "";
- _caretTimer = DateTime.Now;
-
- _searchKind = (int)SearchKinds.SEARCH_CONTAINS; // default search Contains
-
- int y = 411;
- int x = 40;
-
- GUIGraphicsContext.ScalePosToScreenResolution(ref x, ref y);
- BUTTON_Y_POS = x; // button text line
- BUTTON_X_OFFSET = y; // space between button and text
-
- int width = (int)(42 * SkinRatio);
- GUIGraphicsContext.ScaleVertical(ref width);
- _keyHeight = width;
-
- width = (int)(576.0f - 64.0f - 4.0f - 4.0f - 10.0f - 80.0f);
- GUIGraphicsContext.ScaleHorizontal(ref width);
- fTEXTBOX_WIDTH = width;
-
- Location = new MediaPortal.Drawing.Point((int)(64 * SkinRatio), 250);
- _locationChangedManually = false;
-
- InitBoard();
- }
-
- public void SetLocation(MediaPortal.Drawing.Point location)
- {
- Location = location;
- _locationChangedManually = true;
- }
-
- public bool Password
- {
- get { return _password; }
- set { _password = value; }
- }
-
- protected void PageLoad()
- {
- _previousOverlayVisible = GUIGraphicsContext.Overlay;
- _pressedEnter = false;
- GUIGraphicsContext.Overlay = false;
- GUIPropertyManager.SetProperty("#currentmodule", GUILocalizeStrings.Get(100000 + (int)GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD));
- Log.Debug("Window: {0} init", this.ToString());
- Initialize();
- }
-
- protected void PageDestroy()
- {
- GUIGraphicsContext.Overlay = _previousOverlayVisible;
- DeInitialize();
-
- Log.Debug("Window: {0} deinit", this.ToString());
- FreeResources();
- }
-
- public string Text
- {
- get { return _textEntered; }
- set { _textEntered = value; }
- }
-
- public int KindOfSearch
- {
- get { return _searchKind; }
- set
- {
- _searchKind = value;
- SetSearchKind();
- }
- }
-
- public void SelectActiveButton(float x, float y)
- {
- // Draw each row
- int x1 = (int)(Location.X);
- int y1 = (int)Location.Y + 42;
- //int y1 = 250, x1 = 64;
- GUIGraphicsContext.ScalePosToScreenResolution(ref x1, ref y1);
- float fY = y1;
- ArrayList keyBoard = (ArrayList)_keyboardList[(int)_currentKeyboard];
- for (int row = 0; row < _maxRows; ++row, fY += _keyHeight)
- {
- float fX = x1;
- float fWidthSum = 0.0f;
- ArrayList keyRow = (ArrayList)keyBoard[row];
- int dwIndex = 0;
- for (int i = 0; i < keyRow.Count; i++)
- {
- Key key = (Key)keyRow[i];
- int width = (int)(key.dwWidth * SkinRatio);
- GUIGraphicsContext.ScaleHorizontal(ref width);
- if (x >= fX + fWidthSum && x <= fX + fWidthSum + width)
- {
- if (y >= fY && y < fY + _keyHeight)
- {
- _currentRow = row;
- _currentKey = dwIndex;
- return;
- }
- }
- fWidthSum += width;
- // There's a slightly larger gap between the leftmost keys (mode
- // keys) and the main keyboard
- if (dwIndex == 0)
- {
- width = (int)(GAP2_WIDTH * SkinRatio);
- GUIGraphicsContext.ScaleHorizontal(ref width);
- fWidthSum += width;
- }
- else
- {
- width = GAP_WIDTH;
- GUIGraphicsContext.ScaleHorizontal(ref width);
- fWidthSum += width;
- }
- ++dwIndex;
-
- }
- }
-
- // Default no key found no key highlighted
- if (_currentKey != -1) _lastColumn = _currentKey;
- _currentKey = -1;
- }
-
- void ProcessSmsInsertion(int keyPressed)
- {
- if (smsLastKeyPressTime + 1500 < System.Environment.TickCount || smsLastKeyPressed != keyPressed)
- {
- smsLastKeyInternalPos = 0;
-
- string tmpKeys = smsKeyMap[keyPressed];
- if (_shiftTurnedOn) tmpKeys = tmpKeys.ToUpper();
- smsLastShiftState = _shiftTurnedOn;
- char tmpChar = tmpKeys[smsLastKeyInternalPos];
-
- Action tmpAction = new Action(new MediaPortal.GUI.Library.Key(tmpChar, (int)tmpChar), Action.ActionType.ACTION_KEY_PRESSED, 0, 0);
- OnAction(tmpAction);
- }
- else
- {
- smsLastKeyInternalPos++;
- if (smsLastKeyInternalPos >= smsKeyMap[keyPressed].Length) smsLastKeyInternalPos = 0;
-
- Press(Xkey.XK_BACKSPACE);
-
- string tmpKeys = smsKeyMap[keyPressed];
- if (smsLastShiftState) tmpKeys = tmpKeys.ToUpper();
- char tmpChar = tmpKeys[smsLastKeyInternalPos];
-
- Action tmpAction = new Action(new MediaPortal.GUI.Library.Key(tmpChar, (int)tmpChar), Action.ActionType.ACTION_KEY_PRESSED, 0, 0);
-
- OnAction(tmpAction);
- }
- smsLastKeyPressed = keyPressed;
- smsLastKeyPressTime = System.Environment.TickCount;
- }
-
- public override void OnAction(Action action)
- {
- if (action.wID == Action.ActionType.ACTION_CLOSE_DIALOG || action.wID == Action.ActionType.ACTION_PREVIOUS_MENU || action.wID == Action.ActionType.ACTION_CONTEXT_MENU)
- {
- Close();
- return;
- }
-
- if (UseSmsStyleTextIsertion)
- {
- # region if you have no remote at but want to test the function uncomment this (don't wonder about the backspace thingy it not there with a real remote)
- //switch (action.wID)
- //{
- // case Action.ActionType.ACTION_KEY_PRESSED:
- // Action tmpAction = null;
- // if (action.m_key.KeyChar == '0') tmpAction = new Action(Action.ActionType.REMOTE_0, 0, 0);
- // if (action.m_key.KeyChar == '1') tmpAction = new Action(Action.ActionType.REMOTE_1, 0, 0);
- // if (action.m_key.KeyChar == '2') tmpAction = new Action(Action.ActionType.REMOTE_2, 0, 0);
- // if (action.m_key.KeyChar == '3') tmpAction = new Action(Action.ActionType.REMOTE_3, 0, 0);
- // if (action.m_key.KeyChar == '4') tmpAction = new Action(Action.ActionType.REMOTE_4, 0, 0);
- // if (action.m_key.KeyChar == '5') tmpAction = new Action(Action.ActionType.REMOTE_5, 0, 0);
- // if (action.m_key.KeyChar == '6') tmpAction = new Action(Action.ActionType.REMOTE_6, 0, 0);
- // if (action.m_key.KeyChar == '7') tmpAction = new Action(Action.ActionType.REMOTE_7, 0, 0);
- // if (action.m_key.KeyChar == '8') tmpAction = new Action(Action.ActionType.REMOTE_8, 0, 0);
- // if (action.m_key.KeyChar == '9') tmpAction = new Action(Action.ActionType.REMOTE_9, 0, 0);
- // if (tmpAction != null)
- // {
- // OnAction(tmpAction);
- // return;
- // }
- // break;
- //}
- #endregion
-
- switch (action.wID)
- {
- case Action.ActionType.REMOTE_0:
- ProcessSmsInsertion(0);
- break;
- case Action.ActionType.REMOTE_1:
- ProcessSmsInsertion(1);
- break;
- case Action.ActionType.REMOTE_2:
- ProcessSmsInsertion(2);
- break;
- case Action.ActionType.REMOTE_3:
- ProcessSmsInsertion(3);
- break;
- case Action.ActionType.REMOTE_4:
- ProcessSmsInsertion(4);
- break;
- case Action.ActionType.REMOTE_5:
- ProcessSmsInsertion(5);
- break;
- case Action.ActionType.REMOTE_6:
- ProcessSmsInsertion(6);
- break;
- case Action.ActionType.REMOTE_7:
- ProcessSmsInsertion(7);
- break;
- case Action.ActionType.REMOTE_8:
- ProcessSmsInsertion(8);
- break;
- case Action.ActionType.REMOTE_9:
- ProcessSmsInsertion(9);
- break;
- case Action.ActionType.ACTION_MOVE_LEFT:
- if (_currentKey == 0)
- {
- Press(Xkey.XK_BACKSPACE);
- return;
- }
- break;
- case Action.ActionType.ACTION_MOVE_UP:
- if (_currentRow == 0)
- {
- _shiftTurnedOn = !_shiftTurnedOn;
- return;
- }
- break;
- }
-
- }
-
- Event ev;
- switch (action.wID)
- {
- case Action.ActionType.ACTION_MOUSE_MOVE:
- SelectActiveButton(action.fAmount1, action.fAmount2);
- break;
- case Action.ActionType.ACTION_MOUSE_CLICK:
- ev = Event.EV_A_BUTTON;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_SELECT_ITEM:
- if (_currentKey == -1)
- {
- Close();
- _pressedEnter = true;
- }
- ev = Event.EV_A_BUTTON;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_MOVE_DOWN:
- ev = Event.EV_DOWN;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_MOVE_UP:
- ev = Event.EV_UP;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_MOVE_LEFT:
- ev = Event.EV_LEFT;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_MOVE_RIGHT:
- ev = Event.EV_RIGHT;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_PREVIOUS_MENU:
- ev = Event.EV_BACK_BUTTON;
- UpdateState(ev);
- break;
-
- case Action.ActionType.ACTION_KEY_PRESSED:
- if (action.m_key != null)
- {
- if (action.m_key.KeyChar >= 32)
- Press((char)action.m_key.KeyChar);
- if (action.m_key.KeyChar == 8)
- {
- Press(Xkey.XK_BACKSPACE);
- }
- }
- break;
- }
- }
- void Close()
- {
- _isVisible = false;
- }
-
- public void DoModal(int dwParentId)
- {
-
- _parentWindowId = dwParentId;
- _parentWindow = GUIWindowManager.GetWindow(_parentWindowId);
- if (null == _parentWindow)
- {
- _parentWindowId = 0;
- return;
- }
- GUIWindowManager.IsSwitchingToNewWindow = true;
-
- GUIWindowManager.RouteToWindow(GetID);
-
- GUILayerManager.RegisterLayer(this, GUILayerManager.LayerType.Dialog);
-
- // active this window... (with its own OnPageLoad)
- PageLoad();
-
- GUIWindowManager.IsSwitchingToNewWindow = false;
- _isVisible = true;
- _position = _textEntered.Length;
- while (_isVisible && GUIGraphicsContext.CurrentState == GUIGraphicsContext.State.RUNNING)
- {
- GUIWindowManager.Process();
- }
-
- GUIWindowManager.IsSwitchingToNewWindow = true;
- lock (this)
- {
- // deactive this window... (with its own OnPageDestroy)
- PageDestroy();
-
- GUIWindowManager.UnRoute();
- _parentWindow = null;
- }
- GUIWindowManager.IsSwitchingToNewWindow = false;
- GUILayerManager.UnRegisterLayer(this);
- }
-
- public override void Render(float timePassed)
- {
-
- lock (this)
- {
-
- // render the parent window
- RenderKeyboardLatin(timePassed);
- }
- }
-
- void InitBoard()
- {
- if (_useSearchLayout)
- MODEKEY_WIDTH = 130; // Searchkeyboard
-
- // Restore keyboard to default state
- _currentRow = 0;
- _currentKey = 0;
- _lastColumn = 1;
- _currentKeyboard = KeyboardTypes.TYPE_ALPHABET;
- _capsLockTurnedOn = false;
- _shiftTurnedOn = false;
- _textEntered = "";
- _position = 0;
- int height = (int)(42 * SkinRatio);
- GUIGraphicsContext.ScaleVertical(ref height);
- _keyHeight = height;
- _maxRows = 5;
-
- // Destroy old keyboard
- _keyboardList.Clear();
-
-
- //-------------------------------------------------------------------------
- // Alpha keyboard
- //-------------------------------------------------------------------------
-
- ArrayList keyBoard = new ArrayList();
-
- // First row is Done, 1-0
- ArrayList keyRow = new ArrayList();
- keyRow.Add(new Key(Xkey.XK_OK, MODEKEY_WIDTH));
- keyRow.Add(new Key(Xkey.XK_1));
- keyRow.Add(new Key(Xkey.XK_2));
- keyRow.Add(new Key(Xkey.XK_3));
- keyRow.Add(new Key(Xkey.XK_4));
- keyRow.Add(new Key(Xkey.XK_5));
- keyRow.Add(new Key(Xkey.XK_6));
- keyRow.Add(new Key(Xkey.XK_7));
- keyRow.Add(new Key(Xkey.XK_8));
- keyRow.Add(new Key(Xkey.XK_9));
- keyRow.Add(new Key(Xkey.XK_0));
-
- keyBoard.Add(keyRow);
-
- // Second row is Shift, A-J
- keyRow = new ArrayList();
-
- if (_useSearchLayout)
- keyRow.Add(new Key(Xkey.XK_SEARCH_CONTAINS, MODEKEY_WIDTH)); // Searchkeyboard
- else
- keyRow.Add(new Key(Xkey.XK_SHIFT, MODEKEY_WIDTH));
-
- keyRow.Add(new Key(Xkey.XK_A));
- keyRow.Add(new Key(Xkey.XK_B));
- keyRow.Add(new Key(Xkey.XK_C));
- keyRow.Add(new Key(Xkey.XK_D));
- keyRow.Add(new Key(Xkey.XK_E));
- keyRow.Add(new Key(Xkey.XK_F));
- keyRow.Add(new Key(Xkey.XK_G));
- keyRow.Add(new Key(Xke...
[truncated message content] |
|
From: <che...@us...> - 2010-02-01 19:29:47
|
Revision: 3403
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3403&view=rev
Author: chemelli_sf
Date: 2010-02-01 19:29:31 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Localized to hard coded strings
New skin id 49: "Search for a place"
Modified Paths:
--------------
trunk/plugins/WorldMap/WorldmapSearch.cs
trunk/plugins/WorldMap/language/MyWorldmap/strings_en.xml
trunk/plugins/WorldMap/language/MyWorldmap/strings_it.xml
Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs 2010-02-01 18:37:08 UTC (rev 3402)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs 2010-02-01 19:29:31 UTC (rev 3403)
@@ -54,7 +54,7 @@
searchType = value;
if (searchType == SearchType.Adress)
{
- lblHeader.Label = "Search for adress or location";
+ lblHeader.Label = MyWorldmap.GUILocalizeStrings.Get(50);
btnStreet.Disabled = false;
lblStreet.Disabled = false;
btnCity.Disabled = false;
@@ -66,7 +66,7 @@
}
else
{
- lblHeader.Label = "Search for a place";
+ lblHeader.Label = MyWorldmap.GUILocalizeStrings.Get(49);
btnStreet.Disabled = true;
lblStreet.Disabled = true;
btnCity.Disabled = true;
Modified: trunk/plugins/WorldMap/language/MyWorldmap/strings_en.xml
===================================================================
--- trunk/plugins/WorldMap/language/MyWorldmap/strings_en.xml 2010-02-01 18:37:08 UTC (rev 3402)
+++ trunk/plugins/WorldMap/language/MyWorldmap/strings_en.xml 2010-02-01 19:29:31 UTC (rev 3403)
@@ -13,6 +13,7 @@
<String id="35"> is active</String>
<String id="36">Choose MapType</String>
<String id="37">Options</String>
+ <String id="49">Search for a place</String>
<String id="50">Search for address or location</String>
<String id="51">Street:</String>
<String id="52">City:</String>
Modified: trunk/plugins/WorldMap/language/MyWorldmap/strings_it.xml
===================================================================
--- trunk/plugins/WorldMap/language/MyWorldmap/strings_it.xml 2010-02-01 18:37:08 UTC (rev 3402)
+++ trunk/plugins/WorldMap/language/MyWorldmap/strings_it.xml 2010-02-01 19:29:31 UTC (rev 3403)
@@ -10,9 +10,10 @@
<String id="32">Posizione speciale</String>
<String id="33">Risultato ultima ricerca</String>
<String id="34">Segnaposti memorizzati</String>
- <String id="35"> è attivo</String>
+ <String id="35"> attivo</String>
<String id="36">Selezione tipo mappa</String>
<String id="37">Opzioni</String>
+ <String id="49">Cerca un luogo</String>
<String id="50">Cerca per posizione o indirizzo</String>
<String id="51">Via:</String>
<String id="52">Città:</String>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-02-01 21:46:45
|
Revision: 3406
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3406&view=rev
Author: chemelli_sf
Date: 2010-02-01 21:46:38 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Fixed logging
Modified Paths:
--------------
trunk/plugins/WorldMap/LocalizeStrings.cs
trunk/plugins/WorldMap/WorldMap.cs
Modified: trunk/plugins/WorldMap/LocalizeStrings.cs
===================================================================
--- trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-01 21:39:50 UTC (rev 3405)
+++ trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-01 21:46:38 UTC (rev 3406)
@@ -87,7 +87,7 @@
string cultureName = null;
if (language != null) cultureName = GetCultureName(language);
- Log.Info(" Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, cultureName, language, isPrefixEnabled);
+ Log.Info("[Worldmap]: Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, cultureName, language, isPrefixEnabled);
_stringProvider = new LocalisationProvider(directory, cultureName, isPrefixEnabled);
@@ -140,9 +140,9 @@
}
catch (System.FormatException e)
{
- Log.Error("Error formatting translation with id {0}", dwCode);
- Log.Error("Unformatted translation: {0}", translation);
- Log.Error(e);
+ Log.Error("[Worldmap]: Error formatting translation with id {0}", dwCode);
+ Log.Error("[Worldmap]: Unformatted translation: {0}", translation);
+ Log.Error("[Worldmap]: " + e);
return translation;
}
}
@@ -163,7 +163,7 @@
if (translation == null)
{
- Log.Error("No translation found for id {0}", dwCode);
+ Log.Error("[Worldmap]: No translation found for id {0}", dwCode);
return String.Empty;
}
@@ -191,7 +191,7 @@
}
catch (FormatException e)
{
- Log.Error(e);
+ Log.Error("[Worldmap]:" + e);
strLabel = String.Empty;
return;
}
@@ -199,7 +199,7 @@
strLabel = _stringProvider.GetString("unmapped", dwLabelID);
if (strLabel == null)
{
- Log.Error("No translation found for id {0}", dwLabelID);
+ Log.Error("[Worldmap]: No translation found for id {0}", dwLabelID);
strLabel = String.Empty;
}
}
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2010-02-01 21:39:50 UTC (rev 3405)
+++ trunk/plugins/WorldMap/WorldMap.cs 2010-02-01 21:46:38 UTC (rev 3406)
@@ -60,7 +60,7 @@
}
catch (Exception err)
{
- Log.Error(err);
+ Log.Error("[Worldmap]: " + err);
}
}
@@ -108,7 +108,7 @@
public void RefreshImageTiles()
{
- Log.Debug("[Worldmap] Refreshing Mapimage. lon:lat:zoomL:zoomF:mapT {0}:{1}:{2}:{3}:{4}", currentLongitude, currentLatitude, currentZoomLevel, currentZoomFactor, currentMapType);
+ Log.Debug("[Worldmap]: Refreshing Mapimage. lon:lat:zoomL:zoomF:mapT {0}:{1}:{2}:{3}:{4}", currentLongitude, currentLatitude, currentZoomLevel, currentZoomFactor, currentMapType);
mapTiles.ClearTileDownloadQueue();
@@ -141,9 +141,9 @@
public override bool Init()
{
- Log.Debug("[Worldmap] Start to initialize Worldmap plugin Windows");
+ Log.Debug("[Worldmap]: Start to initialize Worldmap plugin Windows");
- Log.Debug("[Worldmap] Initialize Worldmap menu");
+ Log.Debug("[Worldmap]: Initialize Worldmap menu");
Menu = new WorldmapMenu();
Menu.Init();
@@ -151,14 +151,14 @@
{
GUIWindow win = (GUIWindow)Menu;
GUIWindowManager.Add(ref win);
- Log.Debug("[Worldmap] the window with the ID {0} has been added to the windowmanager!", win.GetID);
+ Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Menu);
}
- Log.Debug("[Worldmap] Initialize Worldmap search");
+ Log.Debug("[Worldmap]: Initialize Worldmap search");
Search = new WorldmapSearch();
Search.Init();
@@ -166,14 +166,14 @@
{
GUIWindow win = (GUIWindow)Search;
GUIWindowManager.Add(ref win);
- Log.Debug("[Worldmap] the window with the ID {0} has been added to the windowmanager!", win.GetID);
+ Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Search);
}
- Log.Debug("[Worldmap] Initialize Worldmap searchresult");
+ Log.Debug("[Worldmap]: Initialize Worldmap searchresult");
SearchResults = new WorldMapSearchResults();
SearchResults.Init();
@@ -181,11 +181,11 @@
{
GUIWindow win = (GUIWindow)SearchResults;
GUIWindowManager.Add(ref win);
- Log.Debug("[Worldmap] the window with the ID {0} has been added to the windowmanager!", win.GetID);
+ Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.SearchResults);
}
@@ -259,7 +259,7 @@
{
if (!File.Exists(Path.Combine(tmpSkinFolder, s)))
{
- Log.Error("{0}: cannot find skin file {1}", Name, s);
+ Log.Error("[Worldmap]: Cannot find skin file {1}", s);
}
}
@@ -273,7 +273,7 @@
}
catch (Exception err)
{
- Log.Error("{0}: error \"{1}\" during texture/bitmap creation", Name, err.Message);
+ Log.Error("[Worldmap]: Error \"{0}\" during texture/bitmap creation", err.Message);
}
LastGraphicContextWidth = (int)GUIGraphicsContext.Width;
@@ -361,7 +361,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("[Worldmap]: Detected Action: {0} ID: {1}", action, action.wID);
if (action.wID == settings.ActionMoveRight)
{
@@ -537,7 +537,7 @@
void SetWorldOverview()
{
- //Log.Debug("[Worldmap] Calculating the widest zoome mode");
+ //Log.Debug("[Worldmap]: Calculating the widest zoome mode");
//currentMapType = MapFunctions.MapType.VEHybrid;
currentLongitude = 0;
currentLatitude = 35;
@@ -557,7 +557,7 @@
}
currentZoomLevel = tmpZoomLevel;
- Log.Debug("[Worldmap] Calcalation result: ScreenWidth:MinZoomLevel:mapTiles {0}:{1}:{2}", GUIGraphicsContext.Width, MinZoomLevel, tmpMapTiles);
+ Log.Debug("[Worldmap]: Calculation result: ScreenWidth:MinZoomLevel:mapTiles {0}:{1}:{2}", GUIGraphicsContext.Width, MinZoomLevel, tmpMapTiles);
}
public void ChooseMapType()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-02-01 21:55:51
|
Revision: 3407
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3407&view=rev
Author: chemelli_sf
Date: 2010-02-01 21:55:34 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Code resharped
Modified Paths:
--------------
trunk/plugins/WorldMap/LocalizeStrings.cs
trunk/plugins/WorldMap/MAPS/ImageFunctions.cs
trunk/plugins/WorldMap/MAPS/MapFunctions.cs
trunk/plugins/WorldMap/MAPS/MapTile.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/PlugInBase.cs
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/WorldMap.cs
trunk/plugins/WorldMap/WorldMapSearchResults.cs
trunk/plugins/WorldMap/WorldmapConfig.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
Modified: trunk/plugins/WorldMap/LocalizeStrings.cs
===================================================================
--- trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-01 21:46:38 UTC (rev 3406)
+++ trunk/plugins/WorldMap/LocalizeStrings.cs 2010-02-01 21:55:34 UTC (rev 3407)
@@ -24,15 +24,11 @@
#endregion
using System;
-using System.IO;
-using System.Globalization;
using System.Collections;
using System.Collections.Generic;
-using System.Text;
-using System.Xml;
-using MediaPortal.Util;
+using System.Globalization;
+using MediaPortal.Configuration;
using MediaPortal.GUI.Library;
-using MediaPortal.Configuration;
using MediaPortal.Localisation;
namespace MyWorldmap
@@ -45,25 +41,30 @@
public class GUILocalizeStrings
{
#region Variables
- static LocalisationProvider _stringProvider;
- static Dictionary<string, string> _cultures;
- static string[] _languages;
+
+ private static Dictionary<string, string> _cultures;
+ private static string[] _languages;
+ private static LocalisationProvider _stringProvider;
+
#endregion
#region Constructors/Destructors
+
// singleton. Dont allow any instance of this class
private GUILocalizeStrings()
{
}
- static public void Dispose()
+ public static void Dispose()
{
if (_stringProvider != null)
_stringProvider.Dispose();
}
+
#endregion
#region Public Methods
+
/// <summary>
/// Public method to load the text from a strings/xml file into memory
/// </summary>
@@ -73,11 +74,11 @@
/// false when it was unable to load the text
/// </returns>
//[Obsolete("This method has changed", true)]
- static public bool Load(string language)
+ public static bool Load(string language)
{
bool isPrefixEnabled = true;
- using (MediaPortal.Profile.Settings reader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
+ using (var reader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
isPrefixEnabled = reader.GetValueAsBool("general", "myprefix", true);
if (language == null) language = reader.GetValueAsString("skin", "language", "English");
@@ -87,7 +88,8 @@
string cultureName = null;
if (language != null) cultureName = GetCultureName(language);
- Log.Info("[Worldmap]: Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory, cultureName, language, isPrefixEnabled);
+ Log.Info("[Worldmap]: Loading localised Strings - Path: {0} Culture: {1} Language: {2} Prefix: {3}", directory,
+ cultureName, language, isPrefixEnabled);
_stringProvider = new LocalisationProvider(directory, cultureName, isPrefixEnabled);
@@ -96,7 +98,7 @@
return true;
}
- static public string CurrentLanguage()
+ public static string CurrentLanguage()
{
if (_stringProvider == null)
Load(null);
@@ -104,7 +106,7 @@
return _stringProvider.CurrentLanguage.EnglishName;
}
- static public void ChangeLanguage(string language)
+ public static void ChangeLanguage(string language)
{
if (_stringProvider == null)
Load(language);
@@ -121,7 +123,7 @@
/// <returns>
/// string containing the translated text
/// </returns>
- static public string Get(int dwCode, object[] parameters)
+ public static string Get(int dwCode, object[] parameters)
{
if (_stringProvider == null)
Load(null);
@@ -138,7 +140,7 @@
{
return String.Format(translation, parameters);
}
- catch (System.FormatException e)
+ catch (FormatException e)
{
Log.Error("[Worldmap]: Error formatting translation with id {0}", dwCode);
Log.Error("[Worldmap]: Unformatted translation: {0}", translation);
@@ -154,7 +156,7 @@
/// <returns>
/// string containing the translated text
/// </returns>
- static public string Get(int dwCode)
+ public static string Get(int dwCode)
{
if (_stringProvider == null)
Load(null);
@@ -170,7 +172,7 @@
return translation;
}
- static public void LocalizeLabel(ref string strLabel)
+ public static void LocalizeLabel(ref string strLabel)
{
if (_stringProvider == null)
Load(null);
@@ -187,7 +189,7 @@
try
{
- dwLabelID = System.Int32.Parse(strLabel);
+ dwLabelID = Int32.Parse(strLabel);
}
catch (FormatException e)
{
@@ -223,7 +225,7 @@
CultureInfo[] cultures = _stringProvider.AvailableLanguages();
- SortedList sortedLanguages = new SortedList();
+ var sortedLanguages = new SortedList();
foreach (CultureInfo culture in cultures)
sortedLanguages.Add(culture.EnglishName, culture.EnglishName);
@@ -231,14 +233,14 @@
for (int i = 0; i < sortedLanguages.Count; i++)
{
- _languages[i] = (string)sortedLanguages.GetByIndex(i);
+ _languages[i] = (string) sortedLanguages.GetByIndex(i);
}
}
return _languages;
}
- static public string GetCultureName(string language)
+ public static string GetCultureName(string language)
{
if (_cultures == null)
{
@@ -257,6 +259,7 @@
return null;
}
+
#endregion
}
}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/ImageFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ImageFunctions.cs 2010-02-01 21:46:38 UTC (rev 3406)
+++ trunk/plugins/WorldMap/MAPS/ImageFunctions.cs 2010-02-01 21:55:34 UTC (rev 3407)
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
using System.Drawing;
-using System.Drawing.Drawing2D;
namespace MAPS
{
- class ImageFunctions
+ internal class ImageFunctions
{
public static Bitmap MergeBitmaps(Bitmap Background, Bitmap Overlay)
{
@@ -18,39 +14,41 @@
public static Bitmap GetUpperLeftPart(Bitmap Tile)
{
- Bitmap tmpBitmap = new Bitmap(256,256);
+ var tmpBitmap = new Bitmap(256, 256);
Graphics graphic = Graphics.FromImage(tmpBitmap);
- Rectangle tmpDestRect = new Rectangle(0,0,Tile.Width,Tile.Height);;
- Rectangle tmpSourceRect = new Rectangle(0, 0, 128, 128);
+ var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
+ ;
+ var tmpSourceRect = new Rectangle(0, 0, 128, 128);
- graphic.DrawImage(tmpBitmap,tmpDestRect,0,0,128,128,GraphicsUnit.Pixel);
- //(Tile, 0, 0, tmpSourceRect, GraphicsUnit.Pixel)
+ graphic.DrawImage(tmpBitmap, tmpDestRect, 0, 0, 128, 128, GraphicsUnit.Pixel);
+ //(Tile, 0, 0, tmpSourceRect, GraphicsUnit.Pixel)
return tmpBitmap;
}
public static Bitmap GetUpperRightPart(Bitmap Tile)
{
- Bitmap tmpBitmap = new Bitmap(256, 256);
+ var tmpBitmap = new Bitmap(256, 256);
Graphics graphic = Graphics.FromImage(tmpBitmap);
- Rectangle tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height); ;
- Rectangle tmpSourceRect = new Rectangle(129, 0, 256, 128);
+ var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
+ ;
+ var tmpSourceRect = new Rectangle(129, 0, 256, 128);
graphic.DrawImage(tmpBitmap, tmpDestRect, 129, 0, 256, 128, GraphicsUnit.Pixel);
return tmpBitmap;
-
}
public static Bitmap GetLowerLeftPart(Bitmap Tile)
{
- Bitmap tmpBitmap = new Bitmap(256, 256);
+ var tmpBitmap = new Bitmap(256, 256);
Graphics graphic = Graphics.FromImage(tmpBitmap);
- Rectangle tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height); ;
- Rectangle tmpSourceRect = new Rectangle(0, 129, 128, 256);
+ var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
+ ;
+ var tmpSourceRect = new Rectangle(0, 129, 128, 256);
graphic.DrawImage(tmpBitmap, tmpDestRect, 0, 129, 128, 256, GraphicsUnit.Pixel);
@@ -59,19 +57,16 @@
public static Bitmap GetLowerRightPart(Bitmap Tile)
{
- Bitmap tmpBitmap = new Bitmap(256, 256);
+ var tmpBitmap = new Bitmap(256, 256);
Graphics graphic = Graphics.FromImage(tmpBitmap);
- Rectangle tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height); ;
- Rectangle tmpSourceRect = new Rectangle(129, 129, 256, 256);
+ var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
+ ;
+ var tmpSourceRect = new Rectangle(129, 129, 256, 256);
graphic.DrawImage(tmpBitmap, tmpDestRect, 129, 129, 256, 256, GraphicsUnit.Pixel);
return tmpBitmap;
}
-
-
}
-}
-
-
+}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-02-01 21:46:38 UTC (rev 3406)
+++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-02-01 21:55:34 UTC (rev 3407)
@@ -1,11 +1,11 @@
using System;
-using System.Collections.Generic;
-using System.Text;
namespace MAPS
{
public class MapFunctions
{
+ #region MapType enum
+
public enum MapType
{
GMRoad,
@@ -17,13 +17,15 @@
VEHybrid
}
+ #endregion
+
public static MapType GetNextMapType(MapType currentMapType)
{
- Array tmpMapTypes = Enum.GetValues(typeof(MapFunctions.MapType));
+ Array tmpMapTypes = Enum.GetValues(typeof (MapType));
int IntMapType = Convert.ToInt32(currentMapType);
IntMapType++;
if (IntMapType > tmpMapTypes.Length - 1) IntMapType = 0;
- return (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), IntMapType));
+ return (MapType) (Enum.ToObject(typeof (MapType), IntMapType));
}
public static MapType GetNextRoadMap(MapType currentMapType)
@@ -52,7 +54,7 @@
return MapType.GMHybrid;
}
-
+
/// <summary>
/// Get the vertical tile number from a latitude using mercator ptrojection formula
/// </summary>
@@ -66,14 +68,14 @@
if (lat < -90) lat = lat + 180;
// conversion degre=>radians
- double phi = Math.PI * lat / 180;
+ double phi = Math.PI*lat/180;
double res;
//double temp = Math.Tan(Math.PI / 4 - phi / 2);
//res = Math.Log(temp);
- res = 0.5 * Math.Log((1 + Math.Sin(phi)) / (1 - Math.Sin(phi)));
+ res = 0.5*Math.Log((1 + Math.Sin(phi))/(1 - Math.Sin(phi)));
double maxTileY = Math.Pow(2, zoomLevel);
- int result = (int)(((1 - res / maxlat) / 2) * (maxTileY));
+ var result = (int) (((1 - res/maxlat)/2)*(maxTileY));
return (result);
}
@@ -92,8 +94,8 @@
longitude = longitude + 360;
}
- double res = (longitude + 180) / 360;
- return (int)(res * Math.Pow(2, zoomLevel));
+ double res = (longitude + 180)/360;
+ return (int) (res*Math.Pow(2, zoomLevel));
}
/// <summary>
@@ -102,16 +104,13 @@
//private PointF getMinBounds(int numlat, int numlong, int zoom)
//{
// PointF res = new PointF();
-
// double maxlat = Math.PI;
// double maxTile = Math.Pow(2, zoom);
// double numlatrel = maxlat * (1 - 2 * ((numlat + 1) / maxTile));
-
// res.Y = (float)((2 * Math.Atan(Math.Exp(numlatrel)) - Math.PI / 2) * 180 / Math.PI);
// res.X = (float)(360 * (numlong / maxTile) - 180);
// return res;
//}
-
/** get latitude/longitude maxi of a tile*/
//private PointF getMaxBounds(int numlat, int numlong, int zoom)
//{
@@ -119,26 +118,23 @@
// double maxlat = Math.PI;
// double maxTile = Math.Pow(2, zoom);
// double numlatrel = maxlat * (1 - 2 * (numlat / maxTile));
-
// res.Y = (float)((2 * Math.Atan(Math.Exp(numlatrel)) - Math.PI / 2) * 180 / Math.PI);
// res.X = (float)(360 * (numlong + 1) / maxTile - 180);
// return res;
//}
-
-
public static double ConvertTileXToLongitude(int TileX, int ZoomLevel)
{
double maxTile = Math.Pow(2, ZoomLevel);
- return (float)(360 * (TileX ) / maxTile - 180);
+ return (float) (360*(TileX)/maxTile - 180);
}
public static double ConvertTileYToLatitude(int TileY, int ZoomLevel)
{
double maxlat = Math.PI;
double maxTile = Math.Pow(2, ZoomLevel);
- double numlatrel = maxlat * (1 - 2 * (TileY / maxTile));
+ double numlatrel = maxlat*(1 - 2*(TileY/maxTile));
- return (float)((2 * Math.Atan(Math.Exp(numlatrel)) - Math.PI / 2) * 180 / Math.PI);
+ return (float) ((2*Math.Atan(Math.Exp(numlatrel)) - Math.PI/2)*180/Math.PI);
}
public static double ConvertZoomLevelToTileSizeDegree(int zoomLevel)
@@ -165,38 +161,44 @@
public static string GetGMapSatUrl(double Longitude, double Latitude, int zoomLevel, ref MapConfig curConfig)
{
- return GetGMapSatUrl(ConvertLongitudeToTileX(Longitude, zoomLevel), ConvertLatitudeToTileY(Latitude, zoomLevel), zoomLevel, ref curConfig);
+ return GetGMapSatUrl(ConvertLongitudeToTileX(Longitude, zoomLevel), ConvertLatitudeToTileY(Latitude, zoomLevel),
+ zoomLevel, ref curConfig);
}
public static string GetGMapSatUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
{
string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
- if(tileCode=="") return "";
-
+ if (tileCode == "") return "";
+
int servNum = -1;
try
{
switch (tileCode[tileCode.Length - 1])
{
- case 'q': servNum = 0;
+ case 'q':
+ servNum = 0;
break;
- case 'r': servNum = 1;
+ case 'r':
+ servNum = 1;
break;
- case 's': servNum = 2;
+ case 's':
+ servNum = 2;
break;
- case 't': servNum = 3;
+ case 't':
+ servNum = 3;
break;
}
}
catch (Exception err)
- { }
+ {
+ }
string StringServNum;
if (servNum == -1) StringServNum = "";
else StringServNum = servNum.ToString();
- string fullurl = string.Format(curConfig.GMAUrl,StringServNum, tileCode);
+ string fullurl = string.Format(curConfig.GMAUrl, StringServNum, tileCode);
if (tileCode == "transparent")
{
//fullurl = "http://www.google.com/intl/en_ALL/mapfiles/transparent.png";
@@ -211,13 +213,15 @@
double halflat = TileY; /**/
double locxmin, locxmax, locymin, locymax, locxmoy, locymoy;
- locxmin = 0; locxmax = Math.Pow(2, zoomLevel);
- locymin = 0; locymax = Math.Pow(2, zoomLevel);
+ locxmin = 0;
+ locxmax = Math.Pow(2, zoomLevel);
+ locymin = 0;
+ locymax = Math.Pow(2, zoomLevel);
for (int i = 0; i < zoomLevel; i++)
{
- locxmoy = (locxmax + locxmin) / 2;
- locymoy = (locymax + locymin) / 2;
+ locxmoy = (locxmax + locxmin)/2;
+ locymoy = (locymax + locymin)/2;
if ((halflat < locymin) ||
(halflat > locymax) ||
(TileX < locxmin) ||
@@ -229,12 +233,14 @@
{
locymax = locymoy;
if (TileX < locxmoy)
- { /*q quadrant (top left)*/
+ {
+ /*q quadrant (top left)*/
tileid += "q";
locxmax = locxmoy;
}
else
- {/*r quadrant (top right)*/
+ {
+/*r quadrant (top right)*/
tileid += "r";
locxmin = locxmoy;
}
@@ -243,21 +249,22 @@
{
locymin = locymoy;
if (TileX < locxmoy)
- { /*t quadrant (bottom right)*/
+ {
+ /*t quadrant (bottom right)*/
tileid += "t";
locxmax = locxmoy;
}
else
- {/*s quadrant (bottom left)*/
+ {
+/*s quadrant (bottom left)*/
tileid += "s";
locxmin = locxmoy;
}
}
}
return tileid;
+ }
-
- }
public static string GetGTerrainUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
{
string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
@@ -269,18 +276,23 @@
{
switch (tileCode[tileCode.Length - 1])
{
- case 'q': servNum = 0;
+ case 'q':
+ servNum = 0;
break;
- case 'r': servNum = 1;
+ case 'r':
+ servNum = 1;
break;
- case 's': servNum = 2;
+ case 's':
+ servNum = 2;
break;
- case 't': servNum = 3;
+ case 't':
+ servNum = 3;
break;
}
}
catch (Exception err)
- { }
+ {
+ }
string StringServNum;
if (servNum == -1) StringServNum = "";
@@ -290,7 +302,6 @@
string[] urltab = TileCode.Split('_');
string fullurl = string.Format(curConfig.GMTUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
return fullurl;
-
}
public static string GetGMapUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
@@ -304,18 +315,23 @@
{
switch (tileCode[tileCode.Length - 1])
{
- case 'q': servNum = 0;
+ case 'q':
+ servNum = 0;
break;
- case 'r': servNum = 1;
+ case 'r':
+ servNum = 1;
break;
- case 's': servNum = 2;
+ case 's':
+ servNum = 2;
break;
- case 't': servNum = 3;
+ case 't':
+ servNum = 3;
break;
}
}
catch (Exception err)
- { }
+ {
+ }
string StringServNum;
if (servNum == -1) StringServNum = "";
@@ -323,9 +339,8 @@
string TileCode = GetGMapTileCode(TileX, TileY, zoomLevel);
string[] urltab = TileCode.Split('_');
- string fullurl = string.Format(curConfig.GMRUrl, StringServNum, urltab[0],urltab[1],urltab[2]);
+ string fullurl = string.Format(curConfig.GMRUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
return fullurl;
-
}
public static string GetGHybridOverlayUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
@@ -339,18 +354,23 @@
{
switch (tileCode[tileCode.Length - 1])
{
- case 'q': servNum = 0;
+ case 'q':
+ servNum = 0;
break;
- case 'r': servNum = 1;
+ case 'r':
+ servNum = 1;
break;
- case 's': servNum = 2;
+ case 's':
+ servNum = 2;
break;
- case 't': servNum = 3;
+ case 't':
+ servNum = 3;
break;
}
}
catch (Exception err)
- { }
+ {
+ }
string StringServNum;
if (servNum == -1) StringServNum = "";
@@ -358,7 +378,8 @@
string TileCode = GetGMapTileCode(TileX, TileY, zoomLevel);
string[] urltab = TileCode.Split('_');
- string fullurl = string.Format(curConfig.GMHUrl, StringServNum, urltab[0], urltab[1], urltab[2]); // a small "t" make the big differens
+ string fullurl = string.Format(curConfig.GMHUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
+ // a small "t" make the big differens
return fullurl;
}
@@ -366,9 +387,9 @@
{
int localzoom = (17 - zoomLevel);
string tileid = "";
- double numLong = (int)TileX;
- double numLat = (int)TileY;
- tileid = numLong.ToString() + "_" + ((int)numLat).ToString() + "_" + localzoom.ToString();
+ double numLong = TileX;
+ double numLat = TileY;
+ tileid = numLong + "_" + ((int) numLat) + "_" + localzoom;
return tileid;
}
@@ -377,13 +398,17 @@
string url = null;
switch (mapType)
{
- case MapType.GMTerrain: url = GetGTerrainUrl(TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.GMTerrain:
+ url = GetGTerrainUrl(TileX, TileY, zoomLevel, ref curConfig);
break;
- case MapType.GMRoad: url = GetGMapUrl(TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.GMRoad:
+ url = GetGMapUrl(TileX, TileY, zoomLevel, ref curConfig);
break;
- case MapType.GMAerial: url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.GMAerial:
+ url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
break;
- case MapType.GMHybrid: url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.GMHybrid:
+ url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
break;
}
return url;
@@ -421,8 +446,9 @@
{
url = string.Format(curConfig.VEUrl, mapTypePreFix, quadKey[quadKey.Length - 1], quadKey, mapExtension);
}
- catch(Exception err)
- { }
+ catch (Exception err)
+ {
+ }
return url;
}
@@ -458,15 +484,17 @@
case MapType.GMAerial:
case MapType.GMHybrid:
case MapType.GMTerrain:
- case MapType.GMRoad: url = GetGMTileUrl(mapType, TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.GMRoad:
+ url = GetGMTileUrl(mapType, TileX, TileY, zoomLevel, ref curConfig);
break;
case MapType.VERoad:
case MapType.VEAerial:
- case MapType.VEHybrid: url = GetVETileUrl(mapType, TileX, TileY, zoomLevel, ref curConfig);
+ case MapType.VEHybrid:
+ url = GetVETileUrl(mapType, TileX, TileY, zoomLevel, ref curConfig);
break;
}
return url;
}
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/MapTile.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapTile.cs 2010-02-01 21:46:38 UTC (rev 3406)
+++ trunk/plugins/WorldMap/MAPS/MapTile.cs 2010-02-01 21:55:34 UTC (rev 3407)
@@ -1,6 +1,4 @@
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Drawing;
namespace MAPS
@@ -10,79 +8,107 @@
public class ImageChangedEventArgs : EventArgs
{
private int TileX, TileY, ZoomMode;
+
public ImageChangedEventArgs(int tileX, int tileY, int zoomMode)
{
- this.TileX = tileX;
- this.TileY = tileY;
- this.ZoomMode = zoomMode;
+ TileX = tileX;
+ TileY = tileY;
+ ZoomMode = zoomMode;
}
}
public class MapTile
{
- public event ImageChangedEventHandler ImageChangedEvent;
-
- protected virtual void OnImageChangedEvent(ImageChangedEventArgs e)
- {
- ImageChangedEvent(this, e);
- }
-
- MapFunctions.MapType _mapType;
+ private double _BottomLatitude;
+ private Bitmap _Image;
+ private double _LeftLongitude;
+ private MapFunctions.MapType _mapType;
private int _PosX;
private int _PosY;
- private int _ZoomLevel;
- private double _LeftLongitude;
private double _RightLongitude;
+ private double _TileHeightDegree;
+ private double _TileWidthDegree;
private double _TopLatitude;
- private double _BottomLatitude;
- private double _TileWidthDegree;
- private double _TileHeightDegree;
+ private int _ZoomLevel;
- private Bitmap _Image;
+ public MapTile(MapFunctions.MapType mapType, int TileX, int TileY, int ZoomLevel)
+ {
+ _mapType = mapType;
+ _PosX = TileX;
+ _PosY = TileY;
+
+ _ZoomLevel = ZoomLevel;
+ _TileWidthDegree = MapFunctions.ConvertZoomLevelToTileSizeDegree(_ZoomLevel);
+
+ _LeftLongitude = MapFunctions.ConvertTileXToLongitude(_PosX, _ZoomLevel);
+ _RightLongitude = MapFunctions.ConvertTileXToLongitude(_PosX + 1, _ZoomLevel);
+
+ _TopLatitude = MapFunctions.ConvertTileYToLatitude(_PosY, _ZoomLevel);
+ _BottomLatitude = MapFunctions.ConvertTileYToLatitude(_PosY + 1, _ZoomLevel);
+
+ _TileWidthDegree = RigthLongitude - LeftLongitude;
+ if (_TileWidthDegree < 0) _TileWidthDegree *= -1;
+
+ _TileHeightDegree = BottomLatitude - TopLatitude;
+ if (_TileHeightDegree < 0) _TileHeightDegree *= -1;
+
+ _Image = new Bitmap(256, 256);
+ }
+
public MapFunctions.MapType MapType
{
get { return _mapType; }
}
+
public int PosX
{
get { return _PosX; }
}
+
public int PosY
{
get { return _PosY; }
}
+
public int ZoomLevel
{
get { return _ZoomLevel; }
}
+
public double LeftLongitude
{
get { return _LeftLongitude; }
}
+
public double RigthLongitude
{
get { return _RightLongitude; }
}
+
public double TopLatitude
{
get { return _TopLatitude; }
}
+
public double BottomLatitude
{
get { return _BottomLatitude; }
}
+
public double TileWidthDegree
{
get { return _TileWidthDegree; }
}
+
public double TileHeightDegree
{
get { return _TileHeightDegree; }
}
+
public Bitmap Image
{
- get { return _Image;}
+ get { return _Image; }
set
{
_Image = value;
@@ -90,31 +116,11 @@
}
}
- public MapTile(MapFunctions.MapType mapType, int TileX, int TileY, int ZoomLevel)
+ public event ImageChangedEventHandler ImageChangedEvent;
+
+ protected virtual void OnImageChangedEvent(ImageChangedEventArgs e)
{
- _mapType = mapType;
-
- _PosX = TileX;
- _PosY = TileY;
-
- _ZoomLevel = ZoomLevel;
- _TileWidthDegree = MapFunctions.ConvertZoomLevelToTileSizeDegree(_ZoomLevel);
-
- _LeftLongitude = MapFunctions.ConvertTileXToLongitude(_PosX, _ZoomLevel);
- _RightLongitude = MapFunctions.ConvertTileXToLongitude(_PosX+1, _ZoomLevel);
-
- _TopLatitude = MapFunctions.ConvertTileYToLatitude(_PosY, _ZoomLevel);
- _BottomLatitude = MapFunctions.ConvertTileYToLatitude(_PosY+1, _ZoomLevel);
-
- _TileWidthDegree = RigthLongitude - LeftLongitude;
- if (_TileWidthDegree < 0) _TileWidthDegree *= -1;
-
- _TileHeightDegree = BottomLatitude - TopLatitude;
- if (_TileHeightDegree < 0) _TileHeightDegree *= -1;
-
- _Image = new Bitmap(256, 256);
-
+ ImageChangedEvent(this, e);
}
-
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/MapTiles.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapTiles.cs 2010-02-01 21:46:38 UTC (rev 3406)
+++ trunk/plugins/WorldMap/MAPS/MapTiles.cs 2010-02-01 21:55:34 UTC (rev 3407)
@@ -1,31 +1,28 @@
using System;
-using System.Collections.Generic;
-using System.Text;
using System.Drawing;
-using System.Threading;
namespace MAPS
{
public class MapConfig
{
public string CacheFolder;
- public int ThreadCountGMR;
- public int ThreadCountGMA;
- public int ThreadCountGMH;
- public int ThreadCountGMT;
- public int ThreadCountVER;
- public int ThreadCountVEA;
- public int ThreadCountVEH;
public int DaysToKeepCachedDetailedTiles;
public int DaysToKeepCachedOverviewTiles;
+ public Bitmap DownloadPlaceholder;
public string GMAUrl;
- public string GMRUrl;
public string GMHUrl;
+ public string GMRUrl;
public string GMTUrl;
- public string VEUrl;
- public Bitmap TileNotAvailable;
public Bitmap IPBlocked;
- public Bitmap DownloadPlaceholder;
+ public int ThreadCountGMA;
+ public int ThreadCountGMH;
+ public int ThreadCountGMR;
+ public int ThreadCountGMT;
+ public int ThreadCountVEA;
+ public int ThreadCountVEH;
+ public int ThreadCountVER;
+ public Bitmap TileNotAvailable;
+ public string VEUrl;
public MapConfig()
{
@@ -41,43 +38,37 @@
DaysToKeepCachedDetailedTiles = 200;
}
}
-
+
public delegate void CombinedImageChangedEventHandler(object sender, ImageChangedEventArgs e);
public class MapTiles
{
- public event CombinedImageChangedEventHandler CombinedImageChangedEvent;
-
- public MapConfig mapConfig;
-
+ public Bitmap combinedTiles;
+ public Bitmap croppedCombinedTiles;
public ThreadedDownload ImageGrabber;
- public MapTile[][] Tiles;
public int ImageResolutionX;
public int ImageResolutionY;
- public int TileCountX;
- public int TileCountY;
-
- public int StartTileX;
- public int StartTileY;
-
- public double Longitude;
public double Latitude;
+ public double Longitude;
+ public MapConfig mapConfig;
+ public MapFunctions.MapType mapType;
public int OffsetX;
public int OffsetY;
+ public int StartTileX;
+ public int StartTileY;
+ public int TileCountX;
+ public int TileCountY;
+ public MapTile[][] Tiles;
public int ZoomLevel;
- public MapFunctions.MapType mapType;
- public Bitmap combinedTiles;
- public Bitmap croppedCombinedTiles;
-
public MapTiles(int ImageResulotionX, int ImageResulotionY, MapConfig mapConfig)
{
- this.ImageResolutionX = ImageResulotionX;
- this.ImageResolutionY = ImageResulotionY;
+ ...
[truncated message content] |
![http://www.google.com/intl/en_ALL/mapfiles/transparent.png";](http://www.google.com/intl/en_ALL/mapfiles/transparent.png";){kind=link}
|
From: <che...@us...> - 2010-02-02 22:46:42
|
Revision: 3411
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3411&view=rev
Author: chemelli_sf
Date: 2010-02-02 22:46:35 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
- Fixed bitmap loading
- Updated version to 0.9.4.1
Modified Paths:
--------------
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
trunk/plugins/WorldMap/WorldMap.cs
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-01 22:47:35 UTC (rev 3410)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-02-02 22:46:35 UTC (rev 3411)
@@ -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.0")]
-[assembly: AssemblyFileVersion("0.9.4.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.9.4.1")]
+[assembly: AssemblyFileVersion("0.9.4.1")]
\ No newline at end of file
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2010-02-01 22:47:35 UTC (rev 3410)
+++ trunk/plugins/WorldMap/WorldMap.cs 2010-02-02 22:46:35 UTC (rev 3411)
@@ -90,7 +90,7 @@
private void mapTiles_CombinedImageChangedEvent(object sender, ImageChangedEventArgs e)
{
- lock (typeof (bool))
+ lock (typeof(bool))
{
VisibleImageChanged = true;
}
@@ -104,45 +104,45 @@
Menu = new WorldmapMenu();
Menu.Init();
- if (GUIWindowManager.GetWindow((int) WorldmapWindowIDs.Menu) == null)
+ if (GUIWindowManager.GetWindow((int)WorldmapWindowIDs.Menu) == null)
{
- var win = (GUIWindow) Menu;
+ var win = (GUIWindow)Menu;
GUIWindowManager.Add(ref win);
Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Menu);
}
Log.Debug("[Worldmap]: Initialize Worldmap search");
Search = new WorldmapSearch();
Search.Init();
- if (GUIWindowManager.GetWindow((int) WorldmapWindowIDs.Search) == null)
+ if (GUIWindowManager.GetWindow((int)WorldmapWindowIDs.Search) == null)
{
- var win = (GUIWindow) Search;
+ var win = (GUIWindow)Search;
GUIWindowManager.Add(ref win);
Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.Search);
}
Log.Debug("[Worldmap]: Initialize Worldmap searchresult");
SearchResults = new WorldMapSearchResults();
SearchResults.Init();
- if (GUIWindowManager.GetWindow((int) WorldmapWindowIDs.SearchResults) == null)
+ if (GUIWindowManager.GetWindow((int)WorldmapWindowIDs.SearchResults) == null)
{
- var win = (GUIWindow) SearchResults;
+ var win = (GUIWindow)SearchResults;
GUIWindowManager.Add(ref win);
Log.Debug("[Worldmap]: 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("[Worldmap]: A window with the ID {0} does already exist!", (int)WorldmapWindowIDs.SearchResults);
}
@@ -207,16 +207,16 @@
string tmpSkinFolder = Config.GetSubFolder(Config.Dir.Skin, GUIGraphicsContext.Skin);
string[] media = {
- "WMprogressBarActive.png",
- "WMprogressBarQueued.png",
- "WMTileNotAvailable.jpeg",
- "WMTilePlaceholder.jpeg",
- "WMIPBlocked.jpeg"
+ Path.Combine(tmpSkinFolder, "WMprogressBarActive.png"),
+ Path.Combine(tmpSkinFolder, "WMprogressBarQueued.png"),
+ Path.Combine(tmpSkinFolder, "WMTileNotAvailable.jpeg"),
+ Path.Combine(tmpSkinFolder, "WMTilePlaceholder.jpeg"),
+ Path.Combine(tmpSkinFolder, "WMIPBlocked.jpeg")
};
foreach (string s in media)
{
- if (!File.Exists(Path.Combine(tmpSkinFolder, s)))
+ if (!File.Exists(s))
{
Log.Error("[Worldmap]: Cannot find skin file {1}", s);
}
@@ -248,8 +248,8 @@
(LastGraphicContextHeigth != GUIGraphicsContext.Height)) // has the size of the render window changed?
{
mapTiles = null;
- mapTiles = new MapTiles((int) (GUIGraphicsContext.Width/currentZoomFactor),
- (int) (GUIGraphicsContext.Height/currentZoomFactor), mapConfig);
+ mapTiles = new MapTiles((int)(GUIGraphicsContext.Width / currentZoomFactor),
+ (int)(GUIGraphicsContext.Height / currentZoomFactor), mapConfig);
mapTiles.CombinedImageChangedEvent += mapTiles_CombinedImageChangedEvent;
RefreshImageTiles();
}
@@ -258,8 +258,8 @@
public void FillMapTileRessources()
{
- mapTiles = new MapTiles((int) (GUIGraphicsContext.Width/currentZoomFactor),
- (int) (GUIGraphicsContext.Height/currentZoomFactor), mapConfig);
+ mapTiles = new MapTiles((int)(GUIGraphicsContext.Width / currentZoomFactor),
+ (int)(GUIGraphicsContext.Height / currentZoomFactor), mapConfig);
mapTiles.CombinedImageChangedEvent += mapTiles_CombinedImageChangedEvent;
}
@@ -274,10 +274,10 @@
public bool IsNotWorldmapWindow(int new_windowId)
{
- if (new_windowId != (int) WorldmapWindowIDs.MainWindow
- && new_windowId != (int) WorldmapWindowIDs.Menu
- && new_windowId != (int) WorldmapWindowIDs.Search
- && new_windowId != (int) WorldmapWindowIDs.SearchResults) return true;
+ if (new_windowId != (int)WorldmapWindowIDs.MainWindow
+ && new_windowId != (int)WorldmapWindowIDs.Menu
+ && new_windowId != (int)WorldmapWindowIDs.Search
+ && new_windowId != (int)WorldmapWindowIDs.SearchResults) return true;
else return false;
}
@@ -327,8 +327,8 @@
if (action.wID == settings.ActionMoveRight)
{
- MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX/2][mapTiles.TileCountY/2];
- currentLongitude += (tmpTile.TileWidthDegree/4);
+ MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX / 2][mapTiles.TileCountY / 2];
+ currentLongitude += (tmpTile.TileWidthDegree / 4);
if (currentLongitude > 180) currentLongitude = 180;
RefreshImageTiles();
@@ -336,8 +336,8 @@
}
if (action.wID == settings.ActionMoveLeft)
{
- MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX/2][mapTiles.TileCountY/2];
- currentLongitude -= (tmpTile.TileWidthDegree/4);
+ MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX / 2][mapTiles.TileCountY / 2];
+ currentLongitude -= (tmpTile.TileWidthDegree / 4);
if (currentLongitude < -180) currentLongitude = -180;
RefreshImageTiles();
@@ -345,8 +345,8 @@
}
if (action.wID == settings.ActionMoveUp)
{
- MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX/2][mapTiles.TileCountY/2];
- currentLatitude += (tmpTile.TileHeightDegree/4);
+ MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX / 2][mapTiles.TileCountY / 2];
+ currentLatitude += (tmpTile.TileHeightDegree / 4);
if (currentLatitude > 90) currentLatitude = 90;
RefreshImageTiles();
@@ -354,8 +354,8 @@
}
if (action.wID == settings.ActionMoveDown)
{
- MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX/2][mapTiles.TileCountY/2];
- currentLatitude -= (tmpTile.TileHeightDegree/4);
+ MapTile tmpTile = mapTiles.Tiles[mapTiles.TileCountX / 2][mapTiles.TileCountY / 2];
+ currentLatitude -= (tmpTile.TileHeightDegree / 4);
if (currentLatitude < -90) currentLatitude = -90;
RefreshImageTiles();
@@ -373,8 +373,8 @@
currentZoomFactor -= 0.25f;
if (currentZoomFactor < 1f) currentZoomFactor = 1f;
mapTiles = null;
- mapTiles = new MapTiles((int) (GUIGraphicsContext.Width/currentZoomFactor),
- (int) (GUIGraphicsContext.Height/currentZoomFactor), mapConfig);
+ mapTiles = new MapTiles((int)(GUIGraphicsContext.Width / currentZoomFactor),
+ (int)(GUIGraphicsContext.Height / currentZoomFactor), mapConfig);
mapTiles.CombinedImageChangedEvent += mapTiles_CombinedImageChangedEvent;
}
RefreshImageTiles();
@@ -391,8 +391,8 @@
{
currentZoomFactor += 0.25f;
mapTiles = null;
- mapTiles = new MapTiles((int) (GUIGraphicsContext.Width/currentZoomFactor),
- (int) (GUIGraphicsContext.Height/currentZoomFactor), mapConfig);
+ mapTiles = new MapTiles((int)(GUIGraphicsContext.Width / currentZoomFactor),
+ (int)(GUIGraphicsContext.Height / currentZoomFactor), mapConfig);
mapTiles.CombinedImageChangedEvent += mapTiles_CombinedImageChangedEvent;
}
RefreshImageTiles();
@@ -506,7 +506,7 @@
currentLongitude = 0;
currentLatitude = 35;
- var tmpMapTiles = (int) Math.Round((double) GUIGraphicsContext.Width/(int) Math.Round(256*currentZoomFactor));
+ var tmpMapTiles = (int)Math.Round((double)GUIGraphicsContext.Width / (int)Math.Round(256 * currentZoomFactor));
int tmpZoomLevel = 0;
while (Math.Pow(2, tmpZoomLevel) < tmpMapTiles)
{
@@ -530,16 +530,16 @@
if (MapTypeMenuShown) return;
MapTypeMenuShown = true;
- var Menu = (GUIDialogMenu) GUIWindowManager.GetWindow((int) Window.WINDOW_DIALOG_MENU);
+ var Menu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_MENU);
Menu.Reset();
Menu.SetHeading(GUILocalizeStrings.Get(36));
- Array tmpMapTypes = Enum.GetValues(typeof (MapFunctions.MapType));
+ Array tmpMapTypes = Enum.GetValues(typeof(MapFunctions.MapType));
for (int i = 0; i < tmpMapTypes.Length; i++)
{
- var tmpMapType = (MapFunctions.MapType) (Enum.ToObject(typeof (MapFunctions.MapType), i));
+ var tmpMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), i));
switch (tmpMapType)
{
case MapFunctions.MapType.GMRoad:
@@ -578,7 +578,7 @@
//tmpMainWindow.currentMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), Menu.SelectedLabel));
//tmpMainWindow.RefreshImageTiles();
- currentMapType = (MapFunctions.MapType) (Enum.ToObject(typeof (MapFunctions.MapType), Menu.SelectedLabel));
+ currentMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), Menu.SelectedLabel));
RefreshImageTiles();
}
@@ -658,20 +658,20 @@
public void BuildProgressImageOverlay(int RunningThreads, int QueuedImages)
{
- var StartPosX = (int) imgProgressPlaceholder.Location.X;
- var StartPosY = (int) imgProgressPlaceholder.Location.Y;
+ var StartPosX = (int)imgProgressPlaceholder.Location.X;
+ var StartPosY = (int)imgProgressPlaceholder.Location.Y;
for (int x = 0; x < RunningThreads; x++)
{
- Picture.RenderImage(ProgressBarActiveTexture.texture, StartPosX + (x*(ProgressBarActiveTexture.width)),
+ Picture.RenderImage(ProgressBarActiveTexture.texture, StartPosX + (x * (ProgressBarActiveTexture.width)),
StartPosY, ProgressBarActiveTexture.width, ProgressBarActiveTexture.height,
ProgressBarActiveTexture.width, ProgressBarActiveTexture.height, 0, 0, true);
}
for (int x = 0; x < QueuedImages; x++)
{
Picture.RenderImage(ProgressBarQueuedTexture.texture,
- StartPosX + (RunningThreads*ProgressBarActiveTexture.width) +
- (x*(ProgressBarQueuedTexture.width)), StartPosY, ProgressBarQueuedTexture.width,
+ StartPosX + (RunningThreads * ProgressBarActiveTexture.width) +
+ (x * (ProgressBarQueuedTexture.width)), StartPosY, ProgressBarQueuedTexture.width,
ProgressBarQueuedTexture.height, ProgressBarQueuedTexture.width,
ProgressBarQueuedTexture.height, 0, 0, true);
}
@@ -681,15 +681,15 @@
{
var tmpAction = new Action(null, Action.ActionType.ACTION_PREVIOUS_MENU, 0, 0);
- if (GUIWindowManager.ActiveWindow == (int) WorldmapWindowIDs.SearchResults)
+ if (GUIWindowManager.ActiveWindow == (int)WorldmapWindowIDs.SearchResults)
{
SearchResults.OnAction(tmpAction);
}
- if (GUIWindowManager.ActiveWindow == (int) WorldmapWindowIDs.Search)
+ if (GUIWindowManager.ActiveWindow == (int)WorldmapWindowIDs.Search)
{
Search.OnAction(tmpAction);
}
- if (GUIWindowManager.ActiveWindow == (int) WorldmapWindowIDs.Menu)
+ if (GUIWindowManager.ActiveWindow == (int)WorldmapWindowIDs.Menu)
{
Menu.OnAction(tmpAction);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-02-03 06:21:18
|
Revision: 3422
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3422&view=rev
Author: chemelli_sf
Date: 2010-02-03 06:21:12 +0000 (Wed, 03 Feb 2010)
Log Message:
-----------
Named all threads
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
Modified: trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2010-02-03 02:10:40 UTC (rev 3421)
+++ trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2010-02-03 06:21:12 UTC (rev 3422)
@@ -183,7 +183,7 @@
var t = new Thread(new ParameterizedThreadStart(ImageThread));
t.Priority = ThreadPriority.BelowNormal;
- t.Name = "MapTileDownloader";
+ t.Name = "WorldMapTileDownloader";
t.IsBackground = true;
ImageDownloadThreads.Add(t);
Modified: trunk/plugins/WorldMap/WorldmapMenu.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapMenu.cs 2010-02-03 02:10:40 UTC (rev 3421)
+++ trunk/plugins/WorldMap/WorldmapMenu.cs 2010-02-03 06:21:12 UTC (rev 3422)
@@ -177,6 +177,7 @@
private void OptimizeCacheDatabase()
{
var workerThread = new Thread(new ThreadStart(OptimizeCacheDatabase_Worker));
+ workerThread.Name = "WorldMapOptimizeCacheDatabase";
workerThread.Priority = ThreadPriority.AboveNormal;
workerThread.Start();
Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs 2010-02-03 02:10:40 UTC (rev 3421)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs 2010-02-03 06:21:12 UTC (rev 3422)
@@ -194,6 +194,7 @@
private void StartSearch()
{
var workerThread = new Thread(new ThreadStart(SearchWorker));
+ workerThread.Name = "WorldMapStartSearch";
workerThread.Priority = ThreadPriority.AboveNormal;
workerThread.Start();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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;
...
[truncated message content] |
|
From: <che...@us...> - 2010-02-23 19:52:17
|
Revision: 3464
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3464&view=rev
Author: chemelli_sf
Date: 2010-02-23 19:52:00 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
Build batches
Added Paths:
-----------
trunk/plugins/WorldMap/Build/
trunk/plugins/WorldMap/Build/Build Deploy Debug.bat
trunk/plugins/WorldMap/Build/Build Deploy Release.bat
Added: trunk/plugins/WorldMap/Build/Build Deploy Debug.bat
===================================================================
--- trunk/plugins/WorldMap/Build/Build Deploy Debug.bat (rev 0)
+++ trunk/plugins/WorldMap/Build/Build Deploy Debug.bat 2010-02-23 19:52:00 UTC (rev 3464)
@@ -0,0 +1,3 @@
+@ECHO OFF
+
+call "Build Deploy Release.bat" Debug
\ No newline at end of file
Added: trunk/plugins/WorldMap/Build/Build Deploy Release.bat
===================================================================
--- trunk/plugins/WorldMap/Build/Build Deploy Release.bat (rev 0)
+++ trunk/plugins/WorldMap/Build/Build Deploy Release.bat 2010-02-23 19:52:00 UTC (rev 3464)
@@ -0,0 +1,43 @@
+@ECHO OFF
+
+
+REM detect if BUILD_TYPE should be release or debug
+if not %1!==Debug! goto RELEASE
+:DEBUG
+set BUILD_TYPE=Debug
+goto START
+:RELEASE
+set BUILD_TYPE=Release
+goto START
+
+
+:START
+REM Select program path based on current machine environment
+set progpath=%ProgramFiles%
+if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
+
+
+echo.
+echo -= MyWorldMap =-
+echo -= build mode: %BUILD_TYPE% =-
+echo.
+
+echo.
+echo Writing SVN revision assemblies...
+"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% >> build.log
+
+echo.
+echo Building MyWorldMap...
+"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 ..\MyWorldMap.sln >> build.log
+
+echo.
+echo Reverting assemblies...
+"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% /revert >> build.log
+
+echo.
+echo Reading the svn revision...
+echo $WCREV$>template.txt
+"%ProgramFiles%\TortoiseSVN\bin\SubWCRev.exe" ".." template.txt version.txt >> build.log
+SET /p version=<version.txt >> build.log
+DEL template.txt >> build.log
+DEL version.txt >> build.log
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2010-08-21 12:53:37
|
Revision: 3760
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3760&view=rev
Author: chemelli_sf
Date: 2010-08-21 12:53:28 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
MyWorldMap 2.0 beta
Plugin completly reworked to handle Bing and GoogleMaps APIs.
Modified Paths:
--------------
trunk/plugins/WorldMap/LocalizeStrings.cs
trunk/plugins/WorldMap/MAPS/MapFunctions.cs
trunk/plugins/WorldMap/MAPS/SearchGeoCodes.cs
trunk/plugins/WorldMap/MyWorldMap.csproj
trunk/plugins/WorldMap/PlugInBase.cs
trunk/plugins/WorldMap/Properties/AssemblyInfo.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
trunk/plugins/WorldMap/language/MyWorldmap/strings_en.xml
trunk/plugins/WorldMap/language/MyWorldmap/strings_it.xml
trunk/plugins/WorldMap/skinFiles/Blue3/MyWorldmapMenu.xml
trunk/plugins/WorldMap/skinFiles/Blue3Wide/MyWorldmapMenu.xml
Added Paths:
-----------
trunk/plugins/WorldMap/MAPS/BingAPI.cs
trunk/plugins/WorldMap/MAPS/GoogleAPI.cs
trunk/plugins/WorldMap/MAPS/MapImages.cs
trunk/plugins/WorldMap/Properties/Settings.Designer.cs
trunk/plugins/WorldMap/Properties/Settings.settings
trunk/plugins/WorldMap/Web References/
trunk/plugins/WorldMap/Web References/ImageryService/
trunk/plugins/WorldMap/Web References/ImageryService/ImageryMetadataResponse.datasource
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService.wsdl
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService.xsd
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService1.xsd
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService2.xsd
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService3.xsd
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService4.xsd
trunk/plugins/WorldMap/Web References/ImageryService/ImageryService5.xsd
trunk/plugins/WorldMap/Web References/ImageryService/MapUriResponse.datasource
trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs
trunk/plugins/WorldMap/Web References/ImageryService/Reference.map
trunk/plugins/WorldMap/Web References/ImageryService/imageryservice1.wsdl
trunk/plugins/WorldMap/app.config
trunk/plugins/WorldMap/language/MyWorldmap/strings_da.xml
trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WorldMap.bmp
trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/WorldMap.bmp
Removed Paths:
-------------
trunk/plugins/WorldMap/Installer/MyWorldmap.xml
trunk/plugins/WorldMap/MAPS/ImageFunctions.cs
trunk/plugins/WorldMap/MAPS/MapTile.cs
trunk/plugins/WorldMap/MAPS/MapTiles.cs
trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
trunk/plugins/WorldMap/MAPS/TileCacheDatabase.cs
trunk/plugins/WorldMap/Resources/
trunk/plugins/WorldMap/System.Data.SQLite.DLL
trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/WMIPBlocked.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/Blue3Wide/Media/MyWorldMap/WMIPBlocked.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
Property Changed:
----------------
trunk/plugins/WorldMap/MAPS/
Deleted: trunk/plugins/WorldMap/Installer/MyWorldmap.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/MyWorldmap.xml 2010-08-21 11:27:15 UTC (rev 3759)
+++ trunk/plugins/WorldMap/Installer/MyWorldmap.xml 2010-08-21 12:53:28 UTC (rev 3760)
@@ -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=57&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/LocalizeStrings.cs
===================================================================
--- trunk/plugins/WorldMap/LocalizeStrings.cs 2010-08-21 11:27:15 UTC (rev 3759)
+++ trunk/plugins/WorldMap/LocalizeStrings.cs 2010-08-21 12:53:28 UTC (rev 3760)
@@ -38,7 +38,7 @@
/// The text is loaded for the current language from
/// the file language/[language]/strings.xml
/// </summary>
- public class GUILocalizeStrings
+ public class PluginGuiLocalizeStrings
{
#region Variables
@@ -51,7 +51,7 @@
#region Constructors/Destructors
// singleton. Dont allow any instance of this class
- private GUILocalizeStrings()
+ private PluginGuiLocalizeStrings()
{
}
@@ -68,7 +68,7 @@
/// <summary>
/// Public method to load the text from a strings/xml file into memory
/// </summary>
- /// <param name="strFileName">Contains the filename+path for the string.xml file</param>
+ /// <param name="language">Contains the language name</param>
/// <returns>
/// true when text is loaded
/// false when it was unable to load the text
@@ -76,7 +76,7 @@
//[Obsolete("This method has changed", true)]
public static bool Load(string language)
{
- bool isPrefixEnabled = true;
+ bool isPrefixEnabled;
using (var reader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
@@ -103,7 +103,7 @@
if (_stringProvider == null)
Load(null);
- return _stringProvider.CurrentLanguage.EnglishName;
+ return _stringProvider != null ? _stringProvider.CurrentLanguage.EnglishName : null;
}
public static void ChangeLanguage(string language)
Property changes on: trunk/plugins/WorldMap/MAPS
___________________________________________________________________
Added: svn:ignore
+ BindAPIKey.cs
Added: trunk/plugins/WorldMap/MAPS/BingAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPI.cs (rev 0)
+++ trunk/plugins/WorldMap/MAPS/BingAPI.cs 2010-08-21 12:53:28 UTC (rev 3760)
@@ -0,0 +1,120 @@
+using MyWorldMap.ImageryService;
+
+namespace MyWorldMap.MAPS
+{
+ internal class BingApi : IMapProvider
+ {
+ #region Interface required
+
+ public string Version
+ {
+ get { return "v1.0 Web Services"; }
+ }
+
+ public string Documentation
+ {
+ get { return "http://msdn.microsoft.com/en-us/library/dd877180.aspx"; }
+ }
+
+ public string Description
+ {
+ get { return "Bing"; }
+ }
+
+ public int MaxMapWidth
+ {
+ get { return 900; }
+ }
+
+ public int MinZoom
+ {
+ get { return 1; }
+ }
+
+ public int MaxZoom
+ {
+ get { return 21; }
+ }
+
+ public string UrlGet(MapProperty newMap)
+ {
+ var pushpin = new Pushpin();
+ var pins = new Pushpin[1];
+
+ var mapUriRequest = new MapUriRequest
+ {
+ Credentials = new Credentials
+ {
+ // Set credentials using a valid Bing Maps Key
+ ApplicationId = BindAPIKey.Load()
+ },
+ Center = new Location
+ {
+ Latitude = newMap.Latitude,
+ LatitudeSpecified = true,
+ Longitude = newMap.Longitude,
+ LongitudeSpecified = true
+ }
+ };
+
+ if (newMap.Latitude != 0 && newMap.Longitude != 0)
+ {
+ // Not WorldView: show the pushpin
+ pushpin.Location = new Location
+ {
+ Latitude = newMap.Latitude,
+ LatitudeSpecified = true,
+ Longitude = newMap.Longitude,
+ LongitudeSpecified = true
+ };
+ pushpin.IconStyle = "34";
+
+ pins[0] = pushpin;
+ mapUriRequest.Pushpins = pins;
+ }
+
+ // Set the map style and zoom level
+ var mapUriOptions = new MapUriOptions();
+
+ switch (newMap.MapType)
+ {
+ case MapFunctions.MapType.Hybrid:
+ mapUriOptions.Style = MapStyle.AerialWithLabels;
+ break;
+ case MapFunctions.MapType.Road:
+ mapUriOptions.Style = MapStyle.Road;
+ break;
+ case MapFunctions.MapType.Satellite:
+ mapUriOptions.Style = MapStyle.Aerial;
+ break;
+ default:
+ mapUriOptions.Style = MapStyle.Road;
+ break;
+ }
+ mapUriOptions.StyleSpecified = true;
+
+ mapUriOptions.ZoomLevel = newMap.Zoom;
+ mapUriOptions.ZoomLevelSpecified = true;
+
+ // Keep aspect ratio
+ int width = newMap.Width > MaxMapWidth ? MaxMapWidth : newMap.Width;
+ int height = width * newMap.Height / newMap.Width;
+
+ mapUriOptions.ImageSize = new SizeOfint
+ {
+ Width = width,
+ WidthSpecified = true,
+ Height = height,
+ HeightSpecified = true
+ };
+
+ mapUriRequest.Options = mapUriOptions;
+ var imageryService = new ImageryService.ImageryService();
+ MapUriResponse mapUriResponse = imageryService.GetMapUri(mapUriRequest);
+
+ return mapUriResponse.Uri;
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: trunk/plugins/WorldMap/MAPS/GoogleAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/GoogleAPI.cs (rev 0)
+++ trunk/plugins/WorldMap/MAPS/GoogleAPI.cs 2010-08-21 12:53:28 UTC (rev 3760)
@@ -0,0 +1,101 @@
+using System;
+using System.Globalization;
+using MyWorldmap;
+
+namespace MyWorldMap.MAPS
+{
+ internal class GoogleApi : IMapProvider
+ {
+ #region Interface required
+
+ public string Version
+ {
+ get { return "v2 (static)"; }
+ }
+
+ public string Documentation
+ {
+ get { return "http://code.google.com/apis/maps/documentation/staticmaps"; }
+ }
+
+ public string Description
+ {
+ get { return "Google"; }
+ }
+
+ public int MaxMapWidth
+ {
+ get { return 640; }
+ }
+
+ public int MinZoom
+ {
+ get { return 1; }
+ }
+
+ public int MaxZoom
+ {
+ get { return 21; }
+ }
+
+ public string UrlGet(MapProperty newMap)
+ {
+ NumberFormatInfo ni = Settings.NumberFormat();
+ string strType;
+ string urlFinalFormat;
+
+ switch (newMap.MapType)
+ {
+ case MapFunctions.MapType.Hybrid:
+ strType = "hybrid";
+ break;
+ case MapFunctions.MapType.Road:
+ strType = "roadmap";
+ break;
+ case MapFunctions.MapType.Satellite:
+ strType = "satellite";
+ break;
+ case MapFunctions.MapType.Terrain:
+ strType = "terrain";
+ break;
+ default:
+ strType = "unknown";
+ break;
+ }
+
+ // Keep aspect ratio
+ int width = newMap.Width > MaxMapWidth ? MaxMapWidth : newMap.Width;
+ int height = width*newMap.Height/newMap.Width;
+
+ if (newMap.Latitude == 0 && newMap.Longitude == 0)
+ {
+ //World view
+ urlFinalFormat = UrlFormat;
+ }
+ else
+ {
+ //Specific view
+ urlFinalFormat = UrlFormatWithMarker;
+ }
+
+ return string.Format(urlFinalFormat, strType, Convert.ToString(newMap.Latitude, ni),
+ Convert.ToString(newMap.Longitude, ni), newMap.Zoom, width + "x" + height);
+ }
+
+ #endregion
+
+ private static string UrlFormatWithMarker
+ {
+ get
+ {
+ return
+ "http://maps.google.com/maps/api/staticmap?maptype={0}¢er={1},{2}&zoom={3}&size={4}&markers=color:red|label:A|{1},{2}&sensor=false";
+ }
+ }
+
+ private static string UrlFormat
+ {
+ get { return "http://maps.google.com/maps/api/staticmap?maptype={0}¢er={1},{2}&zoom={3}&size={4}&sensor=false"; }
+ }
+ }
+}
\ No newline at end of file
Deleted: trunk/plugins/WorldMap/MAPS/ImageFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ImageFunctions.cs 2010-08-21 11:27:15 UTC (rev 3759)
+++ trunk/plugins/WorldMap/MAPS/ImageFunctions.cs 2010-08-21 12:53:28 UTC (rev 3760)
@@ -1,72 +0,0 @@
-using System.Drawing;
-
-namespace MAPS
-{
- internal class ImageFunctions
- {
- public static Bitmap MergeBitmaps(Bitmap Background, Bitmap Overlay)
- {
- Graphics graphics = Graphics.FromImage(Background);
- graphics.DrawImage(Overlay, 0, 0, Background.Width, Background.Height);
-
- return new Bitmap(Background);
- }
-
- public static Bitmap GetUpperLeftPart(Bitmap Tile)
- {
- var tmpBitmap = new Bitmap(256, 256);
- Graphics graphic = Graphics.FromImage(tmpBitmap);
-
- var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
- ;
- var tmpSourceRect = new Rectangle(0, 0, 128, 128);
-
- graphic.DrawImage(tmpBitmap, tmpDestRect, 0, 0, 128, 128, GraphicsUnit.Pixel);
- //(Tile, 0, 0, tmpSourceRect, GraphicsUnit.Pixel)
-
- return tmpBitmap;
- }
-
- public static Bitmap GetUpperRightPart(Bitmap Tile)
- {
- var tmpBitmap = new Bitmap(256, 256);
- Graphics graphic = Graphics.FromImage(tmpBitmap);
-
- var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
- ;
- var tmpSourceRect = new Rectangle(129, 0, 256, 128);
-
- graphic.DrawImage(tmpBitmap, tmpDestRect, 129, 0, 256, 128, GraphicsUnit.Pixel);
-
- return tmpBitmap;
- }
-
- public static Bitmap GetLowerLeftPart(Bitmap Tile)
- {
- var tmpBitmap = new Bitmap(256, 256);
- Graphics graphic = Graphics.FromImage(tmpBitmap);
-
- var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
- ;
- var tmpSourceRect = new Rectangle(0, 129, 128, 256);
-
- graphic.DrawImage(tmpBitmap, tmpDestRect, 0, 129, 128, 256, GraphicsUnit.Pixel);
-
- return tmpBitmap;
- }
-
- public static Bitmap GetLowerRightPart(Bitmap Tile)
- {
- var tmpBitmap = new Bitmap(256, 256);
- Graphics graphic = Graphics.FromImage(tmpBitmap);
-
- var tmpDestRect = new Rectangle(0, 0, Tile.Width, Tile.Height);
- ;
- var tmpSourceRect = new Rectangle(129, 129, 256, 256);
-
- graphic.DrawImage(tmpBitmap, tmpDestRect, 129, 129, 256, 256, GraphicsUnit.Pixel);
-
- return tmpBitmap;
- }
- }
-}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/MapFunctions.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-08-21 11:27:15 UTC (rev 3759)
+++ trunk/plugins/WorldMap/MAPS/MapFunctions.cs 2010-08-21 12:53:28 UTC (rev 3760)
@@ -1,6 +1,6 @@
using System;
-namespace MAPS
+namespace MyWorldMap.MAPS
{
public class MapFunctions
{
@@ -8,13 +8,10 @@
public enum MapType
{
- GMRoad,
- GMTerrain,
- GMAerial,
- GMHybrid,
- VERoad,
- VEAerial,
- VEHybrid
+ Road,
+ Terrain,
+ Satellite,
+ Hybrid
}
#endregion
@@ -22,479 +19,19 @@
public static MapType GetNextMapType(MapType currentMapType)
{
Array tmpMapTypes = Enum.GetValues(typeof (MapType));
- int IntMapType = Convert.ToInt32(currentMapType);
- IntMapType++;
- if (IntMapType > tmpMapTypes.Length - 1) IntMapType = 0;
- return (MapType) (Enum.ToObject(typeof (MapType), IntMapType));
+ int intMapType = Convert.ToInt32(currentMapType);
+ intMapType++;
+ if (intMapType > tmpMapTypes.Length - 1) intMapType = 0;
+ return (MapType) (Enum.ToObject(typeof (MapType), intMapType));
}
- public static MapType GetNextRoadMap(MapType currentMapType)
+ public static IMapProvider GetNextProvider(IMapProvider currentProvider)
{
- if (currentMapType == MapType.GMAerial || currentMapType == MapType.GMHybrid) return MapType.GMRoad;
- if (currentMapType == MapType.VEAerial || currentMapType == MapType.VEHybrid) return MapType.VERoad;
- if (currentMapType == MapType.GMRoad) return MapType.VERoad;
-
- return MapType.GMRoad;
- }
-
- public static MapType GetNextSateliteMap(MapType currentMapType)
- {
- if (currentMapType == MapType.GMRoad || currentMapType == MapType.GMHybrid) return MapType.GMAerial;
- if (currentMapType == MapType.VERoad || currentMapType == MapType.VEHybrid) return MapType.VEAerial;
- if (currentMapType == MapType.GMAerial) return MapType.VEAerial;
-
- return MapType.GMAerial;
- }
-
- public static MapType GetNextHybridMap(MapType currentMapType)
- {
- if (currentMapType == MapType.GMAerial || currentMapType == MapType.GMRoad) return MapType.GMHybrid;
- if (currentMapType == MapType.VEAerial || currentMapType == MapType.VERoad) return MapType.VEHybrid;
- if (currentMapType == MapType.GMHybrid) return MapType.VEHybrid;
-
- return MapType.GMHybrid;
- }
-
- /// <summary>
- /// Get the vertical tile number from a latitude using mercator ptrojection formula
- /// </summary>
- public static int ConvertLatitudeToTileY(double latitude, int zoomLevel)
- {
- double maxlat = Math.PI;
-
- double lat = latitude;
-
- if (lat > 90) lat = lat - 180;
- if (lat < -90) lat = lat + 180;
-
- // conversion degre=>radians
- double phi = Math.PI*lat/180;
-
- double res;
- //double temp = Math.Tan(Math.PI / 4 - phi / 2);
- //res = Math.Log(temp);
- res = 0.5*Math.Log((1 + Math.Sin(phi))/(1 - Math.Sin(phi)));
- double maxTileY = Math.Pow(2, zoomLevel);
- var result = (int) (((1 - res/maxlat)/2)*(maxTileY));
-
- return (result);
- }
-
- /// <summary>
- /// Get the horizontal tile number from a longitude using mercator ptrojection formula
- /// </summary>
- public static int ConvertLongitudeToTileX(double longitude, int zoomLevel)
- {
- if (longitude > 180)
+ if (currentProvider == new GoogleApi())
{
- longitude = longitude - 360;
+ return new BingApi();
}
- if (longitude < -180)
- {
- longitude = longitude + 360;
- }
-
- double res = (longitude + 180)/360;
- return (int) (res*Math.Pow(2, zoomLevel));
+ return new GoogleApi();
}
-
- /// <summary>
- /// get latitude/longitude mini of a tile
- /// </summary>
- //private PointF getMinBounds(int numlat, int numlong, int zoom)
- //{
- // PointF res = new PointF();
- // double maxlat = Math.PI;
- // double maxTile = Math.Pow(2, zoom);
- // double numlatrel = maxlat * (1 - 2 * ((numlat + 1) / maxTile));
- // res.Y = (float)((2 * Math.Atan(Math.Exp(numlatrel)) - Math.PI / 2) * 180 / Math.PI);
- // res.X = (float)(360 * (numlong / maxTile) - 180);
- // return res;
- //}
- /** get latitude/longitude maxi of a tile*/
- //private PointF getMaxBounds(int numlat, int numlong, int zoom)
- //{
- // PointF res = new PointF();
- // double maxlat = Math.PI;
- // double maxTile = Math.Pow(2, zoom);
- // double numlatrel = maxlat * (1 - 2 * (numlat / maxTile));
- // res.Y = (float)((2 * Math.Atan(Math.Exp(numlatrel)) - Math.PI / 2) * 180 / Math.PI);
- // res.X = (float)(360 * (numlong + 1) / maxTile - 180);
- // return res;
- //}
- public static double ConvertTileXToLongitude(int TileX, int ZoomLevel)
- {
- double maxTile = Math.Pow(2, ZoomLevel);
- return (float) (360*(TileX)/maxTile - 180);
- }
-
- public static double ConvertTileYToLatitude(int TileY, int ZoomLevel)
- {
- double maxlat = Math.PI;
- double maxTile = Math.Pow(2, ZoomLevel);
- double numlatrel = maxlat*(1 - 2*(TileY/maxTile));
-
- return (float) ((2*Math.Atan(Math.Exp(numlatrel)) - Math.PI/2)*180/Math.PI);
- }
-
- public static double ConvertZoomLevelToTileSizeDegree(int zoomLevel)
- {
- double LevelTileSizeDegrees = 360;
-
- for (int i = 1; i <= zoomLevel; i++)
- {
- LevelTileSizeDegrees /= 2;
- }
- return LevelTileSizeDegrees;
- }
-
- public static int ConvertTileSizeDegreeToZoomLevel(double TileSizeDegree)
- {
- int zoomLevel = 0;
- while (TileSizeDegree < 360)
- {
- TileSizeDegree *= 2;
- zoomLevel++;
- }
- return zoomLevel;
- }
-
- public static string GetGMapSatUrl(double Longitude, double Latitude, int zoomLevel, ref MapConfig curConfig)
- {
- return GetGMapSatUrl(ConvertLongitudeToTileX(Longitude, zoomLevel), ConvertLatitudeToTileY(Latitude, zoomLevel),
- zoomLevel, ref curConfig);
- }
-
- public static string GetGMapSatUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
- if (tileCode == "") return "";
-
- int servNum = -1;
-
- try
- {
- switch (tileCode[tileCode.Length - 1])
- {
- case 'q':
- servNum = 0;
- break;
- case 'r':
- servNum = 1;
- break;
- case 's':
- servNum = 2;
- break;
- case 't':
- servNum = 3;
- break;
- }
- }
- catch (Exception)
- {
- }
-
- string StringServNum;
- if (servNum == -1) StringServNum = "";
- else StringServNum = servNum.ToString();
-
- string fullurl = string.Format(curConfig.GMAUrl, StringServNum, tileCode);
- if (tileCode == "transparent")
- {
- //fullurl = "http://www.google.com/intl/en_ALL/mapfiles/transparent.png";
- fullurl = "***";
- }
- return fullurl;
- }
-
- public static string GetGMapSatUrlTileCode(int TileX, int TileY, int zoomLevel)
- {
- string tileid = "t";
- double halflat = TileY; /**/
- double locxmin, locxmax, locymin, locymax, locxmoy, locymoy;
-
- locxmin = 0;
- locxmax = Math.Pow(2, zoomLevel);
- locymin = 0;
- locymax = Math.Pow(2, zoomLevel);
-
- for (int i = 0; i < zoomLevel; i++)
- {
- locxmoy = (locxmax + locxmin)/2;
- locymoy = (locymax + locymin)/2;
- if ((halflat < locymin) ||
- (halflat > locymax) ||
- (TileX < locxmin) ||
- (TileX > locxmax))
- {
- return ("transparent");
- }
- if (halflat < locymoy)
- {
- locymax = locymoy;
- if (TileX < locxmoy)
- {
- /*q quadrant (top left)*/
- tileid += "q";
- locxmax = locxmoy;
- }
- else
- {
-/*r quadrant (top right)*/
- tileid += "r";
- locxmin = locxmoy;
- }
- }
- else
- {
- locymin = locymoy;
- if (TileX < locxmoy)
- {
- /*t quadrant (bottom right)*/
- tileid += "t";
- locxmax = locxmoy;
- }
- else
- {
-/*s quadrant (bottom left)*/
- tileid += "s";
- locxmin = locxmoy;
- }
- }
- }
- return tileid;
- }
-
- public static string GetGTerrainUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
- if (tileCode == "") return "";
-
- int servNum = -1;
-
- try
- {
- switch (tileCode[tileCode.Length - 1])
- {
- case 'q':
- servNum = 0;
- break;
- case 'r':
- servNum = 1;
- break;
- case 's':
- servNum = 2;
- break;
- case 't':
- servNum = 3;
- break;
- }
- }
- catch (Exception)
- {
- }
-
- string StringServNum;
- if (servNum == -1) StringServNum = "";
- else StringServNum = servNum.ToString();
-
- string TileCode = GetGMapTileCode(TileX, TileY, zoomLevel);
- string[] urltab = TileCode.Split('_');
- string fullurl = string.Format(curConfig.GMTUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
- return fullurl;
- }
-
- public static string GetGMapUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
- if (tileCode == "") return "";
-
- int servNum = -1;
-
- try
- {
- switch (tileCode[tileCode.Length - 1])
- {
- case 'q':
- servNum = 0;
- break;
- case 'r':
- servNum = 1;
- break;
- case 's':
- servNum = 2;
- break;
- case 't':
- servNum = 3;
- break;
- }
- }
- catch (Exception)
- {
- }
-
- string StringServNum;
- if (servNum == -1) StringServNum = "";
- else StringServNum = servNum.ToString();
-
- string TileCode = GetGMapTileCode(TileX, TileY, zoomLevel);
- string[] urltab = TileCode.Split('_');
- string fullurl = string.Format(curConfig.GMRUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
- return fullurl;
- }
-
- public static string GetGHybridOverlayUrl(int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string tileCode = GetGMapSatUrlTileCode(TileX, TileY, zoomLevel);
- if (tileCode == "") return "";
-
- int servNum = -1;
-
- try
- {
- switch (tileCode[tileCode.Length - 1])
- {
- case 'q':
- servNum = 0;
- break;
- case 'r':
- servNum = 1;
- break;
- case 's':
- servNum = 2;
- break;
- case 't':
- servNum = 3;
- break;
- }
- }
- catch (Exception)
- {
- }
-
- string StringServNum;
- if (servNum == -1) StringServNum = "";
- else StringServNum = servNum.ToString();
-
- string TileCode = GetGMapTileCode(TileX, TileY, zoomLevel);
- string[] urltab = TileCode.Split('_');
- string fullurl = string.Format(curConfig.GMHUrl, StringServNum, urltab[0], urltab[1], urltab[2]);
- // a small "t" make the big differens
- return fullurl;
- }
-
- public static string GetGMapTileCode(int TileX, int TileY, int zoomLevel)
- {
- int localzoom = (17 - zoomLevel);
- string tileid = "";
- double numLong = TileX;
- double numLat = TileY;
- tileid = numLong + "_" + ((int) numLat) + "_" + localzoom;
- return tileid;
- }
-
- public static string GetGMTileUrl(MapType mapType, int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string url = null;
- switch (mapType)
- {
- case MapType.GMTerrain:
- url = GetGTerrainUrl(TileX, TileY, zoomLevel, ref curConfig);
- break;
- case MapType.GMRoad:
- url = GetGMapUrl(TileX, TileY, zoomLevel, ref curConfig);
- break;
- case MapType.GMAerial:
- url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
- break;
- case MapType.GMHybrid:
- url = GetGMapSatUrl(TileX, TileY, zoomLevel, ref curConfig);
- break;
- }
- return url;
- }
-
- public static string GetVETileUrl(MapType mapType, int TileX, int TileY, int zoomLevel, ref MapConfig curConfig)
- {
- string url = null;
- string mapTypePreFix = null;
- string mapExtension = null;
- switch (mapType)
- {
- case MapType.VERoad:
- {
- mapTypePreFix = "r";
- mapExtension = ".png";
- }
- break;
- case MapType.VEAerial:
- {
- mapTypePreFix = "a";
- mapExtension = ".jpeg";
- }
- break;
- case MapType.VEHybrid:
- {
- mapTypePreFix = "h";
- mapExtension = ".jpeg";
- }
- break;
- }
-
- string quadKey = VETileToQuadKey(TileX, TileY, zoomLevel);
- try
- {
- url = string.Format(curConfig.VEUrl, mapTypePreFix, quadKey[quadKey.Length - 1], quadKey, mapExtension);
- }
- catch (Exception)
- {
- }
- return url;
- }
-
- public static string VETileToQuadKey(int TileX, int TileY, int zoomLevel)
- {
- string quad = "";
-
- for (int i = zoomLevel; i > 0; i--)
- {
- int mask = 1 << (i - 1);
- int cell = 0;
-
- if ((TileX & mask) != 0)
- {
- cell++;
- }
-
- if ((TileY & mask) != 0)
- {
- cell += 2;
- }
- quad += cell;
- }
- return quad;
- }
-
- public static string GetTileUrl(MapType mapType, int TileX...
[truncated message content] |
|
From: <che...@us...> - 2010-08-21 13:06:09
|
Revision: 3761
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3761&view=rev
Author: chemelli_sf
Date: 2010-08-21 13:06:02 +0000 (Sat, 21 Aug 2010)
Log Message:
-----------
- Fixed build script
- Removed old installer project
Modified Paths:
--------------
trunk/plugins/WorldMap/Build/Build Deploy Release.bat
Removed Paths:
-------------
trunk/plugins/WorldMap/Installer/Worldmap.xml
trunk/plugins/WorldMap/Installer/Worldmap.xmp
Modified: trunk/plugins/WorldMap/Build/Build Deploy Release.bat
===================================================================
--- trunk/plugins/WorldMap/Build/Build Deploy Release.bat 2010-08-21 12:53:28 UTC (rev 3760)
+++ trunk/plugins/WorldMap/Build/Build Deploy Release.bat 2010-08-21 13:06:02 UTC (rev 3761)
@@ -17,6 +17,11 @@
if not "%ProgramFiles(x86)%".=="". set progpath=%ProgramFiles(x86)%
+REM set logfile where the infos are written to, and clear that file
+set LOG=build_%BUILD_TYPE%.log
+echo. > %LOG%
+
+
echo.
echo -= MyWorldMap =-
echo -= build mode: %BUILD_TYPE% =-
@@ -24,20 +29,26 @@
echo.
echo Writing SVN revision assemblies...
-"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% > build.log
+"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% > %LOG%
echo.
echo Building MyWorldMap...
-"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 ..\MyWorldMap.sln >> build.log
+"%WINDIR%\Microsoft.NET\Framework\v3.5\MSBUILD.exe" /target:Rebuild /property:Configuration=%BUILD_TYPE%;Platform=x86 ..\MyWorldMap.sln >> %LOG%
echo.
+echo Building installer...
+cd ..\installer
+"..\..\..\..\..\mediaportal\trunk\mediaportal\MPE\MpeMaker\bin\Release\MpeMaker.exe" MyWorldmap.xmp2 /B
+cd ..\Build
+
+echo.
echo Reverting assemblies...
-"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% /revert >> build.log
+"..\..\..\..\..\mediaportal\trunk\Tools\Script & Batch tools\DeployVersionSVN\DeployVersionSVN\bin\Release\DeployVersionSVN.exe" /svn=%CD% /revert >> %LOG%
echo.
echo Reading the svn revision...
echo $WCREV$>template.txt
-"%ProgramFiles%\TortoiseSVN\bin\SubWCRev.exe" ".." template.txt version.txt >> build.log
-SET /p version=<version.txt >> build.log
-DEL template.txt >> build.log
-DEL version.txt >> build.log
+"%ProgramFiles%\TortoiseSVN\bin\SubWCRev.exe" ".." template.txt version.txt >> %LOG%
+SET /p version=<version.txt >> %LOG%
+DEL template.txt >> %LOG%
+DEL version.txt >> %LOG%
Deleted: trunk/plugins/WorldMap/Installer/Worldmap.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xml 2010-08-21 12:53:28 UTC (rev 3760)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xml 2010-08-21 13:06:02 UTC (rev 3761)
@@ -1,27 +0,0 @@
-<MPinstalerS>
- <ver>1.00.000</ver>
- <ExtensionList>
- <Extension>
- <FileName>Worldmap.mpi</FileName>
- <Name>Worldmap</Name>
- <URL>http://www.team-mediaportal.com</URL>
- <Version>1.0 RC2</Version>
- <Author>LKuech</Author>
- <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>
- <Logo>iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAF1tJREFUaEOtWQdUVGfajslmN8lmsyVlV1NMXP+s2axpa42xRmxZWyRqjAZ7QUDF0BRp0gaQ3svQ2wBSZ+i9w9Db0AamwMzQm9KU538/ons8Sf5fN5t7eM7l3pm5932+t7/fgqd+xrHRFL/avbpn+a+feXoT5p5aNTuHJffvz702dx/Pzz2FBQuA2acXYPjppxbInsaC+pmZ2YLpyfES8xMfj/yM1/1yP7G+3fyya6ZCxyWjX2ie2HPvaqQcZ7ndOOolxiHXdqg7tUHdUYSvHFvwtVMzTrg2Q8unBUYhbbgZ3d7D4XV6Goc0fPjLSfSET9J2EfzGJU2l7ZCmkhvGKXGCK4e6pwR7Xbux26kL/3LsxC6HDuzktGK7TQvULJugZtGAbeZ12Glegz0W1ThiVwttryaYhIhmzMNbQw3D65c84ev/u6/ZCZQfOKSNlF2PH8TxwB4c8JLhS88H8JBhv7sU+1wl2ONMRG6JiUQ71KxasNm8EZtM6rDJuBpbrgmhdq0CO29U4KB1FXQ8G2ASLhqyCO84+99J95hf26b0HbRPGx3hZFbiXHg9Ca6Eug/Buw+HfZX4xl+Bb/wUOOLbg8PecnzlIcV+ly7sJm3ssBFhs1kj1l+vxWeGVVivV4HN+mXYaliKXddLoWFXDaNAEczCGwI0TE2f+8WJ2KUOXXRIH4J3iR+CazVwOTodB336iYgMBgkSaEYO40zYKM6GDeFcGN0PVeF0kAIa/kSGzOtL5058wRHhc7MGrL9Wg7V6lVinW4oNusXY8l0R1PSKcMiyAlf9WuCYzBVou2i/9F+RAEDBA79hD3HOGD3hnCWHbxkHAVX74VuugVN+ZbgU2Qab9Cxki42R3ByK6OoS+BZLYJ85BJPkMVyNGYV2+ADOB/dCw1eGg25i7CYSW4nEZ4bVWKNbhk8vFWPd5UJsJGzRLcB+01rYxEbCPcM4aYe29vz7f9ZBwj/LftjRJ9uZ0JAyGVJtAK/yffAo+QrB1YdgGh+PcwE94BbzwG+5icx2S+R1cFDc7YGS7kgUitOQ2VoO/+Iu6PEGoB3Wi5P+Uhx27SQSLfjctA6fkhbWXCrBWp1CfKqTj/Xa+USkCDq+tggqOgunFFv3nyX8wx+1Dw6+md/Fa49quALXkn1wLdoPn9JvESw8A16NOVwzRDCOkMI4qA2RRWkolwahWBxGCEJJlx+qetzAqyqHZcoYjOP7cCm8lzQnwUGnduyyasKm62RKpIU1OkVYS8KvPFuCndeccS3mH7BL2Q+/HF1UdlV+/bNJVPcW+cQ3W8Ct5BAcC3bDrehLBJSdQmS1LuIbDFHUbY+4ynq4k4CJZe1o68+GSJmPZkUOGhUCVEpTEFTcD4+8MdinDeHGbRW0guU47tmDvbZibDZuwDpy5jU6xVh1MQ/vHizA1itOuBb7NxhFrYKT4CjCCqwkzX19C/9jEp39vStT2z1nuMLzsM/fCSci4FF8CCFVJxEhNEBSgy0KxG6o6clBTtMUWnqU6JsQQTXeAcWYCNLhOhS39iK++i4iKsfhnT8C8/h+GEcrSCt8+BUkQ9O3HpsMmrD8VBmWHS7EDt1QGEZtwtWot6Eb9h5uxm2De9pZZDXwbf5jAhXS3OC4JjM406rb5W2Dc8EeBFQcBifZEte4OchqcyUziYawqw0tvZMYujOIOzMDuDM9jImpfvSPDaNBNouizikkN9yBf8EI3FOHkN4sQHzzeYTVHkRo9Wk4ZTjiolcELvtZwELwCb6LeR2Xw97GlZCl0A/7BLeSjiAwx6yvXS5/84lJtKtUSzPa/IdCqi/BNncr7HLV4Fq4D0HCo9Byz0FAdiJKpS7Ib6lDWdss5EMzmJi+i9n705iZvU8k7hGJaSjHZlDfO4uMpjtIrByFUFqAzI6biK69goDyb+FSuAMO+StJwx/CLO0d6N9eDF1a/cthb+FSEJ0D38XNmJ1E/AKKRAVXnphAo6JeO1lkB++yY7DK3kgEtpID70NghQbCyzwgaHamKOOHFlUpOlQzGJi4j8mZOdyfA+YI9+4Dd+l68M59tPffIxOYQqGoGZU9/kil5/Lq9EibJ2hR9sA2ez1u8JdTLlmK72KXQDdyMS6FvgntIELAEhiFrYVzsgZiij0LWWh/IhJl0rTEuEYzsvs9sMz+jAhsmSfALT+J2LrviACHCASitT8DvaODZD7AzL25eeHpbx4z94Dhu3OQknaapGNIKOlEmSQE6a0OiKkzALfiJBHYC9usDUTgQxjEE4GYd+YJ6IS8AS3u69Dyfwu63OWwjz8Ev4zrd5tksv95LIHmvu6FWR1hsih6CYdMxzJzLTg5m+dfFkAEeLV6yGyzQanEH/XkwPLhbvSNfb/iZD3/JjFNhPrH56AcHYZ8pAl13SL6TRDSRPakAf35xWDPtJkn8AH0icBVInAl4q15Ahe5i3DR9w1o+70LK94eePC1USOp/+qxBNIas1ZldnhMhdfoEoENsMn7J503zqs7SKiBhObLiK7woxURIqqwjx46RBHnHoYnvzcjMn/CHMan5tAzdA/SQTk6B4vQqEwhrQVA0GJLPnCVFkMDLhTZrDM/g3HKcujFLcGV6DehE7YQFwP/DE3/P+OCz+u46L0E5hE74Jp0FnmNGaaPJWAZ27I7KJ+P8Bod3Ez/nNRKjlbwGTzLd4FbeQJGobEUMaSwTx5BZPk4clun0KScnSfRT74wRGYzeGeOTOsemmSTyK4ah7CzEjWKCOR2eCK56SaiarXhW3oUTnk7YZG2At/dfgtXYt6AUdz7MI79GPrhy3DB9zUcd/ktTrm+ihuhW+CSeAqCqpjAxxJw5stP3IyUILjSCLtu2OGPavk45qYPX+F2fM1JgLpNDwxj+uGcM4rQyjskEDmoeBq18hmI+mbRMTBLCW0WdbJp1EvuQNI/QM6ei5zWcDI9J8Q3GiOwVAf+FepkPutgk7ERcRVmqO/MRreshdABsUyE5q5SZNX44tZtdVwP2Qj72CPgC8MTH0sgKLfntBVPCfuUEJzytMUi9QZ8op2JM74cbDTsxAmqLvVuD8A6fRSehRMIE95FYuMk1T1EpHMapV3TKBFPIbPhLso72tA6GE/1USSsw+rglR6KqGpjHDBMhEn8EUpoV9AlaUR31wByixuRyM9BcrIAqYJ0ZGfmQ1hej64uGVqlVYgt4iBFGBz/WAJ+GdITjkly6Po3wj77W+yzDcJem0johDpivbEUR33k0Irsg1HCIFWiw3DPH0NQ2Th41RNIqLuDFBI8uW4CEZS4ovObUS4LQGFrDtKrO2BD1esJhwKsPV0Mu6AM9CnEKGoaBk84TAlxHMrhSYxOTGJk/A6U/YMQiUTIzc1GdlY+OjvFkPd3lQuBF/5fEi7xkt3uAhn0uFR0cVJwI+kwPjcOocrTHhpeJdjrJMHxgF5oR6hgdLsfVoIhOGaNwCt/FAFFRKZkDNzCYTjFDyC1uhw5YnsIRBbgt+ohrdkHl92EcAmrhELahcxaJfjNM1R+sJCL+bOKIlf/xBxGJuneFDBKwaGruxv8lBQUFZVifHy8oL+/f9H/ScKNL1nhyZfcNY3owGGbdmwyisZJLyu8e6IKBxySsN22FeruRMJfjothCiqVVTBJICIpA7BLG4QDwZxM0CO5E7liZ8Q1GCCiSgcBpcfhnrMbeZW30SuRoKROjFTyH+b4beQ7nZTwmhWzaKGA0KoiP6J7EopiXeRTsuH7UPUPIzM9DQkJSRgZHa1SKBSv/SQJ03DRK94CadfNqE5cou5onW4DvrjpC00/O2w2KMKaq83YepOmDa5dOOYjxRlq6FmtfzVSAQMeEQqnaw8J4oRh4DWcR1DFWXgXfgN7/i6kFASgV6ZEe1sr4iv70dp3HzWyGVRJp9HQMzOPSsk0hJIZKjvofvcUchvH5sm0U8aX9PaRJpIQzYvB2NhYxsOe5UdEvFMlMXZxYuhzRThm34D3TxXDIG4rXIpW40asMRGpwmaTFuxz7MAh6rKOeXXhpK8EZ/y6cdiunfraHPAaT8Gn5DDccr+EZcJGhKaaY0A1ij6lAkXCZvCpwGvsnUF++xSyRFMQdk/TSs+S8NPzobmgY4pMcBxBOQMo75qk6HYPVZJJNIk6wQ3wQ3xCIiYnJzk/qQXXZPEZ9+RuXA9upeKtGTv0C3E5YgNMUhfDJmcxrsdqY4V2DU0ZGrGLxiZ77VpxwJG0cqsVW/WbcD3KHL4VanDI2gaL+E9hFqxGTtiBqakZKHukSCpupbA6RSTukuNTFCMk1N5FXtskKmjVk+vpumYCgZmD4MTJ5v8XUKSrks5SQBhFbl4+TExuoKKy6h75xKYfkbANrXvDV9A9YBnZDh2PVmi6CGCb9ilVi+9Q0fVXKvCW4JiTI947XYsN1KBvMWUznwZsN6vH6os1OMyxpCboY1gkrsRl36UITjDHHGXomZkZ9JDzRuV1UFk9iTiKXEGl4wgpo3BMiBZOILx8AlHCO/BmwpN/XfEVUVM0gvCKO8hrvUvd3iwtQAe83F1gamaGgYHB3J/Ugq+gy88lQQwDvzZou2bDPVsdVvzV0ItZQkTepNp9BU0S4vC345VYfbUcn+oLsU6/Eiu1yrD8Wz7OelECiloKrVuLUFmTT+ZK88VZcsjuToRmdyC07A4cM0fhRgnRJXsUtzJHYJs6AmsBNT5JNHOiaHeU0w01/QJw+H3wKWRN0RgRmUBsFRGPSsJFzfPgC1IxMTGx80ck7HitHwWkS6asIsiMaCxoGOAKj5wdsOZvgGHsezC4vQimCRuwyyAay46WYYVWMVZTg75KuwgfnMzHu1/x8dFhe6hp6KGnRz5PYHp6GnJJJ/zTWnGbVt8xYwT6cYO4Sk3/pagB6BCuxAzigLMCH2l342PtNry6JwoXaFwZIxyHE5H0Lxwh85uGa3w9TI2NcMvREUMjIzE/qQX/dImbV0oXbgQ244xtPYy4lnDJUINtylaYxa/G9fi/wiLlE5xxscLHp7OxQrMAq7UKsEozD5+cyMDSXUnYqB6JMapI2UErBYWsC8HpTeCkjeBMSD/Oh/bhAs2RHuIs3bvmkI+rFjnYfSUfv1MLmJ+xhpaOwpXMyoiqAIf0ETil98OLG4HgQC46OsVDMpnsjR+RMA0XvsIrGWp1JVO65s9ICGlmownntB3gJG2HTdLnsEpaDVvBKqhdjcW6izTjoenCmvM5WKGRimVf8LDt60AiMEirP0X2OkBhtBuxWXXgCAZgmTwAjQAVjvmrcCpIhbNE5kt3FYoC3YEMfQxzTmP9iu+wxbaNisohuGcNQDOsD1rhfd+bHq8M0REhKK8QYnBw8NBPauGro5e3RBYoplwTu2Ho3QoDLx4809VperYXdkm7qCrdBtvE3Th0gw91mnWqm5Riv1ERvqD6aY16LHYcCkCPXIaRkWFIpVKIO9tRVFEH01g5mWA/ZXUlLUIfHNP6aZKnwg4nFVJcvYHbehi8sAe33/kQX5qU4Ah3CId9FDjkrcCFEBVcModpyt2A0CDq8lLT0dc34CCXy1/+IYn5Fm7f1+e0Ushm3ZMkuE6TBPcUQ3infwPXlINw4e+BNe8kjpgW4lvrCmhYl+OYRQkO6ediy9F4bNrrj6qqOih6e+Zrm9raWrSLGmESIcIVqqlOByoQQaMXQc0AjONU2GCnQqSNDxBwEc07PkPp20twxrwY+3zINzx6oU7Y7dKLC6Sta5FiePv4IjIqGgqVKl6pVH7wKAEm/K8JvyM8f+jEJbM0is/eKSp4JkUiNE8LvhnnCUdhHWmM0zbV0HSqxgXHKpzjVOKkWTH2nk/F6i9CEMXLQJe4HdXV1SgoLERbSz1CBDUwoBGLXQqN5/17cUughFaoAp9yVPAx9cOs9THUvPc2PNYfw1a3Qex27SHBe/Av5+/PtskqeGQo4OzuCy43EDK5vKC3t3fDowSeoYvfEl4hsJHG67u+/NY4qXJo8nZZFxLKHBBVYILwvEuwCQ/BVU8Rhdwm6Pk0QdejHtr2Qpw2LsTmwwkwMo9EY0MViouLkZWVhfz8PDQ31lN5IsK5ICU+s5Fhq70MW+zlWMPpg4NBAEY1dyFn4Wv4RjMR650Hsc1B/m9soO9fpOFxQF4fOE5elJm5ZJ6yIjLRjY8SYLNRNiH+M4FtPiwnfPDeB/+84BdbIa6S1CKviYvkcge4xBXDJloKm5gu2nkRUynRAWP/Fug51eCcUTGOXYhGZmYGcnKykUJVZVRUFBpqKhGRVo2vaW/BOqEXavZSrLeR4hNrJUx1Q6DcsRyuy7ZgHUeB7Y7y+c822kqx1lJCxWQPAguG4JXRC2t7F4SFhYPsn08a+OdDAg/N5/d0g431lhLYVtB6wpZnn33u6+MXLscW1AgmWlXZyKyvRVDeIPxzlJRBlTTH6aVyWgpOWAdM3JpwyiAJ/lwXCASCeeG5XC69NAydonqqt2pxPqgX2+wlWGkuwQc3ldDVCkfL+wtxYL8ntnsOUbCQQ81Ogn+adWO/q5z6ZhW8cobhktyBm1Y2SOHzQWHUrbGx8S+P08Cn9IXthAOEI6+88orxhUunM1JyYwfKuqgDo3yVJ55DavM04inx8AoG4UOraxvcDvegFPCoiuRyA+Dp6Qk7OzskJtwm06rHUZcG2lvrgU6wFEuMe3H8WAii/74C7+u34iMzKQwipbgWLcchT+pDSPibCWQ+BaOwCCwGx8YSlcIqtLe3/yiMPk1Csu6HhSbmA38jMBVtIvyLESCcJmg9++wzFh+uWBV+5pJhqRM3pjsmSziUWt49lVEhm+VlimcDE9tmnIPKx63t3Cf8fH1gb28Pa2trmFEtk52ZhtKKKpz2bKKJXC82OypwUiMYmnut8Q+rfqy36sYR2sbSJgc/RY3UxRAlNf4qcMmE9GwCEBIUyITvoQDx6qOr//B/5gcsCrEPFxP+Tlj5CInDD0jo0FmPYELgLFiwwOPFF18Kevnl16L+9OpfeL//w5+in3nmmeAXX/xdhLm5+agjpX8m/I0bN+Y1UVddidLySpz1qMVZ2tUx967BLosmHPLqwU4HGW0cynDCV45vfWigENWLEOr4zrmW00I4QCispkq30/ynhGf3mC8wEi8SHkYjpomPCesI2wh7H2jjFJ0vEq4SDAk3CGYEi0dgtHjxYh8OhzNla2sLV1dXauKTUVJSMp/g6murYB5USn1G+/xq37xN+2xuEhhGyqjnkMEttYd6CxUO0rbtDTtfVJSVMOGFoaGhj92OYiH1ecIfCcxR3ia894AI84sthF2E/QRmi0cJxwmMFDOzMw/Arg8vW7bMnhx5sqKiAnV1dWhra4OE2kyVUglZlwj8rCIY+pfjKO0rH/MUUz8uIQ1IcYB2P7daNsMxUEC5pIEiW2bLypUr36VnPtHxUBssNzAiLLy+RWAR6v0HZFbRmWmGxePPCWoE5vQ7HhD8gs67CduWLFliwOPxlENDQ1RmjMwXeqxanZyawvBQPySdzSgrKwcvtQSesWXwiKNJYEY9auqa0FArnCbTi3rppZf+Ss9ivjq/HfakByPCNMI24JhpMTLMR9ikgPkJyxlsCLuMwHyG5Y+PCCsIax6QY6R2Pv/88+d0dXXzu7u7Z+fL1QfHvXs0qhweni/D5RIxJOJW1ApL7vHCg8WamhfCly5dyjTM3vE6gQUZti3LZHqy6fUPmLIV+NWDhzDtMKdn+eMPDx7OpgfsRW8TmP8wMkxLrAlRJ2gsXLjQTltbu4DP5ytaWlqmOzo65urr6+fS09PvOjg4iPfs2cNftGgR26XRIDC/W0tgC8OiI3sPW0wmx88i8AM+8w9hYA9keFRbPxWSmUmxqfMxgtYLL7xgTMJaESnL5557Tp/uMb85SNhDYCbJhGeaZfX/o8L/UI5f/JqRYppiuYW9mAWDdwjM1FiWZ+GZCceCAjszc1v94D77nH2PmSjzPabhX3TVfw7bh6bHKl4W4Zg/MfNjIZEJyM7smpkl+5x977F2/r+RoQdED67v5QAAAABJRU5ErkJggg==</Logo>
- <Properties>
- <MPMaxVersion />
- <MPMinVersion />
- <MinExtensionVersion />
- <MaxExtensionVersion />
- <ForumURL />
- <WebURL />
- <CreationDate>10-10-08</CreationDate>
- <SingleGroupSelect>False</SingleGroupSelect>
- </Properties>
- <Uninstall />
- </Extension>
- </ExtensionList>
- <Option />
-</MPinstalerS>
\ No newline at end of file
Deleted: trunk/plugins/WorldMap/Installer/Worldmap.xmp
===================================================================
--- trunk/plugins/WorldMap/Installer/Worldmap.xmp 2010-08-21 12:53:28 UTC (rev 3760)
+++ trunk/plugins/WorldMap/Installer/Worldmap.xmp 2010-08-21 13:06:02 UTC (rev 3761)
@@ -1,305 +0,0 @@
-<MPinstaler>
- <ver>1.00.000</ver>
- <FileList>
- <File>
- <FileName>hover_myworldmap.png</FileName>
- <Type>Other</Type>
- <SubType>%Skin%\Blue3\Media\MyWorldMap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\Media\hover_myworldmap.png</Source>
- <Id>04010</Id>
- <Option />
- <Guid>185eeadb-20e1-434e-914b-2c1b9a77dd9c</Guid>
- </File>
- <File>
- <FileName>hover_myworldmap.png</FileName>
- <Type>Other</Type>
- <SubType>%Skin%\Blue3wide\Media\MyWorldMap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\Media\hover_myworldmap.png</Source>
- <Id>04010</Id>
- <Option />
- <Guid>3363551a-94de-49eb-81fa-28f21fd55b53</Guid>
- </File>
- <File>
- <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>311a3d45-6ca2-4cca-9d64-b955e6eaeae1</Guid>
- </File>
- <File>
- <FileName>MyWorldMap.xml</FileName>
- <Type>Other</Type>
- <SubType>%Config%</SubType>
- <Source>MyWorldMap.xml</Source>
- <Id>04010</Id>
- <Option />
- <Guid>4790194f-2eaf-4680-bb85-78dee41dd8d1</Guid>
- </File>
- <File>
- <FileName>MyWorldMap.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldMap.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>22f56a0c-f8b6-45c1-8ff4-9e24e5706051</Guid>
- </File>
- <File>
- <FileName>MyWorldMap.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3wide</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldMap.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>e611f3fc-3521-4b29-b9ed-fe138aa48db9</Guid>
- </File>
- <File>
- <FileName>MyWorldmapMenu.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapMenu.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>7fb83a9b-7f0e-4b38-9a78-a728551e6668</Guid>
- </File>
- <File>
- <FileName>MyWorldmapMenu.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3wide</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapMenu.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>34135520-ed5d-422d-8332-e8d52c0b7557</Guid>
- </File>
- <File>
- <FileName>MyWorldmapSearch.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapSearch.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>3027d708-27c1-4935-b99f-c5313a296d03</Guid>
- </File>
- <File>
- <FileName>MyWorldmapSearch.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3wide</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapSearch.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>316bb985-3aa3-45bd-9d80-dbfee023d433</Guid>
- </File>
- <File>
- <FileName>MyWorldmapSearchResults.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3\MyWorldmapSearchResults.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>a59b4a7a-8202-4242-bf53-dca06e9e7911</Guid>
- </File>
- <File>
- <FileName>MyWorldmapSearchResults.xml</FileName>
- <Type>Skin</Type>
- <SubType>Blue3wide</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\skinFiles\Blue3Wide\MyWorldmapSearchResults.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>febb2aa6-bcd2-4697-a767-4a2e8002c9a6</Guid>
- </File>
- <File>
- <FileName>strings_de.xml</FileName>
- <Type>Other</Type>
- <SubType>%Language%\MyWorldmap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_de.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>d4536e43-a470-435d-8e05-a121e04c50ae</Guid>
- </File>
- <File>
- <FileName>strings_en.xml</FileName>
- <Type>Other</Type>
- <SubType>%Language%\MyWorldmap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_en.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>789c4f02-8c15-4a19-ac4f-b44f5c5c5d11</Guid>
- </File>
- <File>
- <FileName>strings_fr.xml</FileName>
- <Type>Other</Type>
- <SubType>%Language%\MyWorldmap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_fr.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>e48a2a3f-75b2-4b1a-8ad2-324e4edd9405</Guid>
- </File>
- <File>
- <FileName>strings_it.xml</FileName>
- <Type>Other</Type>
- <SubType>%Language%\MyWorldmap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_it.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>16e7932d-e0f9-4ce4-a93a-07005de99755</Guid>
- </File>
- <File>
- <FileName>strings_no.xml</FileName>
- <Type>Other</Type>
- <SubType>%Language%\MyWorldmap</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\language\MyWorldmap\strings_no.xml</Source>
- <Id>02010</Id>
- <Option />
- <Guid>2a20269e-57c7-4b63-9cbd-81312f3bb1c3</Guid>
- </File>
- <File>
- <FileName>System.Data.SQLite.DLL</FileName>
- <Type>Plugin</Type>
- <SubType>Window</SubType>
- <Source>C:\svnroot\mp-plugins\trunk\plugins\MyWorldMap\bin\Release\System.Data.SQLite.DLL</Source>
- <Id>01010</Id>
- <Option />
- <Guid>68ea5fd0-9b8e-4284-8752-addbfc535ab5</Guid>
- </File>
- <File>
- <FileName>WMIPBlocked.jpeg</FileName>
- <Type>Other</Type>
- <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>6165ec64-e4bb-4943-adcb-e6f8f5c0e989</Guid>
- </File>
- <File>
- <FileName>WMIPBlocked.jpeg</FileName>
- <Type>Other</Type>
- <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>26a984d6-b927-4b8c-82db-062d1625beaa</Guid>
- </File>
- <File>
- <FileName>WMprogressBarActive.png</FileName>
- <Type>Other</Type>
- <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>8c213567-79e6-4934-952a-742164fe989e</Guid>
- </File>
- <File>
- <FileName>WMprogressBarActive.png</FileName>
- <Type>Other</Type>
- <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>8414a52c-d936-41af-9393-3b09aebfe919</Guid>
- </File>
- <File>
- <FileName>WMprogressBarQueued.png</FileName>
- <Type>Other</Type>
- <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>de07edf4-88d2-42bc-b3c9-9ab0a19f62d9</Guid>
- </File>
- <File>
- <FileName>WMprogressBarQueued.png</FileName>
- <Type>Other</Type>
- <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>007a6753-0445-468e-9c15-b09d39aed0ee</Guid>
- </File>
- <File>
- <FileName>WMprogressDummy.png</FileName>
- <Type>Other</Type>
- <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>c0dad748-54b1-4e34-a175-12055910a032</Guid>
- </File>
- <File>
- <FileName>WMprogressDummy.png</FileName>
- <Type>Other</Type>
- <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>964dcf73-7582-40d6-939d-7bcc177b9236</Guid>
- </File>
- <File>
- <FileName>WMTileNotAvailable.jpeg</FileName>
- <Type>Other</Type>
- <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>054d120f-1775-4d09-af6d-6a3f1f6e2003</Guid>
- </File>
- <File>
- <FileName>WMTileNotAvailable.jpeg</FileName>
- <Type>Other</Type>
- <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>da13b130-eea4-4b2e-98fd-5519e13602aa</Guid>
- </File>
- <File>
- <FileName>WMTilePlaceholder.jpeg</FileName>
- <Type>Other</Type>
- <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>13b66198-4152-46c7-8115-be4ba6ab9de0</Guid>
- </File>
- <File>
- <FileName>WMTilePlaceholder.jpeg</FileName>
- <Type>Other</Type>
- <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>539d5599-2dd0-4793-ad13-8681bc76ed00</Guid>
- </File>
- </FileList>
- <StringList />
- <Actions />
- <SetupGroups />
- <SetupGroupMappings />
- <Option>
- <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 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>
- <Script />
- <Logo>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...
[truncated message content] |
|
From: <Sil...@us...> - 2010-10-06 21:28:32
|
Revision: 3804
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3804&view=rev
Author: SilentException
Date: 2010-10-06 21:28:24 +0000 (Wed, 06 Oct 2010)
Log Message:
-----------
MyWorldMap:
- Updated Bing maps to read key from resource file
- Updated AssemblyInfo
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/BingAPI.cs
trunk/plugins/WorldMap/MyWorldMap.csproj
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
trunk/plugins/WorldMap/MAPS/BingAPIKey.resx
Modified: trunk/plugins/WorldMap/MAPS/BingAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPI.cs 2010-10-06 19:25:49 UTC (rev 3803)
+++ trunk/plugins/WorldMap/MAPS/BingAPI.cs 2010-10-06 21:28:24 UTC (rev 3804)
@@ -46,7 +46,8 @@
Credentials = new Credentials
{
// Set credentials using a valid Bing Maps Key
- ApplicationId = BindAPIKey.Load()
+ //ApplicationId = BindAPIKey.Load();
+ ApplicationId = new System.Resources.ResourceManager("WindowPlugins.GUITVSeries.Online_Parsing_Classes.APIKey", typeof(BingApi).Assembly).GetString("Key")
},
Center = new Location
{
Added: trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs (rev 0)
+++ trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2010-10-06 21:28:24 UTC (rev 3804)
@@ -0,0 +1,72 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:2.0.50727.3607
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace MyWorldMap.MAPS {
+ using System;
+
+
+ /// <summary>
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ /// </summary>
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class BingAPIKey {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal BingAPIKey() {
+ }
+
+ /// <summary>
+ /// Returns the cached ResourceManager instance used by this class.
+ /// </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("MyWorldMap.MAPS.BingAPIKey", typeof(BingAPIKey).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ /// <summary>
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ /// </summary>
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ /// <summary>
+ /// Looks up a localized string similar to 0123456789.
+ /// </summary>
+ internal static string Key {
+ get {
+ return ResourceManager.GetString("Key", resourceCulture);
+ }
+ }
+ }
+}
Added: trunk/plugins/WorldMap/MAPS/BingAPIKey.resx
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPIKey.resx (rev 0)
+++ trunk/plugins/WorldMap/MAPS/BingAPIKey.resx 2010-10-06 21:28:24 UTC (rev 3804)
@@ -0,0 +1,124 @@
+<?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>
+ <data name="Key" xml:space="preserve">
+ <value>0123456789</value>
+ <comment>Developers should enter their API keys here!</comment>
+ </data>
+</root>
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj 2010-10-06 19:25:49 UTC (rev 3803)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj 2010-10-06 21:28:24 UTC (rev 3804)
@@ -58,8 +58,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="LocalizeStrings.cs" />
- <Compile Include="MAPS\BindAPIKey.cs" />
<Compile Include="MAPS\BingAPI.cs" />
+ <Compile Include="MAPS\BingAPIKey.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>BingAPIKey.resx</DependentUpon>
+ </Compile>
<Compile Include="MAPS\GoogleAPI.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -108,6 +112,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="MAPS\BingAPIKey.resx">
+ <Generator>ResXFileCodeGenerator</Generator>
+ <LastGenOutput>BingAPIKey.Designer.cs</LastGenOutput>
+ </EmbeddedResource>
<EmbeddedResource Include="myworldmap_disabled.png">
</EmbeddedResource>
<EmbeddedResource Include="myworldmap_enabled.png">
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-10-06 19:25:49 UTC (rev 3803)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2010-10-06 21:28:24 UTC (rev 3804)
@@ -34,5 +34,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("2.0.0.7")]
+[assembly: AssemblyFileVersion("2.0.0.7")]
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-10-07 10:01:36
|
Revision: 3805
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3805&view=rev
Author: SilentException
Date: 2010-10-07 10:01:29 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
MyWorldMap:
- commented line in localization provider that causes characterset to be reset
- removed warnings :)
Modified Paths:
--------------
trunk/plugins/WorldMap/LocalizeStrings.cs
trunk/plugins/WorldMap/WorldMapSearchResults.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
Modified: trunk/plugins/WorldMap/LocalizeStrings.cs
===================================================================
--- trunk/plugins/WorldMap/LocalizeStrings.cs 2010-10-06 21:28:24 UTC (rev 3804)
+++ trunk/plugins/WorldMap/LocalizeStrings.cs 2010-10-07 10:01:29 UTC (rev 3805)
@@ -93,7 +93,7 @@
_stringProvider = new LocalisationProvider(directory, cultureName, isPrefixEnabled);
- GUIGraphicsContext.CharsInCharacterSet = _stringProvider.Characters;
+ //GUIGraphicsContext.CharsInCharacterSet = _stringProvider.Characters;
return true;
}
Modified: trunk/plugins/WorldMap/WorldMapSearchResults.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMapSearchResults.cs 2010-10-06 21:28:24 UTC (rev 3804)
+++ trunk/plugins/WorldMap/WorldMapSearchResults.cs 2010-10-07 10:01:29 UTC (rev 3805)
@@ -9,8 +9,8 @@
public int LastWindowID = -1;
public List<GeoCode> SearchResults = new List<GeoCode>();
public int SuggestedZoomLevel;
- [SkinControl(24)] internal GUILabelControl _lblHeader;
- [SkinControl(5)] internal GUIListControl _listview;
+ [SkinControl(24)] internal GUILabelControl _lblHeader = null;
+ [SkinControl(5)] internal GUIListControl _listview = null;
public WorldMapSearchResults()
{
Modified: trunk/plugins/WorldMap/WorldmapMenu.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapMenu.cs 2010-10-06 21:28:24 UTC (rev 3804)
+++ trunk/plugins/WorldMap/WorldmapMenu.cs 2010-10-07 10:01:29 UTC (rev 3805)
@@ -5,12 +5,12 @@
{
internal sealed class WorldmapMenu : GUIWindow
{
- [SkinControl(5)] internal GUIButtonControl _btnLastResult;
- [SkinControl(10)] internal GUIButtonControl _btnMapType;
- [SkinControl(6)] internal GUIButtonControl _btnPlacemarks;
- [SkinControl(2)] internal GUIButtonControl _btnSearchAdress;
- [SkinControl(3)] internal GUIButtonControl _btnSearchplaceName;
- [SkinControl(1)] internal GUILabelControl _lblSearchHeader;
+ [SkinControl(5)] internal GUIButtonControl _btnLastResult = null;
+ [SkinControl(10)] internal GUIButtonControl _btnMapType = null;
+ [SkinControl(6)] internal GUIButtonControl _btnPlacemarks = null;
+ [SkinControl(2)] internal GUIButtonControl _btnSearchAdress = null;
+ [SkinControl(3)] internal GUIButtonControl _btnSearchplaceName = null;
+ [SkinControl(1)] internal GUILabelControl _lblSearchHeader = null;
public WorldmapMenu()
Modified: trunk/plugins/WorldMap/WorldmapSearch.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapSearch.cs 2010-10-06 21:28:24 UTC (rev 3804)
+++ trunk/plugins/WorldMap/WorldmapSearch.cs 2010-10-07 10:01:29 UTC (rev 3805)
@@ -19,17 +19,17 @@
public string Country = string.Empty;
public string Placename = string.Empty;
public string Street = string.Empty;
- [SkinControl(22)] internal GUIButtonControl _btnCancel;
- [SkinControl(3)] internal GUIButtonControl _btnCity;
- [SkinControl(4)] internal GUIButtonControl _btnCountry;
- [SkinControl(5)] internal GUIButtonControl _btnPlacename;
- [SkinControl(21)] internal GUIButtonControl _btnSearch;
- [SkinControl(2)] internal GUIButtonControl _btnStreet;
- [SkinControl(13)] internal GUILabelControl _lblCity;
- [SkinControl(14)] internal GUILabelControl _lblCountry;
- [SkinControl(24)] internal GUILabelControl _lblHeader;
- [SkinControl(15)] internal GUILabelControl _lblPlacename;
- [SkinControl(12)] internal GUILabelControl _lblStreet;
+ [SkinControl(22)] internal GUIButtonControl _btnCancel = null;
+ [SkinControl(3)] internal GUIButtonControl _btnCity = null;
+ [SkinControl(4)] internal GUIButtonControl _btnCountry = null;
+ [SkinControl(5)] internal GUIButtonControl _btnPlacename = null;
+ [SkinControl(21)] internal GUIButtonControl _btnSearch = null;
+ [SkinControl(2)] internal GUIButtonControl _btnStreet = null;
+ [SkinControl(13)] internal GUILabelControl _lblCity = null;
+ [SkinControl(14)] internal GUILabelControl _lblCountry = null;
+ [SkinControl(24)] internal GUILabelControl _lblHeader = null;
+ [SkinControl(15)] internal GUILabelControl _lblPlacename = null;
+ [SkinControl(12)] internal GUILabelControl _lblStreet = null;
private SearchType _searchType = SearchType.None;
private bool _workerCompleted = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-10-07 10:16:57
|
Revision: 3807
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3807&view=rev
Author: SilentException
Date: 2010-10-07 10:16:50 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
MyWorldMap:
- Added BingAPiKey to svn:ignore
Property Changed:
----------------
trunk/plugins/WorldMap/
trunk/plugins/WorldMap/Build/
trunk/plugins/WorldMap/Installer/
trunk/plugins/WorldMap/MAPS/
trunk/plugins/WorldMap/Properties/
trunk/plugins/WorldMap/Web References/
trunk/plugins/WorldMap/Web References/ImageryService/
trunk/plugins/WorldMap/language/
trunk/plugins/WorldMap/language/MyWorldmap/
trunk/plugins/WorldMap/mediaTemplates/
trunk/plugins/WorldMap/skinFiles/
trunk/plugins/WorldMap/skinFiles/Blue3/
trunk/plugins/WorldMap/skinFiles/Blue3/Media/
trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/
Property changes on: trunk/plugins/WorldMap
___________________________________________________________________
Modified: svn:ignore
- bin
obj
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/Build
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/Installer
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/MAPS
___________________________________________________________________
Modified: svn:ignore
- BindAPIKey.cs
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/Properties
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/Web References
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/Web References/ImageryService
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/language
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/language/MyWorldmap
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/mediaTemplates
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap
___________________________________________________________________
Added: svn:ignore
+ bin
obj
BingAPIKey*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-10-07 10:20:22
|
Revision: 3808
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3808&view=rev
Author: SilentException
Date: 2010-10-07 10:20:15 +0000 (Thu, 07 Oct 2010)
Log Message:
-----------
MyWorldMap:
- Added BingAPiKey to svn:ignore (try 2)
Property Changed:
----------------
trunk/plugins/WorldMap/
trunk/plugins/WorldMap/Build/
trunk/plugins/WorldMap/Installer/
trunk/plugins/WorldMap/MAPS/
trunk/plugins/WorldMap/Properties/
trunk/plugins/WorldMap/Web References/
trunk/plugins/WorldMap/Web References/ImageryService/
trunk/plugins/WorldMap/language/
trunk/plugins/WorldMap/language/MyWorldmap/
trunk/plugins/WorldMap/mediaTemplates/
trunk/plugins/WorldMap/skinFiles/
trunk/plugins/WorldMap/skinFiles/Blue3/
trunk/plugins/WorldMap/skinFiles/Blue3/Media/
trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/
trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap/
Property changes on: trunk/plugins/WorldMap
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/Build
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/Installer
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/MAPS
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/Properties
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/Web References
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/Web References/ImageryService
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/language
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/language/MyWorldmap
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/mediaTemplates
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3/Media/MyWorldMap
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
Property changes on: trunk/plugins/WorldMap/skinFiles/Blue3Wide/Media/MyWorldMap
___________________________________________________________________
Modified: svn:ignore
- bin
obj
BingAPIKey*
+ bin
obj
BingAPIKey.resx
BingAPIKey.Designer.cs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <Sil...@us...> - 2010-10-13 20:52:35
|
Revision: 3824
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3824&view=rev
Author: SilentException
Date: 2010-10-13 20:52:28 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
MyWorldMap:
- changed handling of download exceptions (do not create new bitmap(0,0)! - argument exception)
- default scroll factor of 5
- improvements of scroll factor
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/BingAPI.cs
trunk/plugins/WorldMap/MAPS/MapImages.cs
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/WorldMap.cs
trunk/plugins/WorldMap/WorldmapConfig.Designer.cs
Modified: trunk/plugins/WorldMap/MAPS/BingAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPI.cs 2010-10-13 12:05:49 UTC (rev 3823)
+++ trunk/plugins/WorldMap/MAPS/BingAPI.cs 2010-10-13 20:52:28 UTC (rev 3824)
@@ -48,7 +48,7 @@
{
// Set credentials using a valid Bing Maps Key
//ApplicationId = BindAPIKey.Load();
- ApplicationId = new System.Resources.ResourceManager("WindowPlugins.GUITVSeries.Online_Parsing_Classes.APIKey", typeof(BingApi).Assembly).GetString("Key")
+ ApplicationId = new System.Resources.ResourceManager("MyWorldMap.MAPS.BingAPIKey", typeof(BingApi).Assembly).GetString("Key")
},
Center = new Location
{
Modified: trunk/plugins/WorldMap/MAPS/MapImages.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/MapImages.cs 2010-10-13 12:05:49 UTC (rev 3823)
+++ trunk/plugins/WorldMap/MAPS/MapImages.cs 2010-10-13 20:52:28 UTC (rev 3824)
@@ -41,17 +41,21 @@
}
catch (WebException err)
{
- switch (err.Status)
- {
- case WebExceptionStatus.Timeout:
- case WebExceptionStatus.ConnectFailure:
- tmpImage = (Bitmap) Image.FromFile(MyWorldmap.MyWorldMap.SkinMediaFolder + "WMTilePlaceholder.jpeg");
- break;
- default:
- Log.Error("[MyWorldMap]: Download() error: {0}", err.ToString());
- tmpImage = new Bitmap(0, 0); // Empty image
- break;
- }
+ Log.Error("[MyWorldMap]: Download() error: {0}", err.ToString());
+ tmpImage = (Bitmap)Image.FromFile(MyWorldmap.MyWorldMap.SkinMediaFolder + "WMTilePlaceholder.jpeg");
+ /*
+ switch (err.Status)
+ {
+ case WebExceptionStatus.Timeout:
+ case WebExceptionStatus.ConnectFailure:
+ tmpImage = (Bitmap)Image.FromFile(MyWorldmap.MyWorldMap.SkinMediaFolder + "WMTilePlaceholder.jpeg");
+ break;
+ default:
+ Log.Error("[MyWorldMap]: Download() error: {0}", err.ToString());
+ tmpImage = new Bitmap(0, 0); // Empty image
+ break;
+ }
+ */
}
Log.Debug("[MyWorldMap]: Downloaded image size = {0}x{1}", tmpImage.Width, tmpImage.Height);
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2010-10-13 12:05:49 UTC (rev 3823)
+++ trunk/plugins/WorldMap/Settings.cs 2010-10-13 20:52:28 UTC (rev 3824)
@@ -71,7 +71,7 @@
: new BingApi();
DownLoadTimeOut = reader.GetValueAsInt(SectionName, ParmDownloadTimeOut, 5);
- ScrollFactor = reader.GetValueAsInt(SectionName, ParmScrollFactor, 10);
+ ScrollFactor = reader.GetValueAsInt(SectionName, ParmScrollFactor, 5);
ActionMoveUp =
(Action.ActionType)
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2010-10-13 12:05:49 UTC (rev 3823)
+++ trunk/plugins/WorldMap/WorldMap.cs 2010-10-13 20:52:28 UTC (rev 3824)
@@ -206,14 +206,14 @@
}
if (action.wID == _settings.ActionMoveUp)
{
- CurrentLatitude += moveFactor;
+ CurrentLatitude += moveFactor / 1.5;
if (CurrentLatitude > 90) CurrentLatitude = 90;
RefreshScreen();
return;
}
if (action.wID == _settings.ActionMoveDown)
{
- CurrentLatitude -= moveFactor;
+ CurrentLatitude -= moveFactor / 1.5;
if (CurrentLatitude < -90) CurrentLatitude = -90;
RefreshScreen();
return;
@@ -288,7 +288,7 @@
private static double Scroll(int zoom, int maxZoom)
{
- double moveFinalValue = 0.0000312 * ScrollFactor * Math.Pow(2, (maxZoom - zoom - 1));
+ double moveFinalValue = 0.0000312 * ScrollFactor * Math.Pow(1.95, (maxZoom - zoom - 1 ));
Log.Debug("[MyWorldMap]: ScrollFactor={0}, moveFinalValue={1}", ScrollFactor, moveFinalValue);
return moveFinalValue;
}
Modified: trunk/plugins/WorldMap/WorldmapConfig.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapConfig.Designer.cs 2010-10-13 12:05:49 UTC (rev 3823)
+++ trunk/plugins/WorldMap/WorldmapConfig.Designer.cs 2010-10-13 20:52:28 UTC (rev 3824)
@@ -28,444 +28,439 @@
/// </summary>
private void InitializeComponent()
{
- this.tbConfig = new System.Windows.Forms.TabControl();
- this.tabSettings = new System.Windows.Forms.TabPage();
- this.cbGenerateActionLogEntries = new System.Windows.Forms.CheckBox();
- this.label2 = new System.Windows.Forms.Label();
- this.numericUpDownDownloadTimeout = new System.Windows.Forms.NumericUpDown();
- this.tabRemote = new System.Windows.Forms.TabPage();
- this.label20 = new System.Windows.Forms.Label();
- this.cmbToggleProvider = new System.Windows.Forms.ComboBox();
- this.label22 = new System.Windows.Forms.Label();
- this.cmbToggleView = new System.Windows.Forms.ComboBox();
- this.label16 = new System.Windows.Forms.Label();
- this.cmbZoomOut = new System.Windows.Forms.ComboBox();
- this.label15 = new System.Windows.Forms.Label();
- this.cmbZoomIn = new System.Windows.Forms.ComboBox();
- this.label14 = new System.Windows.Forms.Label();
- this.cmbMoveRight = new System.Windows.Forms.ComboBox();
- this.label13 = new System.Windows.Forms.Label();
- this.cmbMoveDown = new System.Windows.Forms.ComboBox();
- this.label12 = new System.Windows.Forms.Label();
- this.cmbMoveLeft = new System.Windows.Forms.ComboBox();
- this.label11 = new System.Windows.Forms.Label();
- this.cmbMoveUp = new System.Windows.Forms.ComboBox();
- this.tabAbout = new System.Windows.Forms.TabPage();
- this.linkDocs_Provider2 = new System.Windows.Forms.LinkLabel();
- this.linkDocs_Provider1 = new System.Windows.Forms.LinkLabel();
- this.labelVer_Provider2 = new System.Windows.Forms.Label();
- this.labelVer_Provider1 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
- this.labelName_Provider2 = new System.Windows.Forms.Label();
- this.labelName_Provider1 = new System.Windows.Forms.Label();
- this.btnOk = new System.Windows.Forms.Button();
- this.btnCancel = new System.Windows.Forms.Button();
- this.label3 = new System.Windows.Forms.Label();
- this.numericUpDownScrollFactor = new System.Windows.Forms.NumericUpDown();
- this.tbConfig.SuspendLayout();
- this.tabSettings.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDownloadTimeout)).BeginInit();
- this.tabRemote.SuspendLayout();
- this.tabAbout.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.numericUpDownScrollFactor)).BeginInit();
- this.SuspendLayout();
- //
- // tbConfig
- //
- this.tbConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.tbConfig.Controls.Add(this.tabSettings);
- this.tbConfig.Controls.Add(this.tabRemote);
- this.tbConfig.Controls.Add(this.tabAbout);
- this.tbConfig.HotTrack = true;
- this.tbConfig.Location = new System.Drawing.Point(1, 1);
- this.tbConfig.Name = "tbConfig";
- this.tbConfig.SelectedIndex = 0;
- this.tbConfig.Size = new System.Drawing.Size(682, 252);
- this.tbConfig.TabIndex = 0;
- //
- // tabSettings
- //
- this.tabSettings.Controls.Add(this.numericUpDownScrollFactor);
- this.tabSettings.Controls.Add(this.label3);
- this.tabSettings.Controls.Add(this.cbGenerateActionLogEntries);
- this.tabSettings.Controls.Add(this.label2);
- this.tabSettings.Controls.Add(this.numericUpDownDownloadTimeout);
- this.tabSettings.Location = new System.Drawing.Point(4, 22);
- this.tabSettings.Name = "tabSettings";
- this.tabSettings.Padding = new System.Windows.Forms.Padding(3);
- this.tabSettings.Size = new System.Drawing.Size(674, 226);
- this.tabSettings.TabIndex = 3;
- this.tabSettings.Text = "Settings";
- this.tabSettings.UseVisualStyleBackColor = true;
- //
- // cbGenerateActionLogEntries
- //
- this.cbGenerateActionLogEntries.AutoSize = true;
- this.cbGenerateActionLogEntries.Location = new System.Drawing.Point(43, 132);
- this.cbGenerateActionLogEntries.Name = "cbGenerateActionLogEntries";
- this.cbGenerateActionLogEntries.Size = new System.Drawing.Size(393, 17);
- this.cbGenerateActionLogEntries.TabIndex = 23;
- this.cbGenerateActionLogEntries.Text = "Generate log entries if a remote or keyboard action occurs (for debug reasons)";
- this.cbGenerateActionLogEntries.UseVisualStyleBackColor = true;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(40, 42);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(147, 13);
- this.label2.TabIndex = 1;
- this.label2.Text = "Download time out (seconds):";
- //
- // numericUpDownDownloadTimeout
- //
- this.numericUpDownDownloadTimeout.Location = new System.Drawing.Point(243, 40);
- this.numericUpDownDownloadTimeout.Maximum = new decimal(new int[] {
- 120,
+ this.tbConfig = new System.Windows.Forms.TabControl();
+ this.tabSettings = new System.Windows.Forms.TabPage();
+ this.numericUpDownScrollFactor = new System.Windows.Forms.NumericUpDown();
+ this.label3 = new System.Windows.Forms.Label();
+ this.cbGenerateActionLogEntries = new System.Windows.Forms.CheckBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.numericUpDownDownloadTimeout = new System.Windows.Forms.NumericUpDown();
+ this.tabRemote = new System.Windows.Forms.TabPage();
+ this.label20 = new System.Windows.Forms.Label();
+ this.cmbToggleProvider = new System.Windows.Forms.ComboBox();
+ this.label22 = new System.Windows.Forms.Label();
+ this.cmbToggleView = new System.Windows.Forms.ComboBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.cmbZoomOut = new System.Windows.Forms.ComboBox();
+ this.label15 = new System.Windows.Forms.Label();
+ this.cmbZoomIn = new System.Windows.Forms.ComboBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.cmbMoveRight = new System.Windows.Forms.ComboBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.cmbMoveDown = new System.Windows.Forms.ComboBox();
+ this.label12 = new System.Windows.Forms.Label();
+ this.cmbMoveLeft = new System.Windows.Forms.ComboBox();
+ this.label11 = new System.Windows.Forms.Label();
+ this.cmbMoveUp = new System.Windows.Forms.ComboBox();
+ this.tabAbout = new System.Windows.Forms.TabPage();
+ this.linkDocs_Provider2 = new System.Windows.Forms.LinkLabel();
+ this.linkDocs_Provider1 = new System.Windows.Forms.LinkLabel();
+ this.labelVer_Provider2 = new System.Windows.Forms.Label();
+ this.labelVer_Provider1 = new System.Windows.Forms.Label();
+ this.label1 = new System.Windows.Forms.Label();
+ this.labelName_Provider2 = new System.Windows.Forms.Label();
+ this.labelName_Provider1 = new System.Windows.Forms.Label();
+ this.btnOk = new System.Windows.Forms.Button();
+ this.btnCancel = new System.Windows.Forms.Button();
+ this.tbConfig.SuspendLayout();
+ this.tabSettings.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownScrollFactor)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.numericUpDownDownloadTimeout)).BeginInit();
+ this.tabRemote.SuspendLayout();
+ this.tabAbout.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // tbConfig
+ //
+ this.tbConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tbConfig.Controls.Add(this.tabSettings);
+ this.tbConfig.Controls.Add(this.tabRemote);
+ this.tbConfig.Controls.Add(this.tabAbout);
+ this.tbConfig.HotTrack = true;
+ this.tbConfig.Location = new System.Drawing.Point(1, 1);
+ this.tbConfig.Name = "tbConfig";
+ this.tbConfig.SelectedIndex = 0;
+ this.tbConfig.Size = new System.Drawing.Size(682, 252);
+ this.tbConfig.TabIndex = 0;
+ //
+ // tabSettings
+ //
+ this.tabSettings.Controls.Add(this.numericUpDownScrollFactor);
+ this.tabSettings.Controls.Add(this.label3);
+ this.tabSettings.Controls.Add(this.cbGenerateActionLogEntries);
+ this.tabSettings.Controls.Add(this.label2);
+ this.tabSettings.Controls.Add(this.numericUpDownDownloadTimeout);
+ this.tabSettings.Location = new System.Drawing.Point(4, 22);
+ this.tabSettings.Name = "tabSettings";
+ this.tabSettings.Padding = new System.Windows.Forms.Padding(3);
+ this.tabSettings.Size = new System.Drawing.Size(674, 226);
+ this.tabSettings.TabIndex = 3;
+ this.tabSettings.Text = "Settings";
+ this.tabSettings.UseVisualStyleBackColor = true;
+ //
+ // numericUpDownScrollFactor
+ //
+ this.numericUpDownScrollFactor.Location = new System.Drawing.Point(243, 82);
+ this.numericUpDownScrollFactor.Maximum = new decimal(new int[] {
+ 20,
0,
0,
0});
- this.numericUpDownDownloadTimeout.Minimum = new decimal(new int[] {
- 5,
+ this.numericUpDownScrollFactor.Minimum = new decimal(new int[] {
+ 1,
0,
0,
0});
- this.numericUpDownDownloadTimeout.Name = "numericUpDownDownloadTimeout";
- this.numericUpDownDownloadTimeout.Size = new System.Drawing.Size(44, 20);
- this.numericUpDownDownloadTimeout.TabIndex = 0;
- this.numericUpDownDownloadTimeout.Value = new decimal(new int[] {
- 5,
+ this.numericUpDownScrollFactor.Name = "numericUpDownScrollFactor";
+ this.numericUpDownScrollFactor.Size = new System.Drawing.Size(44, 20);
+ this.numericUpDownScrollFactor.TabIndex = 25;
+ this.numericUpDownScrollFactor.Value = new decimal(new int[] {
+ 10,
0,
0,
0});
- //
- // tabRemote
- //
- this.tabRemote.Controls.Add(this.label20);
- this.tabRemote.Controls.Add(this.cmbToggleProvider);
- this.tabRemote.Controls.Add(this.label22);
- this.tabRemote.Controls.Add(this.cmbToggleView);
- this.tabRemote.Controls.Add(this.label16);
- this.tabRemote.Controls.Add(this.cmbZoomOut);
- this.tabRemote.Controls.Add(this.label15);
- this.tabRemote.Controls.Add(this.cmbZoomIn);
- this.tabRemote.Controls.Add(this.label14);
- this.tabRemote.Controls.Add(this.cmbMoveRight);
- this.tabRemote.Controls.Add(this.label13);
- this.tabRemote.Controls.Add(this.cmbMoveDown);
- this.tabRemote.Controls.Add(this.label12);
- this.tabRemote.Controls.Add(this.cmbMoveLeft);
- this.tabRemote.Controls.Add(this.label11);
- this.tabRemote.Controls.Add(this.cmbMoveUp);
- this.tabRemote.Location = new System.Drawing.Point(4, 22);
- this.tabRemote.Name = "tabRemote";
- this.tabRemote.Padding = new System.Windows.Forms.Padding(3);
- this.tabRemote.Size = new System.Drawing.Size(674, 226);
- this.tabRemote.TabIndex = 1;
- this.tabRemote.Text = "Remote";
- this.tabRemote.UseVisualStyleBackColor = true;
- //
- // label20
- //
- this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(271, 46);
- this.label20.Name = "label20";
- this.label20.Size = new System.Drawing.Size(82, 13);
- this.label20.TabIndex = 17;
- this.label20.Text = "Toggle Provider";
- //
- // cmbToggleProvider
- //
- this.cmbToggleProvider.FormattingEnabled = true;
- this.cmbToggleProvider.Location = new System.Drawing.Point(393, 43);
- this.cmbToggleProvider.Name = "cmbToggleProvider";
- this.cmbToggleProvider.Size = new System.Drawing.Size(160, 21);
- this.cmbToggleProvider.TabIndex = 16;
- //
- // label22
- //
- this.label22.AutoSize = true;
- this.label22.Location = new System.Drawing.Point(271, 19);
- this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(66, 13);
- this.label22.TabIndex = 13;
- this.label22.Text = "Toggle View";
- //
- // cmbToggleView
- //
- this.cmbToggleView.FormattingEnabled = true;
- this.cmbToggleView.Location = new System.Drawing.Point(393, 16);
- this.cmbToggleView.Name = "cmbToggleView";
- this.cmbToggleView.Size = new System.Drawing.Size(160, 21);
- this.cmbToggleView.TabIndex = 12;
- //
- // label16
- //
- this.label16.AutoSize = true;
- this.label16.Location = new System.Drawing.Point(7, 154);
- this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(51, 13);
- this.label16.TabIndex = 11;
- this.label16.Text = "ZoomOut";
- //
- // cmbZoomOut
- //
- this.cmbZoomOut.FormattingEnabled = true;
- this.cmbZoomOut.Location = new System.Drawing.Point(79, 151);
- this.cmbZoomOut.Name = "cmbZoomOut";
- this.cmbZoomOut.Size = new System.Drawing.Size(160, 21);
- this.cmbZoomOut.TabIndex = 10;
- //
- // label15
- //
- this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(7, 127);
- this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(43, 13);
- this.label15.TabIndex = 9;
- this.label15.Text = "ZoomIn";
- //
- // cmbZoomIn
- //
- this.cmbZoomIn.FormattingEnabled = true;
- this.cmbZoomIn.Location = new System.Drawing.Point(79, 124);
- this.cmbZoomIn.Name = "cmbZoomIn";
- this.cmbZoomIn.Size = new System.Drawing.Size(160, 21);
- this.cmbZoomIn.TabIndex = 8;
- //
- // label14
- //
- this.label14.AutoSize = true;
- this.label14.Location = new System.Drawing.Point(7, 100);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(59, 13);
- this.label14.TabIndex = 7;
- this.label14.Text = "MoveRight";
- //
- // cmbMoveRight
- //
- this.cmbMoveRight.FormattingEnabled = true;
- this.cmbMoveRight.Location = new System.Drawing.Point(79, 97);
- this.cmbMoveRight.Name = "cmbMoveRight";
- this.cmbMoveRight.Size = new System.Drawing.Size(160, 21);
- this.cmbMoveRight.TabIndex = 6;
- //
- // label13
- //
- this.label13.AutoSize = true;
- this.label13.Location = new System.Drawing.Point(7, 46);
- this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(62, 13);
- this.label13.TabIndex = 5;
- this.label13.Text = "MoveDown";
- //
- // cmbMoveDown
- //
- this.cmbMoveDown.FormattingEnabled = true;
- this.cmbMoveDown.Location = new System.Drawing.Point(79, 43);
- this.cmbMoveDown.Name = "cmbMoveDown";
- this.cmbMoveDown.Size = new System.Drawing.Size(160, 21);
- this.cmbMoveDown.TabIndex = 4;
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(7, 73);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(52, 13);
- this.label12.TabIndex = 3;
- this.label12.Text = "MoveLeft";
- //
- // cmbMoveLeft
- //
- this.cmbMoveLeft.FormattingEnabled = true;
- this.cmbMoveLeft.Location = new System.Drawing.Point(79, 70);
- this.cmbMoveLeft.Name = "cmbMoveLeft";
- this.cmbMoveLeft.Size = new System.Drawing.Size(160, 21);
- this.cmbMoveLeft.TabIndex = 2;
- //
- // label11
- //
- this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(7, 19);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(48, 13);
- this.label11.TabIndex = 1;
- this.label11.Text = "MoveUp";
- //
- // cmbMoveUp
- //
- this.cmbMoveUp.FormattingEnabled = true;
- this.cmbMoveUp.Location = new System.Drawing.Point(79, 16);
- this.cmbMoveUp.Name = "cmbMoveUp";
- this.cmbMoveUp.Size = new System.Drawing.Size(160, 21);
- this.cmbMoveUp.TabIndex = 0;
- //
- // tabAbout
- //
- this.tabAbout.Controls.Add(this.linkDocs_Provider2);
- this.tabAbout.Controls.Add(this.linkDocs_Provider1);
- this.tabAbout.Controls.Add(this.labelVer_Provider2);
- this.tabAbout.Controls.Add(this.labelVer_Provider1);
- this.tabAbout.Controls.Add(this.label1);
- this.tabAbout.Controls.Add(this.labelName_Provider2);
- this.tabAbout.Controls.Add(this.labelName_Provider1);
- this.tabAbout.Location = new System.Drawing.Point(4, 22);
- this.tabAbout.Name = "tabAbout";
- this.tabAbout.Padding = new System.Windows.Forms.Padding(3);
- this.tabAbout.Size = new System.Drawing.Size(674, 226);
- this.tabAbout.TabIndex = 2;
- this.tabAbout.Text = "About";
- this.tabAbout.UseVisualStyleBackColor = true;
- //
- // linkDocs_Provider2
- //
- this.linkDocs_Provider2.AutoSize = true;
- this.linkDocs_Provider2.Location = new System.Drawing.Point(272, 154);
- this.linkDocs_Provider2.Name = "linkDocs_Provider2";
- this.linkDocs_Provider2.Size = new System.Drawing.Size(39, 13);
- this.linkDocs_Provider2.TabIndex = 8;
- this.linkDocs_Provider2.TabStop = true;
- this.linkDocs_Provider2.Text = "doc-url";
- this.linkDocs_Provider2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkDocsProvider2LinkClicked);
- //
- // linkDocs_Provider1
- //
- this.linkDocs_Provider1.AutoSize = true;
- this.linkDocs_Provider1.Location = new System.Drawing.Point(272, 86);
- this.linkDocs_Provider1.Name = "linkDocs_Provider1";
- this.linkDocs_Provider1.Size = new System.Drawing.Size(39, 13);
- this.linkDocs_Provider1.TabIndex = 7;
- this.linkDocs_Provider1.TabStop = true;
- this.linkDocs_Provider1.Text = "doc-url";
- this.linkDocs_Provider1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkDocsProvider1LinkClicked);
- //
- // labelVer_Provider2
- //
- this.labelVer_Provider2.AutoSize = true;
- this.labelVer_Provider2.Location = new System.Drawing.Point(152, 154);
- this.labelVer_Provider2.Name = "labelVer_Provider2";
- this.labelVer_Provider2.Size = new System.Drawing.Size(22, 13);
- this.labelVer_Provider2.TabIndex = 6;
- this.labelVer_Provider2.Text = "ver";
- //
- // labelVer_Provider1
- //
- this.labelVer_Provider1.AutoSize = true;
- this.labelVer_Provider1.Location = new System.Drawing.Point(152, 86);
- this.labelVer_Provider1.Name = "labelVer_Provider1";
- this.labelVer_Provider1.Size = new System.Drawing.Size(22, 13);
- this.labelVer_Provider1.TabIndex = 5;
- this.labelVer_Provider1.Text = "ver";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label1.Location = new System.Drawing.Point(260, 17);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(142, 20);
- this.label1.TabIndex = 4;
- this.label1.Text = "Map API providers ";
- //
- // labelName_Provider2
- //
- this.labelName_Provider2.AutoSize = true;
- this.labelName_Provider2.Location = new System.Drawing.Point(52, 154);
- this.labelName_Provider2.Name = "labelName_Provider2";
- this.labelName_Provider2.Size = new System.Drawing.Size(28, 13);
- this.labelName_Provider2.TabIndex = 2;
- this.labelName_Provider2.Text = "Bing";
- //
- // labelName_Provider1
- //
- this.labelName_Provider1.AutoSize = true;
- this.labelName_Provider1.Location = new System.Drawing.Point(52, 86);
- this.labelName_Provider1.Name = "labelName_Provider1";
- this.labelName_Provider1.Size = new System.Drawing.Size(41, 13);
- this.labelName_Provider1.TabIndex = 0;
- this.labelName_Provider1.Text = "Google";
- //
- // btnOk
- //
- this.btnOk.Location = new System.Drawing.Point(627, 259);
- this.btnOk.Name = "btnOk";
- this.btnOk.Size = new System.Drawing.Size(42, 23);
- this.btnOk.TabIndex = 1;
- this.btnOk.Text = "&OK";
- this.btnOk.UseVisualStyleBackColor = true;
- this.btnOk.Click += new System.EventHandler(this.BtnOkClick);
- //
- // btnCancel
- //
- this.btnCancel.Location = new System.Drawing.Point(569, 259);
- this.btnCancel.Name = "btnCancel";
- this.btnCancel.Size = new System.Drawing.Size(52, 23);
- this.btnCancel.TabIndex = 2;
- this.btnCancel.Text = "&Cancel";
- this.btnCancel.UseVisualStyleBackColor = true;
- this.btnCancel.Click += new System.EventHandler(this.BtnCancelClick);
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(40, 84);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(168, 13);
- this.label3.TabIndex = 24;
- this.label3.Text = "Scroll at max zoom factor (meters):";
- //
- // numericUpDownScrollFactor
- //
- this.numericUpDownScrollFactor.Increment = new decimal(new int[] {
- 5,
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(40, 84);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(168, 13);
+ this.label3.TabIndex = 24;
+ this.label3.Text = "Scroll at max zoom factor (meters):";
+ //
+ // cbGenerateActionLogEntries
+ //
+ this.cbGenerateActionLogEntries.AutoSize = true;
+ this.cbGenerateActionLogEntries.Location = new System.Drawing.Point(43, 132);
+ this.cbGenerateActionLogEntries.Name = "cbGenerateActionLogEntries";
+ this.cbGenerateActionLogEntries.Size = new System.Drawing.Size(393, 17);
+ this.cbGenerateActionLogEntries.TabIndex = 23;
+ this.cbGenerateActionLogEntries.Text = "Generate log entries if a remote or keyboard action occurs (for debug reasons)";
+ this.cbGenerateActionLogEntries.UseVisualStyleBackColor = true;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(40, 42);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(147, 13);
+ this.label2.TabIndex = 1;
+ this.label2.Text = "Download time out (seconds):";
+ //
+ // numericUpDownDownloadTimeout
+ //
+ this.numericUpDownDownloadTimeout.Location = new System.Drawing.Point(243, 40);
+ this.numericUpDownDownloadTimeout.Maximum = new decimal(new int[] {
+ 120,
0,
0,
0});
- this.numericUpDownScrollFactor.Location = new System.Drawing.Point(243, 82);
- this.numericUpDownScrollFactor.Maximum = new decimal(new int[] {
- 1000,
+ this.numericUpDownDownloadTimeout.Minimum = new decimal(new int[] {
+ 5,
0,
0,
0});
- this.numericUpDownScrollFactor.Minimum = new decimal(new int[] {
+ this.numericUpDownDownloadTimeout.Name = "numericUpDownDownloadTimeout";
+ this.numericUpDownDownloadTimeout.Size = new System.Drawing.Size(44, 20);
+ this.numericUpDownDownloadTimeout.TabIndex = 0;
+ this.numericUpDownDownloadTimeout.Value = new decimal(new int[] {
5,
0,
0,
0});
- this.numericUpDownScrollFactor.Name = "numericUpDownScrollFactor";
- this.numericUpDownScrollFactor.Size = new System.Drawing.Size(44, 20);
- this.numericUpDownScrollFactor.TabIndex = 25;
- this.numericUpDownScrollFactor.Value = new decimal(new int[] {
- ...
[truncated message content] |
|
From: <che...@us...> - 2011-04-16 17:44:37
|
Revision: 4172
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4172&view=rev
Author: chemelli_sf
Date: 2011-04-16 17:44:28 +0000 (Sat, 16 Apr 2011)
Log Message:
-----------
Migrated to VS2010 and small adjustments for .NET3.5
Modified Paths:
--------------
trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
trunk/plugins/WorldMap/MyWorldMap.csproj
trunk/plugins/WorldMap/MyWorldMap.sln
trunk/plugins/WorldMap/Properties/Resources.Designer.cs
trunk/plugins/WorldMap/Properties/Settings.Designer.cs
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs
trunk/plugins/WorldMap/WorldMap.cs
trunk/plugins/WorldMap/WorldmapConfig.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
trunk/plugins/WorldMap/WorldmapSearch.cs
trunk/plugins/WorldMap/app.config
Modified: trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.3607
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class BingAPIKey {
Modified: trunk/plugins/WorldMap/MyWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.csproj 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/MyWorldMap.csproj 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -9,6 +10,27 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>MyWorldMap</RootNamespace>
<AssemblyName>MyWorldMap</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ <TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -36,25 +58,14 @@
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Core, Version=1.0.4.41510, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Core\bin\Release\Core.dll</HintPath>
- </Reference>
- <Reference Include="Dialogs, Version=1.0.4.41523, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Dialogs\bin\Release\Dialogs.dll</HintPath>
- </Reference>
<Reference Include="Microsoft.DirectX.Direct3D, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
+ <Reference Include="System.EnterpriseServices" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
- <Reference Include="Utils, Version=2.2.7.41503, Culture=neutral, processorArchitecture=x86">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\mediaportal\trunk\mediaportal\Utils\bin\Release\Utils.dll</HintPath>
- </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="LocalizeStrings.cs" />
@@ -79,7 +90,6 @@
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Reference.map</DependentUpon>
- <SubType>Component</SubType>
</Compile>
<Compile Include="WorldmapConfig.cs">
<SubType>Form</SubType>
@@ -162,6 +172,40 @@
<CachedSettingsPropName>MyWorldMap_ImageryService_ImageryService</CachedSettingsPropName>
</WebReferenceUrl>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="__externals__\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Core\Core.csproj">
+ <Project>{02FFFC1F-2555-4B99-8B01-3432D0673855}</Project>
+ <Name>Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Dialogs\Dialogs.csproj">
+ <Project>{396C5208-5D46-4A11-92C1-FD0F2F42D7DD}</Project>
+ <Name>Dialogs</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\mediaportal1\trunk\mediaportal\Utils\Utils.csproj">
+ <Project>{6DA0E4DF-6230-4642-98B5-E690BB6942BB}</Project>
+ <Name>Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\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/WorldMap/MyWorldMap.sln
===================================================================
--- trunk/plugins/WorldMap/MyWorldMap.sln 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/MyWorldMap.sln 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,20 +1,111 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyWorldMap", "MyWorldMap.csproj", "{857D8A0C-FB95-4A26-8ED6-8E51586D2116}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "..\..\..\..\mediaportal1\trunk\mediaportal\Utils\Utils.csproj", "{6DA0E4DF-6230-4642-98B5-E690BB6942BB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "__externals__", "__externals__", "{E63D9A4B-04C7-4B2D-A7F3-2145899A5B08}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialogs", "..\..\..\..\mediaportal1\trunk\mediaportal\Dialogs\Dialogs.csproj", "{396C5208-5D46-4A11-92C1-FD0F2F42D7DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "..\..\..\..\mediaportal1\trunk\mediaportal\Core\Core.csproj", "{02FFFC1F-2555-4B99-8B01-3432D0673855}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
+ Release (Standalone)|Any CPU = Release (Standalone)|Any CPU
+ Release (Standalone)|x86 = Release (Standalone)|x86
+ Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
+ UseCaptureCardDefinitions|Any CPU = UseCaptureCardDefinitions|Any CPU
+ UseCaptureCardDefinitions|x86 = UseCaptureCardDefinitions|x86
+ UseCaptureDefintionsRelease|Any CPU = UseCaptureDefintionsRelease|Any CPU
+ UseCaptureDefintionsRelease|x86 = UseCaptureDefintionsRelease|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|Any CPU.Build.0 = Debug|Any CPU
{857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.ActiveCfg = Debug|x86
{857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Debug|x86.Build.0 = Debug|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|x86.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release (Standalone)|x86.Build.0 = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|Any CPU.Build.0 = Release|Any CPU
{857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.ActiveCfg = Release|x86
{857D8A0C-FB95-4A26-8ED6-8E51586D2116}.Release|x86.Build.0 = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86
+ {857D8A0C-FB95-4A26-8ED6-8E51586D2116}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|x86.ActiveCfg = Debug|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Debug|x86.Build.0 = Debug|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|x86.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release (Standalone)|x86.Build.0 = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|x86.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.Release|x86.Build.0 = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|x86.ActiveCfg = Debug|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Debug|x86.Build.0 = Debug|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|Any CPU.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|x86.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release (Standalone)|x86.Build.0 = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|x86.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.Release|x86.Build.0 = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|x86.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureCardDefinitions|x86.Build.0 = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|Any CPU.Build.0 = Release|Any CPU
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|x86.ActiveCfg = Release|x86
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD}.UseCaptureDefintionsRelease|x86.Build.0 = Release|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|x86.ActiveCfg = Debug|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Debug|x86.Build.0 = Debug|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|Any CPU.ActiveCfg = Release (Standalone)|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|Any CPU.Build.0 = Release (Standalone)|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|x86.ActiveCfg = Release (Standalone)|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release (Standalone)|x86.Build.0 = Release (Standalone)|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|Any CPU.Build.0 = Release|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|x86.ActiveCfg = Release|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.Release|x86.Build.0 = Release|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|Any CPU.ActiveCfg = UseCaptureCardDefinitions|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|Any CPU.Build.0 = UseCaptureCardDefinitions|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|x86.ActiveCfg = UseCaptureCardDefinitions|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureCardDefinitions|x86.Build.0 = UseCaptureCardDefinitions|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|Any CPU.ActiveCfg = UseCaptureDefintionsRelease|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|Any CPU.Build.0 = UseCaptureDefintionsRelease|Any CPU
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|x86.ActiveCfg = UseCaptureDefintionsRelease|x86
+ {02FFFC1F-2555-4B99-8B01-3432D0673855}.UseCaptureDefintionsRelease|x86.Build.0 = UseCaptureDefintionsRelease|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {6DA0E4DF-6230-4642-98B5-E690BB6942BB} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08}
+ {396C5208-5D46-4A11-92C1-FD0F2F42D7DD} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08}
+ {02FFFC1F-2555-4B99-8B01-3432D0673855} = {E63D9A4B-04C7-4B2D-A7F3-2145899A5B08}
+ EndGlobalSection
EndGlobal
Modified: trunk/plugins/WorldMap/Properties/Resources.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/Properties/Resources.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -19,7 +19,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+ [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 {
Modified: trunk/plugins/WorldMap/Properties/Settings.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/Settings.Designer.cs 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/Properties/Settings.Designer.cs 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -12,7 +12,7 @@
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/Settings.cs 2011-04-16 17:44:28 UTC (rev 4172)
@@ -30,14 +30,14 @@
public static string ParmDownloadTimeOut = "parmdownloadtimeout";
public static string ParmScrollFactor = "parmscrollfactor";
// Actions
- public Action.ActionType ActionMoveDown;
- public Action.ActionType ActionMoveLeft;
- public Action.ActionType ActionMoveRight;
- public Action.ActionType ActionMoveUp;
- public Action.ActionType ActionToggleProvider;
- public Action.ActionType ActionToggleView;
- public Action.ActionType ActionZoomIn;
- public Action.ActionType ActionZoomOut;
+ public MediaPortal.GUI.Library.Action.ActionType ActionMoveDown;
+ public MediaPortal.GUI.Library.Action.ActionType ActionMoveLeft;
+ public MediaPortal.GUI.Library.Action.ActionType ActionMoveRight;
+ public MediaPortal.GUI.Library.Action.ActionType ActionMoveUp;
+ public MediaPortal.GUI.Library.Action.ActionType ActionToggleProvider;
+ public MediaPortal.GUI.Library.Action.ActionType ActionToggleView;
+ public MediaPortal.GUI.Library.Action.ActionType ActionZoomIn;
+ public MediaPortal.GUI.Library.Action.ActionType ActionZoomOut;
public int DownLoadTimeOut;
public bool GenerateActionLogEntries;
public double LastLatitude;
@@ -74,30 +74,30 @@
ScrollFactor = reader.GetValueAsInt(SectionName, ParmScrollFactor, 5);
ActionMoveUp =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionMoveUp, (int) (Action.ActionType.ACTION_MOVE_UP));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionMoveUp, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_UP));
ActionMoveDown =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionMoveDown, (int) (Action.ActionType.ACTION_MOVE_DOWN));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionMoveDown, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_DOWN));
ActionMoveLeft =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionMoveLeft, (int) (Action.ActionType.ACTION_MOVE_LEFT));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionMoveLeft, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT));
ActionMoveRight =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionMoveRight, (int) (Action.ActionType.ACTION_MOVE_RIGHT));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionMoveRight, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT));
ActionZoomIn =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionZoomIn, (int) (Action.ActionType.ACTION_PAGE_UP));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionZoomIn, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_UP));
ActionZoomOut =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionZoomOut, (int) (Action.ActionType.ACTION_PAGE_DOWN));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionZoomOut, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_PAGE_DOWN));
ActionToggleView =
- (Action.ActionType)
- reader.GetValueAsInt(SectionName, ParmActionToggleView, (int) (Action.ActionType.ACTION_REMOTE_BLUE_BUTTON));
+ (MediaPortal.GUI.Library.Action.ActionType)
+ reader.GetValueAsInt(SectionName, ParmActionToggleView, (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_REMOTE_BLUE_BUTTON));
ActionToggleProvider =
- (Action.ActionType)
+ (MediaPortal.GUI.Library.Action.ActionType)
reader.GetValueAsInt(SectionName, ParmActionToggleProvider,
- (int) (Action.ActionType.ACTION_REMOTE_YELLOW_BUTTON));
+ (int)(MediaPortal.GUI.Library.Action.ActionType.ACTION_REMOTE_YELLOW_BUTTON));
GenerateActionLogEntries = reader.GetValueAsBool(SectionName, ParmGenerateLogEntries, false);
}
Modified: trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs
===================================================================
--- trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs 2011-04-16 04:06:13 UTC (rev 4171)
+++ trunk/plugins/WorldMap/Web References/ImageryService/Reference.cs 2011-04-16 17:44:28 UTC (rev 4172)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:2.0.50727.4927
+// Runtime Version:4.0.30319.225
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -9,1693 +9,1958 @@
//------------------------------------------------------------------------------
//
-// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4927.
+// This source code was auto-generated by Microsoft.VSDesigner, Version 4.0.30319.225.
//
-using System;
-using System.CodeDom.Compiler;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Threading;
-using System.Web.Services;
-using System.Web.Services.Description;
-using System.Web.Services.Protocols;
-using System.Xml.Serialization;
-using MyWorldMap.Properties;
-
#pragma warning disable 1591
-namespace MyWorldMap.ImageryService
-{
- /// <remarks/>
- [GeneratedCode("System.Web.Services", "2.0.50727.4927")]
- [DebuggerStepThrough]
- [DesignerCategory("code")]
- [WebServiceBinding(Name = "BasicHttpBinding_IImageryService",
- Namespace = "http://dev.virtualearth.net/webservices/v1/imagery")]
- [XmlInclude(typeof (ResponseBase))]
- [XmlInclude(typeof (RequestBase))]
- public class ImageryService : SoapHttpClientProtocol
- {
- private SendOrPostCallback GetImageryMetadataOperationCompleted;
-
- private SendOrPostCallback GetMapUriOperationCompleted;
-
- private bool useDefaultCredentialsSetExplicitly;
-
+namespace MyWorldMap.ImageryService {
+ using System;
+ using System.Web.Services;
+ using System.Diagnostics;
+ using System.Web.Services.Protocols;
+ using System.ComponentModel;
+ using System.Xml.Serialization;
+
+
/// <remarks/>
- public ImageryService()
- {
- Url = Settings.Default.MyWorldMap_ImageryService_ImageryService;
- if (IsLocalFileSystemWebService(Url))
- {
- UseDefaultCredentials = true;
- useDefaultCredentialsSetExplicitly = false;
- }
- else
- {
- useDefaultCredentialsSetExplicitly = true;
- }
- }
-
- public new string Url
- {
- get { return base.Url; }
- set
- {
- if (((IsLocalFileSystemWebService(base.Url)
- && (useDefaultCredentialsSetExplicitly == false))
- && (IsLocalFileSystemWebService(value) == false)))
- {
- base.UseDefaultCredentials = false;
+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "4.0.30319.1")]
+ [System.Diagnostics.DebuggerStepThroughAttribute()]
+ [System.ComponentModel.DesignerCategoryAttribute("code")]
+ [System.Web.Services.WebServiceBindingAttribute(Name="BasicHttpBinding_IImageryService", Namespace="http://dev.virtualearth.net/webservices/v1/imagery")]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(ResponseBase))]
+ [System.Xml.Serialization.XmlIncludeAttribute(typeof(RequestBase))]
+ public partial class ImageryService : System.Web.Services.Protocols.SoapHttpClientProtocol {
+
+ private System.Threading.SendOrPostCallback GetImageryMetadataOperationCompleted;
+
+ private System.Threading.SendOrPostCallback GetMapUriOperationCompleted;
+
+ private bool useDefaultCredentialsSetExplicitly;
+
+ /// <remarks/>
+ public ImageryService() {
+ this.Url = global::MyWorldMap.Properties.Settings.Default.MyWorldMap_ImageryService_ImageryService;
+ if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
+ this.UseDefaultCredentials = true;
+ this.useDefaultCredentialsSetExplicitly = false;
+ }
+ else {
+ this.useDefaultCredentialsSetExplicitly = true;
+ }
}
- base.Url = value;
- }
+
+ public new string Url {
+ get {
+ return base.Url;
+ }
+ set {
+ if ((((this.IsLocalFileSystemWebService(base.Url) == true)
+ && (this.useDefaultCredentialsSetExplicitly == false))
+ && (this.IsLocalFileSystemWebService(value) == false))) {
+ base.UseDefaultCredentials = false;
+ }
+ base.Url = value;
+ }
+ }
+
+ public new bool UseDefaultCredentials {
+ get {
+ return base.UseDefaultCredentials;
+ }
+ set {
+ base.UseDefaultCredentials = value;
+ this.useDefaultCredentialsSetExplicitly = true;
+ }
+ }
+
+ /// <remarks/>
+ public event GetImageryMetadataCompletedEventHandler GetImageryMetadataCompleted;
+
+ /// <remarks/>
+ public event GetMapUriCompletedEventHandler GetMapUriCompleted;
+
+ /// <remarks/>
+ [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://dev.virtualearth.net/webservices/v1/imagery/contracts/IImageryService/GetI" +
+ "mageryMetadata", RequestNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", ResponseNamespace="http://dev.virtualearth.net/webservices/v1/imagery/contracts", Use=System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle=System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
+ [return: System.Xml.Serialization.XmlElementAttribute(IsNullable=true)]
+ public ImageryMetadataResponse GetImageryMetadata([System.Xml.Serialization.XmlElementAttribute(IsNullable=true)] ImageryMetadataRequest request) {
+ object[] results = this.Invoke("GetImageryMetadata", new object[] {
+ request});
+ return ((ImageryMetadataRespo...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X