Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4614] trunk/plugins/APODPlugin/APODPlugin
|
From: <jmb...@us...> - 2013-07-24 08:12:34
|
Revision: 4614
http://sourceforge.net/p/mp-plugins/code/4614
Author: jmbillings
Date: 2013-07-24 08:12:30 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Fix bugs on re-entering plugin (hopefully). Still not sure how to get it to go black.
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/DefaultWide/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml
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/DefaultWide/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-24 08:12:30 UTC (rev 4614)
@@ -33,6 +33,13 @@
apodURLs.Add(APODURL);
}
+ internal void Dispose()
+ {
+ client.OpenReadCompleted -= new OpenReadCompletedEventHandler(readComplete);
+ imageClient.OpenReadCompleted -= new OpenReadCompletedEventHandler(imageReadComplete);
+ client.Dispose();
+ }
+
internal bool GetImage(int step, directions d)
{
try
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-24 08:12:30 UTC (rev 4614)
@@ -25,6 +25,7 @@
int imageStep = 0;
APODDownloader downloader;
bool downloading = true;
+ System.Timers.Timer oneShotTimer;
public APODPlugin()
{
@@ -119,8 +120,6 @@
public override bool Init()
{
bool ls = Load(GUIGraphicsContext.Skin + @"\APODPlugin.xml");
- base.InitControls();
- base.NeedRefresh();
return ls;
}
@@ -129,17 +128,37 @@
base.DeInit();
}
+ protected override void OnPageDestroy(int newWindowId)
+ {
+ downloader.onDownloadError -= downloader_onDownloadError;
+ downloader.onDownloadComplete -= downloader_onDownloadComplete;
+ downloader.onDownloadNoImageFound -= downloader_onDownloadNoImageFound;
+ downloader.Dispose();
+ oneShotTimer.Elapsed -= oneShotTimer_Elapsed;
+ imageStep = 0;
+ GUIWaitCursor.Hide();
+ base.OnPageDestroy(newWindowId);
+ }
+
protected override void OnPageLoad()
- {
- image.Refresh();
+ {
GUIWaitCursor.Show();
- downloader = new APODDownloader();
+ downloader = new APODDownloader();
downloader.onDownloadError += downloader_onDownloadError;
downloader.onDownloadComplete += downloader_onDownloadComplete;
downloader.onDownloadNoImageFound += downloader_onDownloadNoImageFound;
- downloader.GetImage(imageStep, directions.LEFT);
+ oneShotTimer = new System.Timers.Timer(128);
+ oneShotTimer.Elapsed += oneShotTimer_Elapsed;
+ oneShotTimer.Start();
}
+ void oneShotTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
+ {
+ oneShotTimer.Stop();
+ //System.Threading.Thread.Sleep(5000);
+ //downloader.GetImage(imageStep, directions.LEFT);
+ }
+
public override void OnAction(MediaPortal.GUI.Library.Action action)
{
base.OnAction(action);
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-24 08:12:30 UTC (rev 4614)
@@ -77,6 +77,7 @@
</Content>
<Content Include="PureVisionHD 1080\APODPlugin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <SubType>Designer</SubType>
</Content>
<Content Include="PureVisionHD 1080\hover_APOD.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Modified: trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>960</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1280</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -8,7 +8,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1920</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -13,6 +13,7 @@
<width>1920</width>
<height>1080</height>
<texture>black.jpg</texture>
+ <visible>true</visible>
</control>
<control>
<description>image</description>
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-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>960</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1280</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -8,7 +8,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1920</width>
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-24 08:12:30 UTC (rev 4614)
@@ -13,6 +13,7 @@
<width>1920</width>
<height>1080</height>
<texture>black.jpg</texture>
+ <visible>true</visible>
</control>
<control>
<description>image</description>
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-23 08:45:13 UTC (rev 4613)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-24 08:12:30 UTC (rev 4614)
@@ -46,3 +46,4 @@
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\DefaultWide\hover_APOD.png
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Default\hover_APOD.png
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PureVisionHD 1080\hover_APOD.png
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.csprojResolveAssemblyReference.cache
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
