Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4607] trunk/plugins/APODPlugin
|
From: <jmb...@us...> - 2013-07-16 09:53:50
|
Revision: 4607
http://sourceforge.net/p/mp-plugins/code/4607
Author: jmbillings
Date: 2013-07-16 09:53:43 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Update to start fixing skin issues.
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
trunk/plugins/APODPlugin/MPE/update.xml
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-16 09:53:43 UTC (rev 4607)
@@ -43,7 +43,7 @@
client.OpenReadAsync(new Uri(apodURLs[step]));
return true;
}
- catch (IndexOutOfRangeException ex)
+ catch (IndexOutOfRangeException)
{
return false; //no image to get!
}
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-16 09:53:43 UTC (rev 4607)
@@ -12,6 +12,8 @@
{
public class APODPlugin : GUIWindow, ISetupForm
{
+ [SkinControlAttribute(0)]
+ protected GUIImage bgimage = null;
[SkinControlAttribute(4)]
protected GUIImage image = null;
[SkinControlAttribute(5)]
@@ -119,6 +121,8 @@
protected override void OnPageLoad()
{
+ bgimage.DoUpdate();
+
GUIWaitCursor.Show();
downloader = new APODDownloader();
downloader.onDownloadError += downloader_onDownloadError;
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-16 09:53:43 UTC (rev 4607)
@@ -69,6 +69,7 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="PureVisionHD 1080\APODPlugin.xml" />
<Content Include="Titan\APODPlugin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
Modified: trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-16 09:53:43 UTC (rev 4607)
@@ -1,4 +1,5 @@
<window>
+ <!--Default 720x576-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
@@ -8,25 +9,37 @@
<description>image</description>
<type>image</type>
<id>4</id>
- <posX>0</posX>
- <posY>0</posY>
+ <posX>16</posX>
+ <posY>48</posY>
+ <width>540</width>
+ <height>512</height>
</control>
-
<control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>16</posX>
+ <posY>8</posY>
+ <width>540</width>
+ <height>40</height>
+ <font>font16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>48</posX>
+ <posX>556</posX>
<posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
+ <width>156</width>
+ <height>512</height>
+ <font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
<scrollStartDelaySec>3</scrollStartDelaySec>
<spaceBetweenItems>4</spaceBetweenItems>
</control>
-
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-16 09:53:43 UTC (rev 4607)
@@ -36,5 +36,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.5.3")]
+[assembly: AssemblyFileVersion("1.0.5.3")]
Modified: trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-16 09:53:43 UTC (rev 4607)
@@ -41,6 +41,15 @@
<scrollStartDelaySec>3</scrollStartDelaySec>
<spaceBetweenItems>4</spaceBetweenItems>
</control>
-
+ <control>
+ <description>verticalbar</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>1558</posX>
+ <posY>128</posY>
+ <width>1</width>
+ <height>920</height>
+ <texture>bar_vert.png</texture>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml 2013-07-16 09:53:43 UTC (rev 4607)
@@ -1,4 +1,5 @@
<window>
+ <!--Default 720x576-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
@@ -8,25 +9,37 @@
<description>image</description>
<type>image</type>
<id>4</id>
- <posX>0</posX>
- <posY>0</posY>
+ <posX>16</posX>
+ <posY>48</posY>
+ <width>540</width>
+ <height>512</height>
</control>
-
<control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>16</posX>
+ <posY>8</posY>
+ <width>540</width>
+ <height>40</height>
+ <font>font16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>48</posX>
+ <posX>556</posX>
<posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
+ <width>156</width>
+ <height>512</height>
+ <font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
<scrollStartDelaySec>3</scrollStartDelaySec>
<spaceBetweenItems>4</spaceBetweenItems>
</control>
-
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-16 09:53:43 UTC (rev 4607)
@@ -41,6 +41,15 @@
<scrollStartDelaySec>3</scrollStartDelaySec>
<spaceBetweenItems>4</spaceBetweenItems>
</control>
-
+ <control>
+ <description>verticalbar</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>1558</posX>
+ <posY>128</posY>
+ <width>1</width>
+ <height>920</height>
+ <texture>bar_vert.png</texture>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
===================================================================
--- trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-07-16 09:53:43 UTC (rev 4607)
@@ -20,23 +20,23 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <LocalFileName>..\APODPlugin\bin\Debug\Default\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
- <DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Default\APODPlugin.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <LocalFileName>..\APODPlugin\bin\Debug\DefaultWide\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{2e8ca333-8c7c-4698-8306-c471adc7df71}-APODPlugin.xml</ZipFileName>
- <DestinationFilename>%Skin%\Default\APODPlugin.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\DefaultWide\APODPlugin.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <LocalFileName>..\APODPlugin\bin\Debug\Titan\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{5fcfa3ae-4095-4fef-9110-c3a1d1a1865e}-APODPlugin.xml</ZipFileName>
- <DestinationFilename>%Skin%\DefaultWide\APODPlugin.xml</DestinationFilename>
+ <DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
</FileItem>
</Items>
</Files>
@@ -150,6 +150,25 @@
<Dependencies>
<Items>
<DependencyItem>
+ <Type>Skin</Type>
+ <Id />
+ <MinVersion>
+ <Major>1</Major>
+ <Minor>1</Minor>
+ <Build>6</Build>
+ <Revision>27644</Revision>
+ </MinVersion>
+ <MaxVersion>
+ <Major>1</Major>
+ <Minor>4</Minor>
+ <Build>1</Build>
+ <Revision>1</Revision>
+ </MaxVersion>
+ <WarnOnly>true</WarnOnly>
+ <Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ <DependencyItem>
<Type>MediaPortal</Type>
<Id />
<MinVersion>
@@ -200,16 +219,14 @@
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>4</Build>
- <Revision>1</Revision>
+ <Build>5</Build>
+ <Revision>3</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription>Fix bug where APOD video pages broke the plugin
-
-1.4.0 compatibility</VersionDescription>
- <DevelopmentStatus>Rc</DevelopmentStatus>
+ <VersionDescription>New skin files, add display of info and title for image.</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
+ <ReleaseDate>2013-07-14T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
@@ -256,15 +273,29 @@
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
<UpdateOption>AlwaysOverwrite</UpdateOption>
- <LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
+ <LocalFileName>..\APODPlugin\bin\Debug\Default\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\Default\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\DefaultWide\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{2e8ca333-8c7c-4698-8306-c471adc7df71}-APODPlugin.xml</ZipFileName>
+ <DestinationFilename>%Skin%\DefaultWide\APODPlugin.xml</DestinationFilename>
+ </FileItem>
+ <FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
+ <Param1 />
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
+ <LocalFileName>..\APODPlugin\bin\Debug\Titan\APODPlugin.xml</LocalFileName>
+ <ZipFileName>Installer{CopyFile}\{5fcfa3ae-4095-4fef-9110-c3a1d1a1865e}-APODPlugin.xml</ZipFileName>
<DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="true" Modified="true">
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>M42-130202.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{5c23f5fb-2975-416c-9574-47721cd997de}-M42-130202.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{7fcacc68-9dad-4a8b-b50d-284477883368}-M42-130202.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml 2013-07-13 10:35:40 UTC (rev 4606)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-07-16 09:53:43 UTC (rev 4607)
@@ -21,7 +21,7 @@
<Dependencies>
<Items>
<DependencyItem>
- <Type>MediaPortal</Type>
+ <Type>Skin</Type>
<Id />
<MinVersion>
<Major>1</Major>
@@ -31,94 +31,14 @@
</MinVersion>
<MaxVersion>
<Major>1</Major>
- <Minor>1</Minor>
- <Build>6</Build>
- <Revision>27644</Revision>
+ <Minor>4</Minor>
+ <Build>1</Build>
+ <Revision>1</Revision>
</MaxVersion>
- <WarnOnly>false</WarnOnly>
+ <WarnOnly>true</WarnOnly>
<Message>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
<Name>MediaPortal</Name>
</DependencyItem>
- </Items>
- </Dependencies>
- <PluginDependencies>
- <Items />
- </PluginDependencies>
- <GeneralInfo>
- <Name>APODPlugin</Name>
- <Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
- <Author>jmbillings</Author>
- <HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
- <ForumPage>http://forum.team-mediaportal.com/threads/apod-astronomy-picture-of-the-day-plugin.117456/</ForumPage>
- <UpdateUrl>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=52</UpdateUrl>
- <Version>
- <Major>1</Major>
- <Minor>0</Minor>
- <Build>4</Build>
- <Revision>0</Revision>
- </Version>
- <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription>Fix bug where APOD video pages broke the plugin
-1.4.0 compatibility</VersionDescription>
- <DevelopmentStatus>Rc</DevelopmentStatus>
- <OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
- <Tags />
- <Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
- <Params>
- <Items>
- <SectionParam Name="Online Icon">
- <Value>http://www.team-mediaportal.com/components/com_mtree/img/listings/s/1882.jpg</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 it has .exe extension the will be executed.
- If it has .dll extension it's started 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>
- <PackageClass>
- <Version>2.0</Version>
- <Groups>
- <Items>
- <GroupItem Name="Default">
- <DisplayName>Default</DisplayName>
- <DefaulChecked>true</DefaulChecked>
- <Description>Default</Description>
- <Files>
- <Items />
- </Files>
- </GroupItem>
- </Items>
- </Groups>
- <Sections>
- <Items />
- </Sections>
- <Dependencies>
- <Items>
<DependencyItem>
<Type>MediaPortal</Type>
<Id />
@@ -170,16 +90,14 @@
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>4</Build>
- <Revision>1</Revision>
+ <Build>5</Build>
+ <Revision>3</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription>Fix bug where APOD video pages broke the plugin
-
-1.4.0 compatibility</VersionDescription>
- <DevelopmentStatus>Rc</DevelopmentStatus>
+ <VersionDescription>New skin files, add display of info and title for image.</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://www.team-mediaportal.com/index.php?option=com_mtree&task=att_download&link_id=270&cf_id=24</OnlineLocation>
- <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
+ <ReleaseDate>2013-07-14T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
