Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins: [1137] trunk/plugins/WorldMap
|
From: <lk...@us...> - 2007-12-10 07:26:27
|
Revision: 1137
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1137&view=rev
Author: lkuech
Date: 2007-12-09 23:26:11 -0800 (Sun, 09 Dec 2007)
Log Message:
-----------
GM Terrain Maps now working
default skinfiles do now come with a "topbar disable"-tag
Enter (or OK on the remote) in the main screen now brings up the maptype selection
FIX: GM Terrain maps did ignore the relevant threadCount.
Modified Paths:
--------------
trunk/plugins/WorldMap/GUIWorldMap.csproj
trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
trunk/plugins/WorldMap/Settings.cs
trunk/plugins/WorldMap/WorldMap.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapMenu.xml
trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearch.xml
trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearchResults.xml
trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapMenu.xml
trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearch.xml
trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearchResults.xml
Added Paths:
-----------
trunk/plugins/WorldMap/System.Data.SQLite.DLL
Modified: trunk/plugins/WorldMap/GUIWorldMap.csproj
===================================================================
--- trunk/plugins/WorldMap/GUIWorldMap.csproj 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/GUIWorldMap.csproj 2007-12-10 07:26:11 UTC (rev 1137)
@@ -36,15 +36,21 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Dialogs\bin\Debug\Dialogs.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.DirectX, Version=1.0.2902.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
- <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="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="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>bin\Debug\System.Data.SQLite.DLL</HintPath>
+ <HintPath>.\System.Data.SQLite.DLL</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
Modified: trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/MAPS/ThreadedDownload.cs 2007-12-10 07:26:11 UTC (rev 1137)
@@ -137,6 +137,8 @@
break;
case MapFunctions.MapType.GMHybrid: maxThreadCount = mapConfig.ThreadCountGMH;
break;
+ case MapFunctions.MapType.GMTerrain: maxThreadCount = mapConfig.ThreadCountGMT;
+ break;
case MapFunctions.MapType.VERoad: maxThreadCount = mapConfig.ThreadCountVER;
break;
case MapFunctions.MapType.VEAerial: maxThreadCount = mapConfig.ThreadCountVEA;
Modified: trunk/plugins/WorldMap/Settings.cs
===================================================================
--- trunk/plugins/WorldMap/Settings.cs 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/Settings.cs 2007-12-10 07:26:11 UTC (rev 1137)
@@ -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=18&t={1}");
+ GMAUrl = reader.GetValueAsString(SectionName, ParmGMAUrl, "http://kh{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}");
Added: trunk/plugins/WorldMap/System.Data.SQLite.DLL
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/WorldMap/System.Data.SQLite.DLL
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/WorldMap/WorldMap.cs
===================================================================
--- trunk/plugins/WorldMap/WorldMap.cs 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/WorldMap.cs 2007-12-10 07:26:11 UTC (rev 1137)
@@ -95,6 +95,7 @@
Settings settings;
bool VisibleImageChanged = false;
+ bool MapTypeMenuShown = false;
WorldmapMenu Menu = null;
WorldmapSearch Search = null;
@@ -463,6 +464,11 @@
GUIWindowManager.ActivateWindow(Menu.GetID);
}
break;
+ case Action.ActionType.ACTION_SELECT_ITEM:
+ {
+ ChooseMapType();
+ }
+ break;
case Action.ActionType.ACTION_KEY_PRESSED:
{
if (action.m_key.KeyChar == 'r')
@@ -531,6 +537,64 @@
Log.Debug("[Worldmap] Calcalation result: ScreenWidth:MinZoomLevel:mapTiles {0}:{1}:{2}", GUIGraphicsContext.Width, MinZoomLevel, tmpMapTiles);
}
+ public void ChooseMapType()
+ {
+ if (MapTypeMenuShown) return;
+ MapTypeMenuShown = true;
+
+ GUIDialogMenu Menu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
+
+ Menu.Reset();
+ Menu.SetHeading("Choose a maptype");
+
+ Array tmpMapTypes = Enum.GetValues(typeof(MapFunctions.MapType));
+
+ for (int i = 0; i < tmpMapTypes.Length; i++)
+ {
+ MapFunctions.MapType tmpMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), i));
+ switch (tmpMapType)
+ {
+ case MapFunctions.MapType.GMRoad:
+ Menu.Add("Google Road");
+ break;
+ case MapFunctions.MapType.GMTerrain:
+ Menu.Add("Google Terrain");
+ break;
+ case MapFunctions.MapType.GMAerial:
+ Menu.Add("Google Satellite");
+ break;
+ case MapFunctions.MapType.GMHybrid:
+ Menu.Add("Google Hybrid");
+ break;
+ case MapFunctions.MapType.VERoad:
+ Menu.Add("Microsoft Road");
+ break;
+ case MapFunctions.MapType.VEAerial:
+ Menu.Add("Microsoft Satellite");
+ break;
+ case MapFunctions.MapType.VEHybrid:
+ Menu.Add("Microsoft Hybrid");
+ break;
+ }
+ }
+
+ Menu.SelectedLabel = Convert.ToInt32(this.currentMapType);
+
+ Menu.DoModal(GUIWindowManager.ActiveWindow);
+ MapTypeMenuShown = false;
+
+ if (Menu.SelectedLabel == -1)
+ return;
+
+ //WorldMap tmpMainWindow = (WorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow);
+
+ //tmpMainWindow.currentMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), Menu.SelectedLabel));
+ //tmpMainWindow.RefreshImageTiles();
+ this.currentMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), Menu.SelectedLabel));
+ this.RefreshImageTiles();
+ }
+
+
public override void Render(float timePassed)
{
int ThreadsRunning = 0;
Modified: trunk/plugins/WorldMap/WorldmapMenu.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapMenu.cs 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/WorldmapMenu.cs 2007-12-10 07:26:11 UTC (rev 1137)
@@ -127,31 +127,8 @@
private void ChooseMapType()
{
- if (MenuShown) return;
- MenuShown = true;
-
- GUIDialogMenu Menu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU);
-
- Menu.Reset();
- Menu.SetHeading("Choose a maptype");
-
- Array tmpMapTypes = Enum.GetValues(typeof(MapFunctions.MapType));
-
- for (int i = 0; i < tmpMapTypes.Length; i++)
- {
- Menu.Add(((MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), i))).ToString());
- }
-
- Menu.DoModal(GUIWindowManager.ActiveWindow);
- MenuShown = false;
-
- if (Menu.SelectedLabel == -1)
- return;
-
WorldMap tmpMainWindow = (WorldMap)GUIWindowManager.GetWindow((int)WorldmapWindowIDs.MainWindow);
-
- tmpMainWindow.currentMapType = (MapFunctions.MapType)(Enum.ToObject(typeof(MapFunctions.MapType), Menu.SelectedLabel));
- tmpMainWindow.RefreshImageTiles();
+ tmpMainWindow.ChooseMapType();
}
private void ShowLastResults()
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapMenu.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapMenu.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapMenu.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -3,6 +3,7 @@
<id>10235</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<description>background</description>
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearch.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearch.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearch.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -2,6 +2,7 @@
<id>10236</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<type>image</type>
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearchResults.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearchResults.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo/MyWorldmapSearchResults.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -2,6 +2,7 @@
<id>10237</id>
<defaultcontrol>5</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<type>image</type>
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapMenu.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapMenu.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapMenu.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -3,6 +3,7 @@
<id>10235</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<description>background</description>
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearch.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearch.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearch.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -2,6 +2,7 @@
<id>10236</id>
<defaultcontrol>2</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<type>image</type>
Modified: trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearchResults.xml
===================================================================
--- trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearchResults.xml 2007-12-09 06:00:45 UTC (rev 1136)
+++ trunk/plugins/WorldMap/skinFiles/BlueTwo wide/MyWorldmapSearchResults.xml 2007-12-10 07:26:11 UTC (rev 1137)
@@ -2,6 +2,7 @@
<id>10237</id>
<defaultcontrol>5</defaultcontrol>
<allowoverlay>no</allowoverlay>
+ <disabletopbar>yes</disabletopbar>
<controls>
<control>
<type>image</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
