Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4574] trunk/plugins/WorldMap
|
From: <nep...@us...> - 2013-06-21 14:06:37
|
Revision: 4574
http://sourceforge.net/p/mp-plugins/code/4574
Author: nephilimdm
Date: 2013-06-21 14:06:34 +0000 (Fri, 21 Jun 2013)
Log Message:
-----------
- 1.4 compatibility
- Better image quality on Google maps
Modified Paths:
--------------
trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2
trunk/plugins/WorldMap/Installer/update.xml
trunk/plugins/WorldMap/MAPS/BingAPI.cs
trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
trunk/plugins/WorldMap/MAPS/GoogleAPI.cs
trunk/plugins/WorldMap/MyWorldMap.suo
trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
trunk/plugins/WorldMap/WorldmapMenu.cs
Added Paths:
-----------
trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1
Modified: trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2
===================================================================
--- trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/Installer/MyWorldmap.xmp2 2013-06-21 14:06:34 UTC (rev 4574)
@@ -392,12 +392,12 @@
</MinVersion>
<MaxVersion>
<Major>1</Major>
- <Minor>3</Minor>
+ <Minor>4</Minor>
<Build>0</Build>
- <Revision>1</Revision>
+ <Revision>0</Revision>
</MaxVersion>
<WarnOnly>true</WarnOnly>
- <Message>requires Skin version 1.3.0.1 to 1.3.0.1.</Message>
+ <Message>requires Skin version 1.3.0.1 to 1.4.0.0.</Message>
<Name>Skin</Name>
</DependencyItem>
</Items>
@@ -409,7 +409,7 @@
<Items>
<CompatibleVersionItem>
<MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
- <DesignedForVersion>1.2.100.0</DesignedForVersion>
+ <DesignedForVersion>1.3.100.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -431,9 +431,9 @@
<UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/update.xml</UpdateUrl>
<Version>
<Major>2</Major>
- <Minor>0</Minor>
+ <Minor>1</Minor>
<Build>0</Build>
- <Revision>9</Revision>
+ <Revision>0</Revision>
</Version>
<ExtensionDescription>Browse the whole world via your remote and watch Road maps, Satellite images or a Hybrid image from Google maps or Microsoft Bing.
</ExtensionDescription>
Added: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1
===================================================================
--- trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1 2013-06-21 14:06:34 UTC (rev 4574)
Property changes on: trunk/plugins/WorldMap/Installer/MyWorldmap_v2.1.0.0Beta.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/WorldMap/Installer/update.xml
===================================================================
--- trunk/plugins/WorldMap/Installer/update.xml 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/Installer/update.xml 2013-06-21 14:06:34 UTC (rev 4574)
@@ -153,5 +153,157 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Languages">
+ <DisplayName>Languages</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Languages</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Bin">
+ <DisplayName>Bin</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Bin</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ </Items>
+ </Groups>
+ <Sections>
+ <Items />
+ </Sections>
+ <Dependencies>
+ <Items>
+ <DependencyItem>
+ <Type>MediaPortal</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MaxVersion>
+ <WarnOnly>false</WarnOnly>
+ <Message>This version of MyWorldMap requires MediaPortal 1.2.0 Beta or higher!</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ <DependencyItem>
+ <Type>Skin</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>3</Minor>
+ <Build>0</Build>
+ <Revision>1</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>4</Minor>
+ <Build>0</Build>
+ <Revision>1</Revision>
+ </MaxVersion>
+ <WarnOnly>true</WarnOnly>
+ <Message>requires Skin version 1.3.0.1 to 1.4.0.0.</Message>
+ <Name>Skin</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="MyWorldMap.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.6.27644</MinRequiredVersion>
+ <DesignedForVersion>1.3.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>MyWorldMap</Name>
+ <Id>e310d391-d250-449e-9425-e0555da60291</Id>
+ <Author>LKuech & Chemelli & Nephilim</Author>
+ <HomePage>http://www.team-mediaportal.com</HomePage>
+ <ForumPage />
+ <UpdateUrl>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/update.xml</UpdateUrl>
+ <Version>
+ <Major>2</Major>
+ <Minor>1</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Browse the whole world via your remote and watch Road maps, Satellite images or a Hybrid image from Google maps or Microsoft Bing.
+</ExtensionDescription>
+ <VersionDescription />
+ <DevelopmentStatus>Beta</DevelopmentStatus>
+ <OnlineLocation>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/MyWorldmap_v2.0.0.9Beta.mpe1</OnlineLocation>
+ <ReleaseDate>2012-12-27T14:17:45</ReleaseDate>
+ <Tags />
+ <Location>D:\Sviluppo\WorldMap\Installer\MyWorldmap_v[Version][DevelopmentStatus].mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <Value>https://mp-plugins.svn.sourceforge.net/svnroot/mp-plugins/trunk/plugins/WorldMap/Installer/globe-compass.ico
+</Value>
+ <ValueType>String</ValueType>
+ <Description>The icon file of the package stored online (jpg,png,bmp)</Description>
+ </SectionParam>
+ <SectionParam Name="Configuration file">
+ <Value />
+ <ValueType>Template</ValueType>
+ <Description>The file used to configure the extension.
+ If have .exe extension the will be executed
+ If have .dll extension used like MP plugin configuration</Description>
+ </SectionParam>
+ <SectionParam Name="Online Screenshots">
+ <Value />
+ <ValueType>String</ValueType>
+ <Description>Online stored screenshot urls separated by ; </Description>
+ </SectionParam>
+ <SectionParam Name="Force to uninstall on update">
+ <Value>YES</Value>
+ <ValueType>Bool</ValueType>
+ <Description>Show dialog and force to uninstall previous version when updating an extension. Should only be disabled if you are using an NSIS/MSI installer.</Description>
+ </SectionParam>
+ </Items>
+ </Params>
+ </GeneralInfo>
+ <UniqueFileList>
+ <Items />
+ </UniqueFileList>
+ <ProjectSettings>
+ <FolderGroups />
+ </ProjectSettings>
+ <IsSkin>false</IsSkin>
+ </PackageClass>
</Items>
</ExtensionCollection>
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MAPS/BingAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPI.cs 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/MAPS/BingAPI.cs 2013-06-21 14:06:34 UTC (rev 4574)
@@ -47,7 +47,6 @@
Credentials = new Credentials
{
// Set credentials using a valid Bing Maps Key
- //ApplicationId = BindAPIKey.Load();
ApplicationId = new System.Resources.ResourceManager("MyWorldMap.MAPS.BingAPIKey", typeof(BingApi).Assembly).GetString("Key")
},
Center = new Location
Modified: trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/MAPS/BingAPIKey.Designer.cs 2013-06-21 14:06:34 UTC (rev 4574)
@@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// Il codice è stato generato da uno strumento.
-// Versione runtime:4.0.30319.17929
+// Versione runtime:4.0.30319.18046
//
// Le modifiche apportate a questo file possono provocare un comportamento non corretto e andranno perse se
// il codice viene rigenerato.
Modified: trunk/plugins/WorldMap/MAPS/GoogleAPI.cs
===================================================================
--- trunk/plugins/WorldMap/MAPS/GoogleAPI.cs 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/MAPS/GoogleAPI.cs 2013-06-21 14:06:34 UTC (rev 4574)
@@ -89,13 +89,13 @@
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";
+ "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&scale=2";
}
}
private static string UrlFormat
{
- get { return "http://maps.google.com/maps/api/staticmap?maptype={0}¢er={1},{2}&zoom={3}&size={4}&sensor=false"; }
+ get { return "http://maps.google.com/maps/api/staticmap?maptype={0}¢er={1},{2}&zoom={3}&size={4}&sensor=false&scale=2&scale=2"; }
}
}
}
\ No newline at end of file
Modified: trunk/plugins/WorldMap/MyWorldMap.suo
===================================================================
(Binary files differ)
Modified: trunk/plugins/WorldMap/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/Properties/AssemblyInfo.cs 2013-06-21 14:06:34 UTC (rev 4574)
@@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("MyWorldMap")]
-[assembly: AssemblyCopyright("(c) 2008 - 2012")]
+[assembly: AssemblyCopyright("(c) 2008 - 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -35,10 +35,10 @@
// Sie können alle Werte angeben oder die standardmäßigen Revisions- und Buildnummern
// übernehmen, indem Sie "*" eingeben:
-[assembly: AssemblyVersion("2.0.0.9")]
-[assembly: AssemblyFileVersion("2.0.0.9")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
// MediaPortal plugin version compatibility
-[assembly: CompatibleVersion("1.2.100.0", "1.1.6.27644")]
+[assembly: CompatibleVersion("1.3.100.0", "1.1.6.27644")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
Modified: trunk/plugins/WorldMap/WorldmapMenu.cs
===================================================================
--- trunk/plugins/WorldMap/WorldmapMenu.cs 2013-06-19 09:03:34 UTC (rev 4573)
+++ trunk/plugins/WorldMap/WorldmapMenu.cs 2013-06-21 14:06:34 UTC (rev 4574)
@@ -32,7 +32,7 @@
protected override void OnPageLoad()
{
- GUIControl.SetControlLabel(GetID, _lblSearchHeader.GetID, PluginGuiLocalizeStrings.Get(30)); // Search...
+ if (_lblSearchHeader!=null) GUIControl.SetControlLabel(GetID, _lblSearchHeader.GetID, PluginGuiLocalizeStrings.Get(30)); // Search...
GUIControl.SetControlLabel(GetID, _btnSearchAdress.GetID, PluginGuiLocalizeStrings.Get(31));
// Address or Location
GUIControl.SetControlLabel(GetID, _btnSearchplaceName.GetID, PluginGuiLocalizeStrings.Get(32));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
