Menu
▾
▴
mp-plugins-svn — SVN Update mailing list
You can subscribe to this list here.
| 2007 |
Jan
(36) |
Feb
(79) |
Mar
(123) |
Apr
(95) |
May
(119) |
Jun
(172) |
Jul
(124) |
Aug
(100) |
Sep
(83) |
Oct
(52) |
Nov
(97) |
Dec
(87) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(131) |
Feb
(80) |
Mar
(163) |
Apr
(178) |
May
(73) |
Jun
(54) |
Jul
(106) |
Aug
(118) |
Sep
(50) |
Oct
(125) |
Nov
(100) |
Dec
(99) |
| 2009 |
Jan
(104) |
Feb
(99) |
Mar
(68) |
Apr
(81) |
May
(52) |
Jun
(87) |
Jul
(67) |
Aug
(33) |
Sep
(27) |
Oct
(37) |
Nov
(60) |
Dec
(116) |
| 2010 |
Jan
(82) |
Feb
(79) |
Mar
(38) |
Apr
(50) |
May
(45) |
Jun
(53) |
Jul
(23) |
Aug
(86) |
Sep
(22) |
Oct
(96) |
Nov
(97) |
Dec
(73) |
| 2011 |
Jan
(24) |
Feb
(45) |
Mar
(28) |
Apr
(31) |
May
(42) |
Jun
(25) |
Jul
|
Aug
(12) |
Sep
(28) |
Oct
(13) |
Nov
(43) |
Dec
(13) |
| 2012 |
Jan
(62) |
Feb
(28) |
Mar
(6) |
Apr
(16) |
May
(7) |
Jun
|
Jul
(16) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(1) |
Dec
(3) |
| 2013 |
Jan
(5) |
Feb
|
Mar
(34) |
Apr
(9) |
May
(6) |
Jun
(10) |
Jul
(32) |
Aug
(8) |
Sep
(11) |
Oct
(35) |
Nov
(24) |
Dec
(22) |
| 2014 |
Jan
(44) |
Feb
(9) |
Mar
(9) |
Apr
(15) |
May
(25) |
Jun
(34) |
Jul
(16) |
Aug
(11) |
Sep
(7) |
Oct
(6) |
Nov
(1) |
Dec
(12) |
| 2015 |
Jan
(33) |
Feb
(19) |
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
|
From: <ba...@us...> - 2013-08-13 09:30:52
|
Revision: 4615
http://sourceforge.net/p/mp-plugins/code/4615
Author: bartev
Date: 2013-08-13 09:30:50 +0000 (Tue, 13 Aug 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/VeraControl/DevCategories.cs
trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
trunk/plugins/VeraControl/VeraBox.cs
trunk/plugins/VeraControl/VeraControl.cs
trunk/plugins/VeraControl/skin/Default/VeraControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
Added Paths:
-----------
trunk/plugins/VeraControl/skin/Titan/
trunk/plugins/VeraControl/skin/Titan/VeraControl.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogActionTrigger.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogDeviceControl.xml
trunk/plugins/VeraControl/skin/Titan/VeraDialogSceneControl.xml
Modified: trunk/plugins/VeraControl/DevCategories.cs
===================================================================
--- trunk/plugins/VeraControl/DevCategories.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/DevCategories.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -62,9 +62,9 @@
public string GetIconName()
- {
+ { //reference : http://wiki.micasaverde.com/index.php/Luup_UPNP_Files#Device_Categories
switch (id)
- {
+ {
case 1: // Interface
return "USB_UIRT";
Modified: trunk/plugins/VeraControl/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/Properties/AssemblyInfo.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -14,7 +14,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Bart Eversdijk")]
[assembly: AssemblyProduct("VeraControl")]
-[assembly: AssemblyCopyright("Copyright 2012")]
+[assembly: AssemblyCopyright("Copyright 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -28,4 +28,4 @@
//
// You can specify all the values or you can use the default the Revision and
// Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
Modified: trunk/plugins/VeraControl/VeraBox.cs
===================================================================
--- trunk/plugins/VeraControl/VeraBox.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/VeraBox.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -403,7 +403,7 @@
} else {
_status.system.SetFullReloadFlag();
- // catids: http://wiki.micasaverde.com/index.php/Luup_UPNP_Files
+ // catids: http://wiki.micasaverde.com/index.php/Luup_UPNP_Files#Device_Categories
switch (xn.Attributes["category"].Value)
{
//case "1": // TODO: Implement interface device ?
Modified: trunk/plugins/VeraControl/VeraControl.cs
===================================================================
--- trunk/plugins/VeraControl/VeraControl.cs 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/VeraControl.cs 2013-08-13 09:30:50 UTC (rev 4615)
@@ -30,7 +30,7 @@
using System.Windows;
using MediaPortal.Common.Utils;
-[assembly: CompatibleVersion("1.1.6.27644")]
+[assembly: CompatibleVersion("1.3.100.0","1.1.6.27644")]
[assembly: UsesSubsystem("MP.SkinEngine")]
[assembly: UsesSubsystem("MP.Config")]
@@ -93,11 +93,11 @@
[SkinControlAttribute(33)] protected GUILabelControl _deviceStatusText = null;
[SkinControl(500)] protected GUIButtonControl _actionVeraSelectButton = null;
- [SkinControl(501)] protected GUIToggleButtonControl _actionTriggerButton = null;
+ [SkinControl(501)] protected GUICheckButton _actionTriggerButton = null;
[SkinControl(502)] protected GUIButtonControl _actionSceneEditButton = null;
[SkinControl(503)] protected GUIButtonControl _actionFilterButton = null;
[SkinControl(504)] protected GUIButtonControl _actionSortButton = null;
- [SkinControl(505)] protected GUIToggleButtonControl _actionAutoRoomButton = null;
+ [SkinControl(505)] protected GUICheckButton _actionAutoRoomButton = null;
[SkinControl(506)] protected GUIButtonControl _actionViewButton = null;
@@ -126,7 +126,7 @@
private VeraFilterStyle _selectedFilterOption = VeraFilterStyle.NONE;
private bool [] _lastUpdateFailed = new bool[100];
- private string _titleTxt = "Micasa Verde - Vera control";
+ private string _titleTxt = "Selected: ";
private SortItem [] _sortOptions = new SortItem [] {
new SortItem(VeraSortStyle.NO, "No Sorting, keep Vera's sorting", "No"),
@@ -296,7 +296,7 @@
OnActionSceneEditButton((GUIButtonControl)control);
if (control == _actionTriggerButton)
- OnActionTrigger((GUIToggleButtonControl)control);
+ OnActionTrigger((GUICheckButton)control);
if(control == _actionVeraSelectButton)
{
@@ -313,7 +313,7 @@
OnActionSortButton((GUIButtonControl)control);
if (control == _actionAutoRoomButton)
- OnActionAutoRoomButton((GUIToggleButtonControl)control);
+ OnActionAutoRoomButton((GUICheckButton)control);
if (control == _actionViewButton)
OnActionViewButton((GUIButtonControl)control);
@@ -1105,7 +1105,7 @@
} else {
_flowList.SelectedListItemIndex = 0;
}
- _title.Label = _titleTxt + " - Scenes";
+ _title.Label = _titleTxt + "Scenes";
}
private void FillinSceneInfo(GUIListItem item, Scene scene)
@@ -1144,7 +1144,7 @@
}
}
}
- _title.Label = _titleTxt + " - " + _vera.GetRoomById(selectedRoom).name;
+ _title.Label = _titleTxt + _vera.GetRoomById(selectedRoom).name;
}
private void ListDevicesPerCategory(int selectedCategory)
@@ -1182,7 +1182,7 @@
}
}
}
- _title.Label = _titleTxt + " - " + _vera.GetCategoryById(selectedCategory).name;
+ _title.Label = _titleTxt + _vera.GetCategoryById(selectedCategory).name;
}
private void FillinDeviceInfo(GUIListItem item, DeviceGeneric dev)
@@ -1324,7 +1324,7 @@
}
}
- private void OnActionTrigger(GUIToggleButtonControl control)
+ private void OnActionTrigger(GUICheckButton control)
{
_enableSceneTrigger = control.Selected;
@@ -1480,7 +1480,7 @@
}
}
- private void OnActionAutoRoomButton(GUIToggleButtonControl control)
+ private void OnActionAutoRoomButton(GUICheckButton control)
{
_autoSelectRoom = control.Selected;
Modified: trunk/plugins/VeraControl/skin/Default/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -9,17 +9,20 @@
<id>1</id>
<posX>0</posX>
<posY>0</posY>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>background.png</texture>
</control>
+
+<import>common.time.xml</import>
+<import>common.window.xml</import>
<control>
<description>an Image</description>
<type>image</type>
<id>2</id>
- <posX>10</posX>
- <posY>320</posY>
+ <posX>120</posX>
+ <posY>520</posY>
<width>150</width>
<height>180</height>
<texture>hover_remote.png</texture>
@@ -29,9 +32,9 @@
<type>image</type>
<id>30</id>
<posX>300</posX>
- <posY>530</posY>
- <width>20</width>
- <height>20</height>
+ <posY>650</posY>
+ <width>25</width>
+ <height>25</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -41,7 +44,7 @@
<type>label</type>
<id>31</id>
<posX>320</posX>
- <posY>530</posY>
+ <posY>650</posY>
<label></label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -51,9 +54,9 @@
<type>image</type>
<id>32</id>
<posX>300</posX>
- <posY>500</posY>
- <width>20</width>
- <height>20</height>
+ <posY>620</posY>
+ <width>25</width>
+ <height>25</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -63,7 +66,7 @@
<type>label</type>
<id>33</id>
<posX>320</posX>
- <posY>500</posY>
+ <posY>620</posY>
<label></label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -74,7 +77,7 @@
<type>actiongroup</type>
<visible>!Control.HasFocus(200)</visible>
<dimColor>00ffffff</dimColor>
- <width>263</width>
+ <width>960</width>
<height>473</height>
<buttonX>0</buttonX>
<buttonY>0</buttonY>
@@ -88,28 +91,28 @@
<type>image</type>
<posX>15</posX>
<posY>63</posY>
- <width>206</width>
+ <width>290</width>
<height>472</height>
<texture>Backslide.png</texture>
<colorDiffuse>fffffffff</colorDiffuse>
<visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
- <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
- <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
</control>
<control>
<description>group element</description>
<type>group</type>
<visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
- <posX>40</posX>
- <posY>97</posY>
+ <posX>37</posX>
+ <posY>121</posY>
<layout>StackLayout</layout>
- <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
- <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <animation effect="slide" time="70" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="70" end="-300,0" reversible="false">hidden</animation>
<control>
<id>500</id>
<description>Box Selector</description>
<type>button</type>
- <onup>505</onup>
+ <onup>506</onup>
<ondown>501</ondown>
<onright>40</onright>
<label>Box:</label>
@@ -117,15 +120,11 @@
<control>
<id>501</id>
<description>Enable disable scene triggers</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>500</onup>
<ondown>502</ondown>
<onright>40</onright>
<label>Scene Triggers</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>502</id>
@@ -157,15 +156,11 @@
<control>
<id>505</id>
<description>Instant Update Room List</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>504</onup>
<ondown>506</ondown>
<onright>40</onright>
<label>Show list on focus</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>506</id>
@@ -189,7 +184,7 @@
<id>20</id>
<label>Section:</label>
<posX>30</posX>
- <posY>55</posY>
+ <posY>75</posY>
<onleft>500</onleft>
<onright>50</onright>
<ondown>40</ondown>
@@ -209,8 +204,8 @@
<showrange>no</showrange>
<reverse>no</reverse>
<cycleItems>yes</cycleItems>
- <height>34</height>
- <width>250</width>
+ <height>40</height>
+ <width>300</width>
<font>font12</font>
<shadowAngle>45</shadowAngle>
<shadowDistance>1</shadowDistance>
@@ -236,9 +231,9 @@
<type>listcontrol</type>
<id>40</id>
<posX>30</posX>
- <posY>85</posY>
- <height>300</height>
- <width>250</width>
+ <posY>150</posY>
+ <height>430</height>
+ <width>400</width>
<spinx>300</spinx>
<onup>20</onup>
<ondown>20</ondown>
@@ -261,74 +256,35 @@
<keepaspectratio>yes</keepaspectratio>
</control>
</control>
+ <control>
+ <description>Cover Flow view</description>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="550" start="1960,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1960,0">WindowClose</animation>
- <control>
- <description>Cover Flow view</description>
<type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
<id>41</id>
<posX>0</posX>
<posY>160</posY>
- <width>720</width>
+ <width>950</width>
<height>576</height>
<onup>20</onup>
- <onleft>500</onleft>
- <selectedCard>0</selectedCard>
- <cardWidth>270</cardWidth>
- <cardHeight>270</cardHeight>
- <angle>65</angle>
- <sideShift>200</sideShift>
+ <onleft>500</onleft>
+ <cardWidth>270</cardWidth>
+ <cardHeight>270</cardHeight>
+ <sideShift>380</sideShift>
<sideGap>90</sideGap>
- <sideDepth>400</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <backgroundDiffuse>FF000000</backgroundDiffuse>
- <background>-</background>
- <showBackground>no</showBackground>
- <foregroundHeight>576</foregroundHeight>
- <foregroundWidth>720</foregroundWidth>
- <foregroundX>0</foregroundX>
- <foregroundY>0</foregroundY>
- <foregroundDiffuse>FF000000</foregroundDiffuse>
- <foreground>coverflow_foreground.png</foreground>
- <showForeground>no</showForeground>
- <showFrame>no</showFrame>
- <frame>Picture_cover2.png</frame>
- <frameFocus>Picture_cover2.png</frameFocus>
- <frameWidth>270</frameWidth>
- <frameHeight>270</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix>[</folderPrefix>
- <folderSuffix>]</folderSuffix>
- <font1>font15</font1>
- <font2>font10</font2>
- <label1>...</label1>
- <label2></label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>-30</label1YOff>
- <label2YOff>330</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>bar_hor.png</scrollbarBackground>
- <scrollbarLeft>mouse_left_horizontal.png</scrollbarLeft>
- <scrollbarRight>mouse_right_horizontal.png</scrollbarRight>
- <scrollbarYOff>285</scrollbarYOff>
- <showScrollbar>no</showScrollbar>
- <cards mask="Picturethumbmask.png">Picturethumbmask.png</cards>
- </control>
+ <sideDepth>550</sideDepth>
+ <angle>65</angle>
+ <selectedOffsetY>120</selectedOffsetY>
+ <offsetY>160</offsetY>
+ <label1YOff>-3000</label1YOff>
+ <font1>font14</font1>
+ <showScrollbar>no</showScrollbar>
+ <showFrame>no</showFrame>
+ </control>
-
-
<control>
<description>group element</description>
<type>group</type>
@@ -341,10 +297,10 @@
<description>right control</description>
<type>listcontrol</type>
<id>50</id>
- <posX>300</posX>
- <posY>55</posY>
- <height>460</height>
- <width>300</width>
+ <posX>500</posX>
+ <posY>150</posY>
+ <height>500</height>
+ <width>400</width>
<onleft>40</onleft>
<onright>500</onright>
<scrollOffset>5</scrollOffset>
@@ -372,10 +328,12 @@
<control>
<type>label</type>
- <posX>200</posX>
- <posY>17</posY>
+ <posX>20</posX>
+ <posY>10</posY>
<label>Micasa Verde - Vera control</label>
<id>10</id>
+ <font>font11</font>
+ <textcolor>ff6FAFE1</textcolor>
</control>
</controls>
</window>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogActionTrigger.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -9,8 +9,8 @@
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -18,26 +18,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -56,8 +56,8 @@
<description>Play label</description>
<type>label</type>
<id>0</id>
- <posX>280</posX>
- <posY>130</posY>
+ <posX>380</posX>
+ <posY>170</posY>
<label>2553</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -66,8 +66,8 @@
<description>Paused label</description>
<type>label</type>
<id>0</id>
- <posX>370</posX>
- <posY>130</posY>
+ <posX>470</posX>
+ <posY>170</posY>
<label>19011</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -76,8 +76,8 @@
<description>Resume label</description>
<type>label</type>
<id>0</id>
- <posX>460</posX>
- <posY>130</posY>
+ <posX>560</posX>
+ <posY>170</posY>
<label>732</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -86,8 +86,8 @@
<description>Stop label</description>
<type>label</type>
<id>0</id>
- <posX>550</posX>
- <posY>130</posY>
+ <posX>650</posX>
+ <posY>170</posY>
<label>2552</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -99,8 +99,8 @@
<description>Music label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>160</posY>
+ <posX>260</posX>
+ <posY>200</posY>
<label>249</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -109,8 +109,8 @@
<control>
<description>Music started</description>
<id>20</id>
- <posX>280</posX>
- <posY>160</posY>
+ <posX>380</posX>
+ <posY>200</posY>
<onleft>23</onleft>
<onright>21</onright>
<onup>50</onup>
@@ -140,8 +140,8 @@
<control>
<description>Music paused</description>
<id>21</id>
- <posX>370</posX>
- <posY>160</posY>
+ <posX>470</posX>
+ <posY>200</posY>
<onup>51</onup>
<ondown>26</ondown>
<onleft>20</onleft>
@@ -171,8 +171,8 @@
<control>
<description>Music resumed</description>
<id>22</id>
- <posX>460</posX>
- <posY>160</posY>
+ <posX>560</posX>
+ <posY>200</posY>
<onup>52</onup>
<ondown>27</ondown>
<onleft>21</onleft>
@@ -202,8 +202,8 @@
<control>
<description>Music stopped</description>
<id>23</id>
- <posX>550</posX>
- <posY>160</posY>
+ <posX>650</posX>
+ <posY>200</posY>
<onup>2</onup>
<ondown>28</ondown>
<onleft>22</onleft>
@@ -235,8 +235,8 @@
<description>Video label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>190</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>291</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -244,8 +244,8 @@
<control>
<description>Video start</description>
<id>25</id>
- <posX>280</posX>
- <posY>190</posY>
+ <posX>380</posX>
+ <posY>230</posY>
<onup>20</onup>
<ondown>30</ondown>
<onleft>28</onleft>
@@ -275,8 +275,8 @@
<control>
<description>Video paused</description>
<id>26</id>
- <posX>370</posX>
- <posY>190</posY>
+ <posX>470</posX>
+ <posY>230</posY>
<onup>21</onup>
<ondown>31</ondown>
<onleft>25</onleft>
@@ -306,8 +306,8 @@
<control>
<description>Video resumed</description>
<id>27</id>
- <posX>460</posX>
- <posY>190</posY>
+ <posX>560</posX>
+ <posY>230</posY>
<onup>22</onup>
<ondown>32</ondown>
<onleft>26</onleft>
@@ -337,8 +337,8 @@
<control>
<description>Video stopped</description>
<id>28</id>
- <posX>550</posX>
- <posY>190</posY>
+ <posX>650</posX>
+ <posY>230</posY>
<onup>23</onup>
<ondown>33</ondown>
<onleft>27</onleft>
@@ -370,8 +370,8 @@
<description>TV label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>220</posY>
+ <posX>260</posX>
+ <posY>260</posY>
<label>605</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -379,8 +379,8 @@
<control>
<description>TV start</description>
<id>30</id>
- <posX>280</posX>
- <posY>220</posY>
+ <posX>380</posX>
+ <posY>260</posY>
<onup>25</onup>
<ondown>35</ondown>
<onleft>33</onleft>
@@ -410,8 +410,8 @@
<control>
<description>TV paused</description>
<id>31</id>
- <posX>370</posX>
- <posY>220</posY>
+ <posX>470</posX>
+ <posY>260</posY>
<onup>26</onup>
<ondown>36</ondown>
<onleft>30</onleft>
@@ -441,8 +441,8 @@
<control>
<description>TV resumed</description>
<id>32</id>
- <posX>460</posX>
- <posY>220</posY>
+ <posX>560</posX>
+ <posY>260</posY>
<onup>27</onup>
<ondown>37</ondown>
<onleft>31</onleft>
@@ -472,8 +472,8 @@
<control>
<description>TV stopped</description>
<id>33</id>
- <posX>550</posX>
- <posY>220</posY>
+ <posX>650</posX>
+ <posY>260</posY>
<onup>28</onup>
<ondown>38</ondown>
<onleft>32</onleft>
@@ -505,8 +505,8 @@
<description>Recordings label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>250</posY>
+ <posX>260</posX>
+ <posY>290</posY>
<label>652</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -514,8 +514,8 @@
<control>
<description>Recordings start</description>
<id>35</id>
- <posX>280</posX>
- <posY>250</posY>
+ <posX>380</posX>
+ <posY>290</posY>
<onup>30</onup>
<ondown>40</ondown>
<onleft>38</onleft>
@@ -545,8 +545,8 @@
<control>
<description>Recordings paused</description>
<id>36</id>
- <posX>370</posX>
- <posY>250</posY>
+ <posX>470</posX>
+ <posY>290</posY>
<onup>31</onup>
<ondown>41</ondown>
<onleft>35</onleft>
@@ -576,8 +576,8 @@
<control>
<description>Recordings resumed</description>
<id>37</id>
- <posX>460</posX>
- <posY>250</posY>
+ <posX>560</posX>
+ <posY>290</posY>
<onup>32</onup>
<ondown>42</ondown>
<onleft>36</onleft>
@@ -607,8 +607,8 @@
<control>
<description>Recordings stopped</description>
<id>38</id>
- <posX>550</posX>
- <posY>250</posY>
+ <posX>650</posX>
+ <posY>290</posY>
<onup>33</onup>
<ondown>43</ondown>
<onleft>37</onleft>
@@ -640,8 +640,8 @@
<description>Radio label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>280</posY>
+ <posX>260</posX>
+ <posY>320</posY>
<label>862</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -649,8 +649,8 @@
<control>
<description>Radio start</description>
<id>40</id>
- <posX>280</posX>
- <posY>280</posY>
+ <posX>380</posX>
+ <posY>320</posY>
<onup>35</onup>
<ondown>45</ondown>
<onleft>43</onleft>
@@ -680,8 +680,8 @@
<control>
<description>Radio paused</description>
<id>41</id>
- <posX>370</posX>
- <posY>280</posY>
+ <posX>470</posX>
+ <posY>320</posY>
<onup>36</onup>
<ondown>46</ondown>
<onleft>40</onleft>
@@ -711,8 +711,8 @@
<control>
<description>Radio resumed</description>
<id>42</id>
- <posX>460</posX>
- <posY>280</posY>
+ <posX>560</posX>
+ <posY>320</posY>
<onup>37</onup>
<ondown>47</ondown>
<onleft>41</onleft>
@@ -742,8 +742,8 @@
<control>
<description>Radio stopped</description>
<id>43</id>
- <posX>550</posX>
- <posY>280</posY>
+ <posX>650</posX>
+ <posY>320</posY>
<onup>38</onup>
<ondown>48</ondown>
<onleft>42</onleft>
@@ -775,8 +775,8 @@
<description>Unknown label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>310</posY>
+ <posX>260</posX>
+ <posY>350</posY>
<label>2014</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -784,8 +784,8 @@
<control>
<description>Unknown start</description>
<id>45</id>
- <posX>280</posX>
- <posY>310</posY>
+ <posX>380</posX>
+ <posY>350</posY>
<onup>40</onup>
<ondown>50</ondown>
<onleft>48</onleft>
@@ -815,8 +815,8 @@
<control>
<description>Unknown paused</description>
<id>46</id>
- <posX>370</posX>
- <posY>310</posY>
+ <posX>470</posX>
+ <posY>350</posY>
<onup>41</onup>
<ondown>51</ondown>
<onleft>45</onleft>
@@ -846,8 +846,8 @@
<control>
<description>Unknown resumed</description>
<id>47</id>
- <posX>460</posX>
- <posY>310</posY>
+ <posX>560</posX>
+ <posY>350</posY>
<onup>42</onup>
<ondown>52</ondown>
<onleft>46</onleft>
@@ -877,8 +877,8 @@
<control>
<description>Unknown stopped</description>
<id>48</id>
- <posX>550</posX>
- <posY>310</posY>
+ <posX>650</posX>
+ <posY>350</posY>
<onup>43</onup>
<ondown>100</ondown>
<onleft>47</onleft>
@@ -910,8 +910,8 @@
<description>Startup label</description>
<type>label</type>
<id>0</id>
- <posX>280</posX>
- <posY>340</posY>
+ <posX>380</posX>
+ <posY>380</posY>
<label>3017</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -920,8 +920,8 @@
<description>Sleep label</description>
<type>label</type>
<id>0</id>
- <posX>370</posX>
- <posY>340</posY>
+ <posX>470</posX>
+ <posY>380</posY>
<label>1032</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -930,8 +930,8 @@
<description>Exit label</description>
<type>label</type>
<id>0</id>
- <posX>460</posX>
- <posY>340</posY>
+ <posX>560</posX>
+ <posY>380</posY>
<label>1030</label>
<font>font10</font>
<textcolor>80FFFFFF</textcolor>
@@ -941,8 +941,8 @@
<description>MediaPortal label</description>
<type>label</type>
<id>0</id>
- <posX>150</posX>
- <posY>370</posY>
+ <posX>260</posX>
+ <posY>410</posY>
<label>MediaPortal</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -950,8 +950,8 @@
<control>
<description>MediaPortal start</description>
<id>50</id>
- <posX>280</posX>
- <posY>370</posY>
+ <posX>380</posX>
+ <posY>410</posY>
<onup>45</onup>
<ondown>20</ondown>
<onleft>100</onleft>
@@ -981,8 +981,8 @@
<control>
<description>MediaPortal Sleep</description>
<id>51</id>
- <posX>370</posX>
- <posY>370</posY>
+ <posX>470</posX>
+ <posY>410</posY>
<onup>46</onup>
<ondown>21</ondown>
<onleft>50</onleft>
@@ -1012,8 +1012,8 @@
<control>
<description>MediaPortal Exit</description>
<id>52</id>
- <posX>460</posX>
- <posY>370</posY>
+ <posX>560</posX>
+ <posY>410</posY>
<onup>47</onup>
<ondown>22</ondown>
<onleft>51</onleft>
@@ -1045,11 +1045,11 @@
<description>Store button</description>
<type>button</type>
<id>100</id>
- <posX>550</posX>
- <posY>360</posY>
+ <posX>620</posX>
+ <posY>445</posY>
<textXOff>5</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>37</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogDeviceControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -8,26 +8,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -36,8 +36,8 @@
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -52,8 +52,8 @@
<control>
<type>image</type>
<id>5</id>
- <posX>510</posX>
- <posY>130</posY>
+ <posX>580</posX>
+ <posY>190</posY>
<width>100</width>
<height>200</height>
<texture>Vera\generic_sensor.png</texture>
@@ -63,8 +63,8 @@
<description>text label</description>
<type>label</type>
<id>6</id>
- <posX>180</posX>
- <posY>130</posY>
+ <posX>260</posX>
+ <posY>190</posY>
<label>Dit is een label!!!</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -73,8 +73,8 @@
<description>subtext label</description>
<type>label</type>
<id>7</id>
- <posX>180</posX>
- <posY>180</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>Dit is label 2</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -83,8 +83,8 @@
<description>subtext label</description>
<type>label</type>
<id>8</id>
- <posX>180</posX>
- <posY>210</posY>
+ <posX>260</posX>
+ <posY>270</posY>
<label>Dit is label 3</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -93,20 +93,19 @@
<control>
<type>image</type>
<id>30</id>
- <posX>180</posX>
- <posY>240</posY>
- <width>20</width>
- <height>20</height>
+ <posX>260</posX>
+ <posY>350</posY>
+ <width>30</width>
+ <height>30</height>
<texture></texture>
<visible>no</visible>
</control>
-
<control>
<description>commment label</description>
<type>label</type>
<id>31</id>
- <posX>200</posX>
- <posY>240</posY>
+ <posX>295</posX>
+ <posY>350</posY>
<label>comment</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -116,8 +115,8 @@
<description>Left button</description>
<type>button</type>
<id>10</id>
- <posX>180</posX>
- <posY>332</posY>
+ <posX>255</posX>
+ <posY>445</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -137,8 +136,8 @@
<description>Right button</description>
<type>button</type>
<id>11</id>
- <posX>440</posX>
- <posY>332</posY>
+ <posX>595</posX>
+ <posY>445</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -158,8 +157,8 @@
<description>Mode1 button</description>
<type>button</type>
<id>12</id>
- <posX>180</posX>
- <posY>300</posY>
+ <posX>255</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -179,8 +178,8 @@
<description>Mode2 button</description>
<type>button</type>
<id>13</id>
- <posX>310</posX>
- <posY>300</posY>
+ <posX>425</posX>
+ <posY>400</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -200,8 +199,8 @@
<description>Mode3 button</description>
<type>button</type>
<id>14</id>
- <posX>440</posX>
- <posY>300</posY>
+ <posX>595</posX>
+ <posY>400</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
@@ -222,8 +221,8 @@
<id>15</id>
<description>Dimmable Light</description>
<type>slider</type>
- <posX>330</posX>
- <posY>345</posY>
+ <posX>385</posX>
+ <posY>455</posY>
<spintype>Int</spintype>
<showrange>yes</showrange>
<textureSliderBar>osd_slider_bg.png</textureSliderBar>
@@ -240,7 +239,7 @@
<description>loading label</description>
<type>label</type>
<id>57</id>
- <posX>400</posX>
+ <posX>500</posX>
<posY>240</posY>
<label>Loading image...</label>
<font>font13</font>
@@ -250,7 +249,7 @@
<control>
<type>image</type>
<id>20</id>
- <posX>340</posX>
+ <posX>485</posX>
<posY>160</posY>
<width>600</width>
<height>240</height>
@@ -260,7 +259,7 @@
<control>
<type>image</type>
<id>21</id>
- <posX>340</posX>
+ <posX>485</posX>
<posY>160</posY>
<width>600</width>
<height>240</height>
@@ -271,11 +270,11 @@
<description>Cam Up</description>
<type>button</type>
<id>50</id>
- <posX>190</posX>
- <posY>180</posY>
+ <posX>295</posX>
+ <posY>260</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -293,11 +292,11 @@
<description>Cam left</description>
<type>button</type>
<id>51</id>
- <posX>140</posX>
- <posY>220</posY>
+ <posX>240</posX>
+ <posY>300</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -315,11 +314,11 @@
<description>Cam right</description>
<type>button</type>
<id>52</id>
- <posX>240</posX>
- <posY>220</posY>
+ <posX>350</posX>
+ <posY>300</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -337,11 +336,11 @@
<description>Cam down</description>
<type>button</type>
<id>53</id>
- <posX>190</posX>
- <posY>260</posY>
+ <posX>295</posX>
+ <posY>340</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
@@ -359,15 +358,15 @@
<description>Zoom min</description>
<type>button</type>
<id>55</id>
- <posX>140</posX>
- <posY>320</posY>
+ <posX>240</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
- <label>zoom -</label>
+ <label>zm -</label>
<font>font10</font>
<textalign>center</textalign>
<textvalign>middle</textvalign>
@@ -381,15 +380,15 @@
<description>Zoom plus</description>
<type>button</type>
<id>56</id>
- <posX>240</posX>
- <posY>320</posY>
+ <posX>350</posX>
+ <posY>400</posY>
<textXOff>29</textXOff>
<textYOff>6</textYOff>
- <width>80</width>
+ <width>100</width>
<height>32</height>
<textureFocus>button_focus.png</textureFocus>
<textureNoFocus>button_nofocus.png</textureNoFocus>
- <label>zoom +</label>
+ <label>zm +</label>
<font>font10</font>
<textalign>center</textalign>
<textvalign>middle</textvalign>
Modified: trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/Default/VeraDialogSceneControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -8,26 +8,26 @@
<control>
<type>image</type>
<id>0</id>
- <width>720</width>
- <height>576</height>
+ <width>960</width>
+ <height>720</height>
<texture>black.png</texture>
<colordiffuse>40ffffff</colordiffuse>
</control>
<control>
<type>image</type>
<id>0</id>
- <posX>115</posX>
- <posY>64</posY>
- <width>545</width>
- <height>365</height>
+ <posX>210</posX>
+ <posY>100</posY>
+ <width>550</width>
+ <height>440</height>
<texture>context_background.png</texture>
</control>
<control>
<description>Heading text label</description>
<type>label</type>
<id>4</id>
- <posX>239</posX>
- <posY>89</posY>
+ <posX>245</posX>
+ <posY>130</posY>
<label>181</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -36,8 +36,8 @@
<description>Exit button</description>
<type>button</type>
<id>2</id>
- <posX>585</posX>
- <posY>77</posY>
+ <posX>690</posX>
+ <posY>130</posY>
<width>40</width>
<height>40</height>
<textureFocus>dialogue_shutdown_focus.png</textureFocus>
@@ -52,8 +52,8 @@
<control>
<type>image</type>
<id>5</id>
- <posX>500</posX>
- <posY>130</posY>
+ <posX>580</posX>
+ <posY>190</posY>
<width>150</width>
<height>150</height>
<texture>hover_my videos.png</texture>
@@ -63,8 +63,8 @@
<description>text label</description>
<type>label</type>
<id>6</id>
- <posX>200</posX>
- <posY>150</posY>
+ <posX>260</posX>
+ <posY>230</posY>
<label>Dit is een label!!!</label>
<font>font13</font>
<textcolor>FFFFFFFF</textcolor>
@@ -72,10 +72,10 @@
<control>
<type>image</type>
<id>30</id>
- <posX>180</posX>
- <posY>240</posY>
- <width>20</width>
- <height>20</height>
+ <posX>260</posX>
+ <posY>370</posY>
+ <width>30</width>
+ <height>30</height>
<texture></texture>
<visible>no</visible>
</control>
@@ -83,8 +83,8 @@
<description>commment label</description>
<type>label</type>
<id>31</id>
- <posX>200</posX>
- <posY>240</posY>
+ <posX>295</posX>
+ <posY>370</posY>
<label>comment</label>
<font>font13</font>
<textcolor>90FFFFFF</textcolor>
@@ -94,8 +94,8 @@
<description>Run button</description>
<type>button</type>
<id>11</id>
- <posX>330</posX>
- <posY>332</posY>
+ <posX>430</posX>
+ <posY>445</posY>
<textXOff>31</textXOff>
<textYOff>6</textYOff>
<width>120</width>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -13,15 +13,18 @@
<height>720</height>
<texture>background.png</texture>
</control>
+
+<import>common.time.xml</import>
+<import>common.window.xml</import>
<control>
<description>an Image</description>
<type>image</type>
<id>2</id>
- <posX>20</posX>
- <posY>400</posY>
- <width>350</width>
- <height>250</height>
+ <posX>120</posX>
+ <posY>490</posY>
+ <width>300</width>
+ <height>200</height>
<texture>hover_remote.png</texture>
</control>
@@ -117,15 +120,11 @@
<control>
<id>501</id>
<description>Enable disable scene triggers</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>500</onup>
<ondown>502</ondown>
<onright>40</onright>
<label>Scene Triggers</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>502</id>
@@ -157,15 +156,11 @@
<control>
<id>505</id>
<description>Instant Update Room List</description>
- <type>togglebutton</type>
+ <type>checkbutton</type>
<onup>504</onup>
<ondown>506</ondown>
<onright>40</onright>
<label>Show list on focus</label>
- <textureFocus>togglebutton-on-focus.png</textureFocus>
- <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
- <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
- <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
</control>
<control>
<id>506</id>
@@ -185,7 +180,7 @@
<id>20</id>
<label>Section:</label>
<posX>60</posX>
- <posY>70</posY>
+ <posY>78</posY>
<onleft>500</onleft>
<onright>50</onright>
<onup>40</onup>
@@ -205,7 +200,7 @@
<reverse>no</reverse>
<cycleItems>yes</cycleItems>
<height>34</height>
- <width>500</width>
+ <width>350</width>
<font>font10</font>
<shadowAngle>45</shadowAngle>
<shadowDistance>1</shadowDistance>
@@ -231,8 +226,8 @@
<type>listcontrol</type>
<id>40</id>
<posX>60</posX>
- <posY>110</posY>
- <height>360</height>
+ <posY>140</posY>
+ <height>410</height>
<width>500</width>
<onup>20</onup>
<ondown>20</ondown>
@@ -259,71 +254,36 @@
<spinColor>00ffffff</spinColor>
<suffix>|</suffix>
</control>
- </control>
- <control>
- <description>Cover Flow view</description>
+ </control>
+
+ <control>
+ <description>Cover Flow view</description>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="550" start="1960,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1960,0">WindowClose</animation>
+
<type>coverflow</type>
- <colordiffuse>90ffffff</colordiffuse>
- <dimColor>90ffffff</dimColor>
<id>41</id>
<posX>0</posX>
- <posY>200</posY>
+ <posY>90</posY>
<width>1280</width>
- <height>720</height>
+ <height>576</height>
<onup>20</onup>
- <onleft>500</onleft>
- <selectedCard>0</selectedCard>
- <cardWidth>360</cardWidth>
- <cardHeight>360</cardHeight>
- <angle>65</angle>
+ <onleft>500</onleft>
+ <cardWidth>270</cardWidth>
+ <cardHeight>270</cardHeight>
<sideShift>380</sideShift>
<sideGap>90</sideGap>
- <sideDepth>550</sideDepth>
- <offsetY>0</offsetY>
- <selectedOffsetY>0</selectedOffsetY>
- <speed>8</speed>
- <backgroundDiffuse>FF000000</backgroundDiffuse>
- <background>-</background>
- <showBackground>no</showBackground>
- <foregroundHeight>720</foregroundHeight>
- <foregroundWidth>1280</foregroundWidth>
- <foregroundX>0</foregroundX>
- <foregroundY>0</foregroundY>
- <foregroundDiffuse>FF000000</foregroundDiffuse>
- <foreground>coverflow_foreground.png</foreground>
- <showForeground>no</showForeground>
- <showFrame>no</showFrame>
- <frame>Picture_cover2.png</frame>
- <frameFocus>Picture_cover2.png</frameFocus>
- <frameWidth>360</frameWidth>
- <frameHeight>360</frameHeight>
- <spinSpeed>8</spinSpeed>
- <unfocusedAlpha>FF</unfocusedAlpha>
- <folderPrefix>[</folderPrefix>
- <folderSuffix>]</folderSuffix>
- <font1>font15</font1>
- <font2>font10</font2>
- <label1>...</label1>
- <label2></label2>
- <textColor>FFFFFFFF</textColor>
- <remoteColor>FFFF0000</remoteColor>
- <playedColor>FFA0D0FF</playedColor>
- <downloadColor>FF00FF00</downloadColor>
- <selectedColor>FFFFFFFF</selectedColor>
- <shadowAngle>45</shadowAngle>
- <shadowDistance>0</shadowDistance>
- <shadowColor>FF000000</shadowColor>
- <label1YOff>-50</label1YOff>
- <label2YOff>430</label2YOff>
- <pageSize>5</pageSize>
- <keepaspectratio>yes</keepaspectratio>
- <scrollbarBackground>bar_hor.png</scrollbarBackground>
- <scrollbarLeft>mouse_left_horizontal.png</scrollbarLeft>
- <scrollbarRight>mouse_right_horizontal.png</scrollbarRight>
- <scrollbarYOff>455</scrollbarYOff>
- <showScrollbar>no</showScrollbar>
- <cards mask="Picturethumbmask.png">Picturethumbmask.png</cards>
- </control>
+ <sideDepth>550</sideDepth>
+ <angle>65</angle>
+ <selectedOffsetY>120</selectedOffsetY>
+ <offsetY>160</offsetY>
+ <label1YOff>-3000</label1YOff>
+ <font1>font14</font1>
+ <showScrollbar>no</showScrollbar>
+ <showFrame>no</showFrame>
+ </control>
<control>
<description>group element</description>
@@ -338,8 +298,8 @@
<type>listcontrol</type>
<id>50</id>
<posX>600</posX>
- <posY>70</posY>
- <height>560</height>
+ <posY>140</posY>
+ <height>490</height>
<width>600</width>
<onleft>40</onleft>
<onright>500</onright>
@@ -368,10 +328,12 @@
<control>
<type>label</type>
- <posX>400</posX>
- <posY>17</posY>
+ <posX>20</posX>
+ <posY>10</posY>
<label>Micasa Verde - Vera control</label>
<id>10</id>
+ <font>font11</font>
+ <textcolor>ff6FAFE1</textcolor>
</control>
</controls>
</window>
Modified: trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2013-07-24 08:12:30 UTC (rev 4614)
+++ trunk/plugins/VeraControl/skin/DefaultWide/VeraDialogDeviceControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -223,7 +223,7 @@
<description>Dimmable Light</description>
<type>slider</type>
<id>15</id>
- <posX>620</posX>
+ <posX>580</posX>
<posY>460</posY>
<spintype>int</spintype>
<showrange>yes</showrange>
Added: trunk/plugins/VeraControl/skin/Titan/VeraControl.xml
===================================================================
--- trunk/plugins/VeraControl/skin/Titan/VeraControl.xml (rev 0)
+++ trunk/plugins/VeraControl/skin/Titan/VeraControl.xml 2013-08-13 09:30:50 UTC (rev 4615)
@@ -0,0 +1,408 @@
+<window>
+ <id>1972</id>
+ <defaultcontrol>40</defaultcontrol>
+ <define>#header.label:Vera Control</define>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>BackGround</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>background.png</texture>
+ </control>
+
+<import>common.time.xml</import>
+<import>common.overlay.xml</import>
+
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>2</id>
+ <posX>120</posX>
+ <posY>850</posY>
+ <width>300</width>
+ <height>200</height>
+ <texture>vera\IR_Transmitter.png</texture>
+ </control>
+ <control>
+ <description>an Image</description>
+ <type>image</type>
+ <id>3</id>
+ <posX>1780</posX>
+ <posY>950</posY>
+ <texture>vera\Zwave.png</texture>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>30</id>
+ <posX>700</posX>
+ <posY>980</posY>
+ <width>30</width>
+ <height>30</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>31</id>
+ <posX>740</posX>
+ <posY>980</posY>
+ <label></label>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
+
+ <control>
+ <type>image</type>
+ <id>32</id>
+ <posX>700</posX>
+ <posY>940</posY>
+ <width>30</width>
+ <height>30</height>
+ <texture></texture>
+ <visible>no</visible>
+ </control>
+
+ <control>
+ <description>commment label</description>
+ <type>label</type>
+ <id>33</id>
+ <posX>740</posX>
+ <posY>940</posY>
+ <label></label>
+ <textcolor>90FFFFFF</textcolor>
+ </control>
+
+ <control>
+ <description>action menu</description>
+ <type>actiongroup</type>
+ <visible>!Control.HasFocus(200)</visible>
+ <dimColor>00ffffff</dimColor>
+ <width>568</width>
+ <height>900</height>
+ <buttonX>-460</buttonX>
+ <buttonY>155</buttonY>
+ <buttonwidth>499</buttonwidth>
+ <buttonheight>1080</buttonheight>
+ <onexit>40</onexit>
+ <defaultcontrol>500</defaultcontrol>
+ <textureFocus>-</textureFocus>
+ <textureNoFocus>Action_nofocus.png</textureNoFocus>
+ <control>
+ <type>image</type>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>semi_trans_back_hidden_menu.png</texture>
+ <colorDiffuse>fffffffff</colorDiffuse>
+ <visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="450">visible</animation>
+ <animation effect="fade" time="400">hidden</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <id>0</id>
+ <posY>0</posY>
+ <posX>0</posX>
+ <width>612</width>
+ <height>1074</height>
+ <texture>menu_bg.png</texture>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="50">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <description>Menu label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>116</posX>
+ <posY>100</posY>
+ <label>924</label>
+ <font>fontB16</font>
+ <textcolor>393939</textcolor>
+ <visible>!Control.HasFocus(50)</visible>
+ <animation effect="fade" time="0">WindowClose</animation>
+ <animation effect="slide" start="-150,0" time="100">visible</animation>
+ <animation effect="fade" time="50">visible</animation>
+ <animation effect="fade" time="0">hidden</animation>
+ </control>
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <visible>!Control.HasFocus(20)+!Control.HasFocus(40)+!Control.HasFocus(50)</visible>
+ <posX>110</posX>
+ <posY>160</posY>
+ <layout>StackLayout</layout>
+ <animation effect="slide" time="150" start="-300,0" reversible="false">visible</animation>
+ <animation effect="slide" time="150" end="-300,0" reversible="false">hidden</animation>
+ <control>
+ <id>500</id>
+ <description>Box Selector</description>
+ <type>button</type>
+ <onup>506</onup>
+ <ondown>501</ondown>
+ <onright>40</onright>
+ <label>Box:</label>
+ </control>
+ <control>
+ <id>501</id>
+ <description>Enable disable scene triggers</description>
+ <type>checkbutton</type>
+ <onup>500</onup>
+ <ondown>502</ondown>
+ <onright>40</onright>
+ <label>Scene Triggers</label>
+ <textcolorNoFocus>FF444444</textcolorNoFocus>
+ </control>
+ <control>
+ <id>502</id>
+ <description>Edit Scene triggers</description>
+ <type>button</type>
+ <onup>501</onup>
+ <ondown>503</ondown>
+ <onright>40</onright>
+ <label>Edit Scene Triggers</label>
+ </control>
+ <control>
+ <id>503</id>
+ <description>Device filter</description>
+ <type>button</type>
+ <onup>502</onup>
+ <ondown>504</ondown>
+ <onright>40</onright>
+ <label>Filter:</label>
+ </control>
+ <control>
+ <id>504</id>
+ <description>Sort mode</description>
+ <type>button</type>
+ <onup>503</onup>
+ <ondown>505</ondown>
+ <onright>40</onright>
+ <label>Sort:</label>
+ </control>
+ <control>
+ <id>505</id>
+ <description>Instant Update Room List</description>
+ <type>checkbutton</type>
+ <onup>504</onup>
+ <ondown>506</ondown>
+ <onright>40</onright>
+ <label>Show list on focus</label>
+ <textcolorNoFocus>FF444444</textcolorNoFocus>
+ </control>
+ <control>
+ <id>506</id>
+ <description>Viewing mode</description>
+ <type>button</type>
+ <onup>505</onup>
+ <ondown>500</ondown>
+ <onright>40</onright>
+ <label>View:</label>
+ </control>
+ </control>
+ </control>
+
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <control>
+ <type>image</type>
+ <posX>70</posX>
+ <posY>110</posY>
+ <width>560</width>
+ <height>80</height>
+ <texture>panel_settings_main.png</texture>
+ <visible>Control.isvisible(20)</visible>
+ </control>
+ <control>
+ <description>category</description>
+ <type>spinbutton</type>
+ <id>20</id>
+ <label>Section:</label>
+ <posX>110</posX>
+ <posY>130</posY>
+ <onleft>500</onleft>
+ <onright>50</onright>
+ <onup>40</onup>
+ <textureUp>arrow_round_up_nofocus.png</textureUp>
+ <textureDown>arrow_round_down_nofocus.png</textureDown>
+ <textureUpFocus>arrow_round_up_focus.png</textureUpFocus>
+ <textureDownFocus>arrow_round_down_focus.png</textureDownFocus>
+ <spinWidth>30</spinWidth>
+ <spinHeight>30</spinHeight>
+ <spinXOff>20</spinXOff>
+ <spinTextXOff>7</spinTextXOff>
+ <spinalign>right</spinalign>
+ <spinvalign>middle</spinvalign>
+ <spintype>text</spintype>
+ <orientation>horizontal</orientation>
+ <showrange>no</showrange>
+ <reverse>no</reverse>
+ <cycleItems>yes</cycleItems>
+ <height>34</height>
+ <width>460</width>
+ <font>font10</font>
+ <shadowAngle>45</shadowAngle>
+ <shadowDistance>1</shadowDistance>
+ <shadowColor>FF000000</shadowColor>
+ <textcolorFocus>0xffa0d0ff</textcolorFocus>
+ <textcolorNoFocus>0x60ffffff</textcolorNoFocus>
+ <textalign>left</textalign>
+ <textvalign>middle</textvalign>
+ <textXOff>10</textXOff>
+ <textureFocus>button_focus.png</textureFocus>
+ <textureNoFocus>button_nofocus.png</textureNoFocus>
+ </control>
+ </control>
+
+
+
+ <control>
+ <description>group element</description>
+ <type>group</type>
+ <animation effect="fade" time="150">WindowOpen</animation>
+ <animation effect="fade" time="250">WindowClose</animation>
+ <animation effect="slide" time="150" start="1900,0">WindowOpen</animation>
+ <animation effect="slide" time="250" end="1900,0">WindowClose</animation>
+ <control>
+ <type>image</type>
+ <posX>60</posX>
+ <posY>185</posY>
+ <width>860</width>
+ <height>700</height>
+ <texture>panel_settings_main.png</texture>
+ <visible>Control.isvisible(40)</visible>
+ </control>
+ <control>
+ <description>left control</description>
+ <type>listcontrol</type>
+ <id>40</id>
+ <posX>110</posX>
+ <posY>235</posY>
+ <height>680</height>
+ <width>760</width>
+ <onup>20</onup>
+ <ondown>20</ondown>
+ <onleft>500</onleft>
+ <onright>50</onright>
+ <scrollOffset>5</scrollOffset>
+ <itemWidth>33</itemWidth>
+ <itemHeight>33</itemHeight>
+ <IconXOff>20</IconXOff>
+ <IconYOff>3</IconYOff>
+ <textXOff>25</textXOff>
+ <textYOff>3</textYOff>
+ <textXOff2>0</textXOff2>
+ <textYOff2>5</textYOff2>
+ <textXOff3>75</textXOff3>
+ <textYOff3>10</textYOff3>
+ <font>font10</font>
+ <font2>font10</font2>
+ <font3>font10</font3>
+ <keepaspectratio>yes</keepaspectratio>
+ <spinPosX>1650</spinPosX>
+ <spinPosY>1250</spinPosY>
+ <spinCanFocus>no</spinCanFocus>
+ <spinColor>00ffffff</spinColor>
+ <suffix>|</suffix>
+ <unfocusedAlpha applyToAll="true">ff</unfocusedAlpha>
+ </control>
+ </control>
+ <control>
+ <description>Cover Flow v...
[truncated message content] |
|
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.
|
|
From: <jmb...@us...> - 2013-07-23 08:45:22
|
Revision: 4613
http://sourceforge.net/p/mp-plugins/code/4613
Author: jmbillings
Date: 2013-07-23 08:45:13 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Add hover images
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
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/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
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/
trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png
trunk/plugins/APODPlugin/debug.log
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-23 08:45:13 UTC (rev 4613)
@@ -104,7 +104,6 @@
else
{
onDownloadNoImageFound(this, new downloadNoImageEventArgs(direction));
- //onDownloadError(this, new downloadErrorEventArgs(new Exception("No image found, this one might have been a Video... :)")));
}
}
catch (Exception ex)
@@ -198,4 +197,4 @@
scrollDirection = d;
}
}
-}
+}
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-23 08:45:13 UTC (rev 4613)
@@ -12,8 +12,10 @@
{
public class APODPlugin : GUIWindow, ISetupForm
{
+ [SkinControlAttribute(3)]
+ protected GUIImage bgimage = null;
[SkinControlAttribute(0)]
- protected GUIImage bgimage = null;
+ protected GUIImage infobgimage = null;
[SkinControlAttribute(4)]
protected GUIImage image = null;
[SkinControlAttribute(5)]
@@ -116,13 +118,20 @@
public override bool Init()
{
- return Load(GUIGraphicsContext.Skin + @"\APODPlugin.xml");
+ bool ls = Load(GUIGraphicsContext.Skin + @"\APODPlugin.xml");
+ base.InitControls();
+ base.NeedRefresh();
+ return ls;
}
+ public override void DeInit()
+ {
+ base.DeInit();
+ }
+
protected override void OnPageLoad()
{
- bgimage.DoUpdate();
-
+ image.Refresh();
GUIWaitCursor.Show();
downloader = new APODDownloader();
downloader.onDownloadError += downloader_onDownloadError;
@@ -144,6 +153,19 @@
{
doDownload(directions.RIGHT);
}
+ else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
+ {
+ if (infobgimage.Visible)
+ {
+ infobgimage.Visible = false;
+ info.Visible = false;
+ }
+ else
+ {
+ infobgimage.Visible = true;
+ info.Visible = true;
+ }
+ }
}
private void doDownload(directions d)
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-23 08:45:13 UTC (rev 4613)
@@ -65,17 +65,29 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="DefaultWide\hover_APOD.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="Default\APODPlugin.xml">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Default\hover_APOD.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="PureVisionHD 1080\APODPlugin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="PureVisionHD 1080\hover_APOD.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<Content Include="Titan\APODPlugin.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</Content>
+ <Content Include="Titan\hover_APOD.png">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
</ItemGroup>
<ItemGroup>
<Content Include="PostDeploy.ps1">
Added: trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/Default/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-23 08:45:13 UTC (rev 4613)
@@ -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.4")]
-[assembly: AssemblyFileVersion("1.0.5.4")]
+[assembly: AssemblyVersion("1.0.5.5")]
+[assembly: AssemblyFileVersion("1.0.5.5")]
Added: trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <!--PureVisionHD 1080-->
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ <control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>0</posX>
+ <posY>10</posY>
+ <width>1920</width>
+ <height>45</height>
+ <font>Menutitle</font>
+ <textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>680</posY>
+ <width>1860</width>
+ <height>390</height>
+ <texture>menubg.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>50</posX>
+ <posY>700</posY>
+ <width>1820</width>
+ <height>350</height>
+ <font>font11</font>
+ <textcolor>ffffffff</textcolor>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>20</posX>
+ <posY>70</posY>
+ <width>240</width>
+ <label>Show Text</label>
+ </control>
+ </controls>
+</window>
Added: trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/PureVisionHD 1080/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1920</width>
Added: trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/Titan/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.Shell.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Microsoft.WindowsAPICodePack.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-23 08:45:13 UTC (rev 4613)
@@ -7,7 +7,7 @@
<control>
<description>image</description>
<type>image</type>
- <id>0</id>
+ <id>3</id>
<posX>0</posX>
<posY>0</posY>
<width>1920</width>
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png 2013-07-23 08:45:13 UTC (rev 4613)
Property changes on: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/hover_APOD.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-19 20:09:50 UTC (rev 4612)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-23 08:45:13 UTC (rev 4613)
@@ -38,8 +38,11 @@
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.pdb
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
-C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.csprojResolveAssemblyReference.cache
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\DefaultWide\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Default\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Titan\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PureVisionHD 1080\APODPlugin.xml
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Titan\hover_APOD.png
+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
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)
Added: trunk/plugins/APODPlugin/debug.log
===================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-17 09:20:17
|
Revision: 4611
http://sourceforge.net/p/mp-plugins/code/4611
Author: jmbillings
Date: 2013-07-17 09:20:12 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Add screenshot to repo
Added Paths:
-----------
trunk/plugins/APODPlugin/MPE/screenshot.jpg
Added: trunk/plugins/APODPlugin/MPE/screenshot.jpg
===================================================================
(Binary files differ)
Index: trunk/plugins/APODPlugin/MPE/screenshot.jpg
===================================================================
--- trunk/plugins/APODPlugin/MPE/screenshot.jpg 2013-07-17 09:13:05 UTC (rev 4610)
+++ trunk/plugins/APODPlugin/MPE/screenshot.jpg 2013-07-17 09:20:12 UTC (rev 4611)
Property changes on: trunk/plugins/APODPlugin/MPE/screenshot.jpg
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-17 09:13:12
|
Revision: 4610
http://sourceforge.net/p/mp-plugins/code/4610
Author: jmbillings
Date: 2013-07-17 09:13:05 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Push 1.0.5.4
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
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/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-17 09:08:00 UTC (rev 4609)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-17 09:13:05 UTC (rev 4610)
@@ -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.3")]
-[assembly: AssemblyFileVersion("1.0.5.3")]
+[assembly: AssemblyVersion("1.0.5.4")]
+[assembly: AssemblyFileVersion("1.0.5.4")]
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/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-17 09:08:00 UTC (rev 4609)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-07-17 09:13:05 UTC (rev 4610)
@@ -56,7 +56,9 @@
<SectionParam Name="Description">
<Value>This will install [Name] version [Version] on your computer.
It is recommended that you close all other applications before continuing.
-Click Next to continue or Cancel to exit Setup.</Value>
+Click Next to continue or Cancel to exit Setup.
+
+Thanks to Catavolt for the assistance with skin layouts!</Value>
<ValueType>String</ValueType>
<Description />
</SectionParam>
@@ -220,13 +222,13 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>5</Build>
- <Revision>3</Revision>
+ <Revision>4</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription>New skin files, add display of info and title for image.</VersionDescription>
+ <VersionDescription>New skins, press up/down to view information about the image. Huge thanks to Catavolt for helping out!</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-14T12:36:33</ReleaseDate>
+ <ReleaseDate>2013-07-17T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
@@ -295,7 +297,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>M42-130202.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{7fcacc68-9dad-4a8b-b50d-284477883368}-M42-130202.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{2cc298d3-6a80-42ea-8d64-7f0ad8bf5f1a}-M42-130202.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml 2013-07-17 09:08:00 UTC (rev 4609)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-07-17 09:13:05 UTC (rev 4610)
@@ -91,13 +91,13 @@
<Major>1</Major>
<Minor>0</Minor>
<Build>5</Build>
- <Revision>3</Revision>
+ <Revision>4</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription>New skin files, add display of info and title for image.</VersionDescription>
+ <VersionDescription>New skins, press up/down to view information about the image. Huge thanks to Catavolt for helping out!</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-14T12:36:33</ReleaseDate>
+ <ReleaseDate>2013-07-17T12: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.
|
|
From: <jmb...@us...> - 2013-07-17 09:08:04
|
Revision: 4609
http://sourceforge.net/p/mp-plugins/code/4609
Author: jmbillings
Date: 2013-07-17 09:08:00 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Update skins
Modified Paths:
--------------
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/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/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
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-17 09:08:00 UTC (rev 4609)
@@ -144,11 +144,6 @@
{
doDownload(directions.RIGHT);
}
- else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
- {
- //User pressed i
-
- }
}
private void doDownload(directions d)
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-17 09:08:00 UTC (rev 4609)
@@ -69,7 +69,9 @@
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Include="PureVisionHD 1080\APODPlugin.xml" />
+ <Content Include="PureVisionHD 1080\APODPlugin.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
<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-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -1,45 +1,77 @@
<window>
- <!--Default 720x576-->
+ <!--Default 960x720-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>960</width>
+ <height>720</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>16</posX>
- <posY>48</posY>
- <width>540</width>
- <height>512</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>16</posX>
- <posY>8</posY>
- <width>540</width>
- <height>40</height>
+ <posX>0</posX>
+ <posY>16</posY>
+ <width>960</width>
+ <height>64</height>
<font>font16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>520</posY>
+ <width>930</width>
+ <height>180</height>
+ <texture>BH background2.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>556</posX>
- <posY>48</posY>
- <width>156</width>
- <height>512</height>
+ <posX>50</posX>
+ <posY>540</posY>
+ <width>890</width>
+ <height>160</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</control>
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>768</posX>
+ <posY>16</posY>
+ <width>160</width>
+ <label>Show Text</label>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -4,43 +4,74 @@
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>720</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>16</posX>
- <posY>64</posY>
- <width>992</width>
- <height>640</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>16</posX>
+ <posX>0</posX>
<posY>16</posY>
<width>1280</width>
- <height>48</height>
+ <height>96</height>
<font>font16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>500</posY>
+ <width>1250</width>
+ <height>200</height>
+ <texture>BH background2.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>1024</posX>
- <posY>64</posY>
- <width>240</width>
- <height>640</height>
+ <posX>50</posX>
+ <posY>520</posY>
+ <width>1230</width>
+ <height>160</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</control>
-
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>980</posX>
+ <posY>16</posY>
+ <width>192</width>
+ <label>Show Text</label>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -4,52 +4,74 @@
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>32</posX>
- <posY>128</posY>
- <width>1520</width>
- <height>884</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>32</posX>
+ <posX>0</posX>
<posY>32</posY>
- <width>1900</width>
+ <width>1920</width>
<height>96</height>
<font>fontB16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>680</posY>
+ <width>1860</width>
+ <height>390</height>
+ <texture>panel_now_playing_info.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>1584</posX>
- <posY>128</posY>
- <width>324</width>
- <height>920</height>
+ <posX>90</posX>
+ <posY>730</posY>
+ <width>1740</width>
+ <height>275</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</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>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>1660</posX>
+ <posY>32</posY>
+ <width>240</width>
+ <label>Show Text</label>
</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-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -1,45 +1,77 @@
<window>
- <!--Default 720x576-->
+ <!--Default 960x720-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>960</width>
+ <height>720</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>16</posX>
- <posY>48</posY>
- <width>540</width>
- <height>512</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>16</posX>
- <posY>8</posY>
- <width>540</width>
- <height>40</height>
+ <posX>0</posX>
+ <posY>16</posY>
+ <width>960</width>
+ <height>64</height>
<font>font16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>520</posY>
+ <width>930</width>
+ <height>180</height>
+ <texture>BH background2.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>556</posX>
- <posY>48</posY>
- <width>156</width>
- <height>512</height>
+ <posX>50</posX>
+ <posY>540</posY>
+ <width>890</width>
+ <height>160</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</control>
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>768</posX>
+ <posY>16</posY>
+ <width>160</width>
+ <label>Show Text</label>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -4,43 +4,74 @@
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1280</width>
+ <height>720</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>16</posX>
- <posY>64</posY>
- <width>992</width>
- <height>640</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>16</posX>
+ <posX>0</posX>
<posY>16</posY>
<width>1280</width>
- <height>48</height>
+ <height>96</height>
<font>font16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>500</posY>
+ <width>1250</width>
+ <height>200</height>
+ <texture>BH background2.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>1024</posX>
- <posY>64</posY>
- <width>240</width>
- <height>640</height>
+ <posX>50</posX>
+ <posY>520</posY>
+ <width>1230</width>
+ <height>160</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</control>
-
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>980</posX>
+ <posY>16</posY>
+ <width>192</width>
+ <label>Show Text</label>
+ </control>
</controls>
</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PureVisionHD 1080/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <!--PureVisionHD 1080-->
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ <control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>0</posX>
+ <posY>10</posY>
+ <width>1920</width>
+ <height>45</height>
+ <font>Menutitle</font>
+ <textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>680</posY>
+ <width>1860</width>
+ <height>390</height>
+ <texture>menubg.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>50</posX>
+ <posY>700</posY>
+ <width>1820</width>
+ <height>350</height>
+ <font>font11</font>
+ <textcolor>ffffffff</textcolor>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>20</posX>
+ <posY>70</posY>
+ <width>240</width>
+ <label>Show Text</label>
+ </control>
+ </controls>
+</window>
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-17 09:08:00 UTC (rev 4609)
@@ -4,52 +4,74 @@
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
<controls>
-
<control>
<description>image</description>
<type>image</type>
+ <id>0</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1920</width>
+ <height>1080</height>
+ <texture>black.jpg</texture>
+ </control>
+ <control>
+ <description>image</description>
+ <type>image</type>
<id>4</id>
- <posX>32</posX>
- <posY>128</posY>
- <width>1520</width>
- <height>884</height>
+ <posX>0</posX>
+ <posY>0</posY>
+ <onup>2</onup>
+ <ondown>2</ondown>
</control>
<control>
<description>title</description>
<type>textbox</type>
<id>6</id>
- <posX>32</posX>
+ <posX>0</posX>
<posY>32</posY>
- <width>1900</width>
+ <width>1920</width>
<height>96</height>
<font>fontB16</font>
<textcolor>ffffffff</textcolor>
+ <textalign>center</textalign>
<colordiffuse>ffffffff</colordiffuse>
</control>
<control>
+ <description>image</description>
+ <type>image</type>
+ <id>0</id>
+ <posX>30</posX>
+ <posY>680</posY>
+ <width>1860</width>
+ <height>390</height>
+ <texture>panel_now_playing_info.png</texture>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>1584</posX>
- <posY>128</posY>
- <width>324</width>
- <height>920</height>
+ <posX>90</posX>
+ <posY>730</posY>
+ <width>1740</width>
+ <height>275</height>
<font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
+ <scrollStartDelaySec>10</scrollStartDelaySec>
+ <animation effect="fade" start="0" end="100" time="1000" reversible="true">visiblechange</animation>
+ <visible>control.hasfocus(2)</visible>
</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>
+ <description>Show Text</description>
+ <type>button</type>
+ <id>2</id>
+ <posX>1660</posX>
+ <posY>32</posY>
+ <width>240</width>
+ <label>Show Text</label>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-16 18:39:31 UTC (rev 4608)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-17 09:08:00 UTC (rev 4609)
@@ -42,3 +42,4 @@
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\DefaultWide\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Default\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Titan\APODPlugin.xml
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PureVisionHD 1080\APODPlugin.xml
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.
|
|
From: <eda...@us...> - 2013-07-16 18:39:33
|
Revision: 4608
http://sourceforge.net/p/mp-plugins/code/4608
Author: edalex86
Date: 2013-07-16 18:39:31 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Added MP 1.4.0 compatibility
Fixed loading and saving configuration
Modified Paths:
--------------
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs
trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln
Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GUIRadio.cs 2013-07-16 18:39:31 UTC (rev 4608)
@@ -50,7 +50,9 @@
//using for token processing
using System.IO;
using System.Text;
+using Action = MediaPortal.GUI.Library.Action;
+
namespace MediaPortal.GUI.MyStreamRadio
{
[PluginIcons("MyStreamRadio.StreamRadio.png", "MyStreamRadio.StreamRadioDisabled.png")]
@@ -139,7 +141,7 @@
[SkinControlAttribute(7)]
protected GUIButtonControl btnNext = null;
[SkinControlAttribute(9)]
- protected GUIToggleButtonControl btnRecord = null;
+ protected GUICheckButton btnRecord = null;
[SkinControlAttribute(11)]
protected GUIButtonControl btnRecordings = null;
Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/GuiRecordings.cs 2013-07-16 18:39:31 UTC (rev 4608)
@@ -39,6 +39,7 @@
using System.Xml.Serialization;
using System.IO;
using System.Data;
+using Action = MediaPortal.GUI.Library.Action;
namespace MediaPortal.GUI.MyStreamRadio
{
Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/MyStreamRadio.csproj 2013-07-16 18:39:31 UTC (rev 4608)
@@ -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>
@@ -13,16 +14,34 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile />
+ <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>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
+ <OutputPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -32,31 +51,32 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Bass.Net, Version=2.4.4.3, Culture=neutral, PublicKeyToken=b7566c273e6ef480, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Bass.Net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Common.Utils, Version=1.1.7.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Common.Utils.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Core, Version=1.0.5.32056, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Databases, Version=1.0.5.32058, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Databases.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Dialogs, Version=1.0.5.32061, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\plugins\Windows\Dialogs.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
@@ -67,7 +87,7 @@
<Reference Include="System.Xml" />
<Reference Include="Utils, Version=2.2.7.32052, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
+ <HintPath>..\..\..\..\..\..\..\..\Program Files\Team MediaPortal\MediaPortal\Utils.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
@@ -117,6 +137,23 @@
<ItemGroup>
<EmbeddedResource Include="Template.xml" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>Клиентский профиль .NET Framework 3.5 SP1</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 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </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/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/Properties/AssemblyInfo.cs 2013-07-16 18:39:31 UTC (rev 4608)
@@ -3,10 +3,7 @@
using System.Runtime.InteropServices;
using MediaPortal.Common.Utils;
-[assembly: CompatibleVersion("1.1.7.0")]
-[assembly: UsesSubsystem("MP.SkinEngine")]
-[assembly: UsesSubsystem("MP.Config")]
-
+[assembly: CompatibleVersion("1.1.6.27644")]
// 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.
Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio/frmSetup.cs 2013-07-16 18:39:31 UTC (rev 4608)
@@ -29,6 +29,7 @@
using System.Text;
using System.Windows.Forms;
using System.Xml;
+using MediaPortal.Configuration;
namespace MediaPortal.GUI.MyStreamRadio
{
@@ -103,7 +104,7 @@
void LoadSettings()
{
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
edtRadio.Text = xmlreader.GetValueAsString("mystreamradio", "Radiopath", Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\Radio");
edtRecord.Text = xmlreader.GetValueAsString("mystreamradio", "Record", xmlreader.GetValueAsString("mystreamradio", "Record", Configuration.Config.GetFolder(MediaPortal.Configuration.Config.Dir.Config) + "\\Record"));
@@ -144,7 +145,7 @@
if (edtRecord.Text.Length == 0)
return;
- using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MediaPortal.xml"))
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MediaPortal.xml")))
{
xmlwriter.SetValue("mystreamradio", "Radiopath", edtRadio.Text);
xmlwriter.SetValue("mystreamradio", "Record", edtRecord.Text);
Modified: trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln
===================================================================
--- trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln 2013-07-16 09:53:43 UTC (rev 4607)
+++ trunk/plugins/MyStreamradioV2/Source/MyStreamRadio.sln 2013-07-16 18:39:31 UTC (rev 4608)
@@ -1,6 +1,6 @@
-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}") = "MyStreamRadio", "MyStreamRadio\MyStreamRadio.csproj", "{C24ED28B-D6D1-4D0D-AF06-F10BAC35528F}"
EndProject
Global
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <jmb...@us...> - 2013-07-13 10:35:44
|
Revision: 4606
http://sourceforge.net/p/mp-plugins/code/4606
Author: jmbillings
Date: 2013-07-13 10:35:40 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
Add output files
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
Removed Paths:
-------------
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
Deleted: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml 2013-07-13 10:34:43 UTC (rev 4605)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
@@ -1,32 +0,0 @@
-<window>
- <id>3355</id>
- <defaultcontrol>4</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
-
- <control>
- <description>image</description>
- <type>image</type>
- <id>4</id>
- <posX>0</posX>
- <posY>0</posY>
- </control>
-
- <control>
- <description>info</description>
- <type>textboxscrollup</type>
- <id>5</id>
- <posX>48</posX>
- <posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
- </control>
-
- </controls>
-</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Default/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
@@ -0,0 +1,32 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <seperator>--------------------------------</seperator>
+ <scrollStartDelaySec>3</scrollStartDelaySec>
+ <spaceBetweenItems>4</spaceBetweenItems>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/DefaultWide/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
@@ -0,0 +1,46 @@
+<window>
+ <!--DefaultWide-->
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>16</posX>
+ <posY>64</posY>
+ <width>992</width>
+ <height>640</height>
+ </control>
+ <control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>16</posX>
+ <posY>16</posY>
+ <width>1280</width>
+ <height>48</height>
+ <font>font16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>1024</posX>
+ <posY>64</posY>
+ <width>240</width>
+ <height>640</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
Added: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/Titan/APODPlugin.xml 2013-07-13 10:35:40 UTC (rev 4606)
@@ -0,0 +1,46 @@
+<window>
+ <!--Titan-->
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>32</posX>
+ <posY>128</posY>
+ <width>1520</width>
+ <height>884</height>
+ </control>
+ <control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>32</posX>
+ <posY>32</posY>
+ <width>1900</width>
+ <height>96</height>
+ <font>fontB16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>1584</posX>
+ <posY>128</posY>
+ <width>324</width>
+ <height>920</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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-13 10:34:46
|
Revision: 4605
http://sourceforge.net/p/mp-plugins/code/4605
Author: jmbillings
Date: 2013-07-13 10:34:43 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
Pull down title, update skins
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/DefaultWide/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/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-11 18:24:15 UTC (rev 4604)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-13 10:34:43 UTC (rev 4605)
@@ -24,6 +24,7 @@
int currentStep = 0;
directions direction;
string information;
+ string title;
internal APODDownloader()
{
@@ -85,6 +86,14 @@
else
information = "No information found!";
+ //Look for the title.
+ //e.g. <center><b> Sunspot at Sunset </b> <br>
+ Match titleMatcher = Regex.Match(pagesource, "(?<=<b>)(.+?)(?=</b>\\s<br>)", RegexOptions.Singleline | RegexOptions.IgnorePatternWhitespace);
+ if (titleMatcher.Success)
+ title = titleMatcher.Value;
+ else
+ title = "Untitled";
+
//Now look for image
Match sourceMatcher = Regex.Match(pagesource, "(?<=<IMG SRC=\")(.+?)(?=\")", RegexOptions.Singleline);
if (sourceMatcher.Success)
@@ -126,7 +135,7 @@
resultStream.Dispose();
imageClient.Dispose();
- onDownloadComplete(this, new downloadCompleteEventArgs(bitmap, information));
+ onDownloadComplete(this, new downloadCompleteEventArgs(bitmap, information, title));
}
}
@@ -172,10 +181,12 @@
{
internal Image bitmap;
internal string infostring;
- internal downloadCompleteEventArgs(Image b, string info)
+ internal string titlestring;
+ internal downloadCompleteEventArgs(Image b, string info, string title)
{
bitmap = b;
infostring = info;
+ titlestring = title;
}
}
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-11 18:24:15 UTC (rev 4604)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-13 10:34:43 UTC (rev 4605)
@@ -16,6 +16,8 @@
protected GUIImage image = null;
[SkinControlAttribute(5)]
protected GUITextScrollUpControl info = null;
+ [SkinControlAttribute(6)]
+ protected GUITextControl title = null;
int imageStep = 0;
APODDownloader downloader;
bool downloading = true;
@@ -200,6 +202,9 @@
//set infotext
info.Label = e.infostring;
+ //set title
+ title.Label = e.titlestring;
+
//size and set image
Rectangle screenRect = Screen.PrimaryScreen.Bounds;
Bitmap resizedBitmap = new Bitmap(screenRect.Width, screenRect.Height);
Modified: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-11 18:24:15 UTC (rev 4604)
+++ trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-13 10:34:43 UTC (rev 4605)
@@ -1,4 +1,5 @@
<window>
+ <!--DefaultWide-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
@@ -8,25 +9,38 @@
<description>image</description>
<type>image</type>
<id>4</id>
- <posX>0</posX>
- <posY>0</posY>
+ <posX>16</posX>
+ <posY>64</posY>
+ <width>992</width>
+ <height>640</height>
</control>
-
<control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>16</posX>
+ <posY>16</posY>
+ <width>1280</width>
+ <height>48</height>
+ <font>font16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>48</posX>
- <posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
+ <posX>1024</posX>
+ <posY>64</posY>
+ <width>240</width>
+ <height>640</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/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-11 18:24:15 UTC (rev 4604)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-13 10:34:43 UTC (rev 4605)
@@ -1,4 +1,5 @@
<window>
+ <!--Titan-->
<id>3355</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
@@ -8,19 +9,32 @@
<description>image</description>
<type>image</type>
<id>4</id>
- <posX>0</posX>
- <posY>0</posY>
+ <posX>32</posX>
+ <posY>128</posY>
+ <width>1520</width>
+ <height>884</height>
</control>
-
<control>
+ <description>title</description>
+ <type>textbox</type>
+ <id>6</id>
+ <posX>32</posX>
+ <posY>32</posY>
+ <width>1900</width>
+ <height>96</height>
+ <font>fontB16</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
<description>info</description>
<type>textboxscrollup</type>
<id>5</id>
- <posX>48</posX>
- <posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
+ <posX>1584</posX>
+ <posY>128</posY>
+ <width>324</width>
+ <height>920</height>
+ <font>font14</font>
<textcolor>ffffffff</textcolor>
<colordiffuse>ffffffff</colordiffuse>
<seperator>--------------------------------</seperator>
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/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-11 18:24:15 UTC (rev 4604)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-13 10:34:43 UTC (rev 4605)
@@ -17,7 +17,6 @@
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Ionic.Zip.dll
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.dll
c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.pdb
-c:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.xml
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Microsoft.WindowsAPICodePack.Shell.dll
C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Microsoft.WindowsAPICodePack.dll
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\APODPlugin.xml
@@ -40,3 +39,6 @@
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.csprojResolveAssemblyReference.cache
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\DefaultWide\APODPlugin.xml
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Default\APODPlugin.xml
+C:\Users\jamesb\documents\visual studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\Titan\APODPlugin.xml
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.
|
|
From: <jmb...@us...> - 2013-07-11 18:24:17
|
Revision: 4604
http://sourceforge.net/p/mp-plugins/code/4604
Author: jmbillings
Date: 2013-07-11 18:24:15 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
remove old plugin file
Removed Paths:
-------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
Deleted: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml 2013-07-11 18:20:07 UTC (rev 4603)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml 2013-07-11 18:24:15 UTC (rev 4604)
@@ -1,32 +0,0 @@
-<window>
- <id>3355</id>
- <defaultcontrol>4</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
- <controls>
-
- <control>
- <description>image</description>
- <type>image</type>
- <id>4</id>
- <posX>0</posX>
- <posY>0</posY>
- </control>
-
- <control>
- <description>info</description>
- <type>textboxscrollup</type>
- <id>5</id>
- <posX>48</posX>
- <posY>48</posY>
- <width>1824</width>
- <height>256</height>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <seperator>--------------------------------</seperator>
- <scrollStartDelaySec>3</scrollStartDelaySec>
- <spaceBetweenItems>4</spaceBetweenItems>
- </control>
-
- </controls>
-</window>
\ 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: <jmb...@us...> - 2013-07-11 18:20:09
|
Revision: 4603
http://sourceforge.net/p/mp-plugins/code/4603
Author: jmbillings
Date: 2013-07-11 18:20:07 +0000 (Thu, 11 Jul 2013)
Log Message:
-----------
Move skin to folders
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/Default/
trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/DefaultWide/
trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/Titan/
trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-10 20:51:10 UTC (rev 4602)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-11 18:20:07 UTC (rev 4603)
@@ -61,10 +61,18 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="APODPlugin.xml">
+ <Content Include="DefaultWide\APODPlugin.xml">
+ <SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ <Content Include="Default\APODPlugin.xml">
<SubType>Designer</SubType>
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
+ <Content Include="Titan\APODPlugin.xml">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ <SubType>Designer</SubType>
+ </Content>
</ItemGroup>
<ItemGroup>
<Content Include="PostDeploy.ps1">
Added: trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/Default/APODPlugin.xml 2013-07-11 18:20:07 UTC (rev 4603)
@@ -0,0 +1,32 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <seperator>--------------------------------</seperator>
+ <scrollStartDelaySec>3</scrollStartDelaySec>
+ <spaceBetweenItems>4</spaceBetweenItems>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/DefaultWide/APODPlugin.xml 2013-07-11 18:20:07 UTC (rev 4603)
@@ -0,0 +1,32 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</font>
+ <textcolor>ffffffff</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <seperator>--------------------------------</seperator>
+ <scrollStartDelaySec>3</scrollStartDelaySec>
+ <spaceBetweenItems>4</spaceBetweenItems>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/Titan/APODPlugin.xml 2013-07-11 18:20:07 UTC (rev 4603)
@@ -0,0 +1,32 @@
+<window>
+ <id>3355</id>
+ <defaultcontrol>4</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+
+ <control>
+ <description>image</description>
+ <type>image</type>
+ <id>4</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ </control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</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/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-10 20:51:16
|
Revision: 4602
http://sourceforge.net/p/mp-plugins/code/4602
Author: jmbillings
Date: 2013-07-10 20:51:10 +0000 (Wed, 10 Jul 2013)
Log Message:
-----------
Add code to get Description and initial skin mods
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
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-09 08:19:38 UTC (rev 4601)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-10 20:51:10 UTC (rev 4602)
@@ -23,6 +23,7 @@
List<String> apodURLs;
int currentStep = 0;
directions direction;
+ string information;
internal APODDownloader()
{
@@ -77,6 +78,13 @@
if (!apodURLs.Contains(prevURL))
apodURLs.Add(prevURL);
+ //Look for information
+ Match infoMatcher = Regex.Match(pagesource, "(?<=<b> Explanation: </b>)(.+?)(?=<p> <center>)", RegexOptions.Singleline);
+ if (infoMatcher.Success)
+ information = StripTagsCharArray(infoMatcher.Value).Replace("\n"," ");
+ else
+ information = "No information found!";
+
//Now look for image
Match sourceMatcher = Regex.Match(pagesource, "(?<=<IMG SRC=\")(.+?)(?=\")", RegexOptions.Singleline);
if (sourceMatcher.Success)
@@ -118,9 +126,37 @@
resultStream.Dispose();
imageClient.Dispose();
- onDownloadComplete(this, new downloadCompleteEventArgs(bitmap));
+ onDownloadComplete(this, new downloadCompleteEventArgs(bitmap, information));
}
}
+
+ public static string StripTagsCharArray(string source)
+ {
+ char[] array = new char[source.Length];
+ int arrayIndex = 0;
+ bool inside = false;
+
+ for (int i = 0; i < source.Length; i++)
+ {
+ char let = source[i];
+ if (let == '<')
+ {
+ inside = true;
+ continue;
+ }
+ if (let == '>')
+ {
+ inside = false;
+ continue;
+ }
+ if (!inside)
+ {
+ array[arrayIndex] = let;
+ arrayIndex++;
+ }
+ }
+ return new string(array, 0, arrayIndex);
+ }
}
internal class downloadErrorEventArgs : EventArgs
@@ -135,9 +171,11 @@
internal class downloadCompleteEventArgs : EventArgs
{
internal Image bitmap;
- internal downloadCompleteEventArgs(Image b)
+ internal string infostring;
+ internal downloadCompleteEventArgs(Image b, string info)
{
bitmap = b;
+ infostring = info;
}
}
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-09 08:19:38 UTC (rev 4601)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-10 20:51:10 UTC (rev 4602)
@@ -14,6 +14,8 @@
{
[SkinControlAttribute(4)]
protected GUIImage image = null;
+ [SkinControlAttribute(5)]
+ protected GUITextScrollUpControl info = null;
int imageStep = 0;
APODDownloader downloader;
bool downloading = true;
@@ -195,6 +197,10 @@
void downloader_onDownloadComplete(object sender, downloadCompleteEventArgs e)
{
+ //set infotext
+ info.Label = e.infostring;
+
+ //size and set image
Rectangle screenRect = Screen.PrimaryScreen.Bounds;
Bitmap resizedBitmap = new Bitmap(screenRect.Width, screenRect.Height);
Bitmap originalBitmap = (Bitmap)e.bitmap;
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml 2013-07-09 08:19:38 UTC (rev 4601)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.xml 2013-07-10 20:51:10 UTC (rev 4602)
@@ -11,6 +11,22 @@
<posX>0</posX>
<posY>0</posY>
</control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</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/APODPlugin.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
===================================================================
(Binary files differ)
Modified: trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml 2013-07-09 08:19:38 UTC (rev 4601)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.xml 2013-07-10 20:51:10 UTC (rev 4602)
@@ -11,6 +11,22 @@
<posX>0</posX>
<posY>0</posY>
</control>
+
+ <control>
+ <description>info</description>
+ <type>textboxscrollup</type>
+ <id>5</id>
+ <posX>48</posX>
+ <posY>48</posY>
+ <width>1824</width>
+ <height>256</height>
+ <font>font13</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/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.
|
|
From: <jmb...@us...> - 2013-07-09 08:19:45
|
Revision: 4601
http://sourceforge.net/p/mp-plugins/code/4601
Author: jmbillings
Date: 2013-07-09 08:19:38 +0000 (Tue, 09 Jul 2013)
Log Message:
-----------
minor update
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.pdb
Modified: trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-08 15:13:26 UTC (rev 4600)
+++ trunk/plugins/APODPlugin/APODPlugin/Properties/AssemblyInfo.cs 2013-07-09 08:19:38 UTC (rev 4601)
@@ -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.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.5.0")]
+[assembly: AssemblyFileVersion("1.0.5.0")]
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/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.
|
|
From: <jmb...@us...> - 2013-07-08 15:13:29
|
Revision: 4600
http://sourceforge.net/p/mp-plugins/code/4600
Author: jmbillings
Date: 2013-07-08 15:13:26 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Pushing updated plugin/installer files.
Modified Paths:
--------------
trunk/plugins/APODPlugin/MPE/APODPlugin.mpe1
trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2
trunk/plugins/APODPlugin/MPE/update.xml
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-08 14:59:07 UTC (rev 4599)
+++ trunk/plugins/APODPlugin/MPE/APODPlugin.xmp2 2013-07-08 15:13:26 UTC (rev 4600)
@@ -12,28 +12,28 @@
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.dll</LocalFileName>
<ZipFileName>Installer{CopyFile}\{746296f1-824c-4cd3-8c66-7d1f0befd7cf}-APODPlugin.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\APODPlugin.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
<DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{2e8ca333-8c7c-4698-8306-c471adc7df71}-APODPlugin.xml</ZipFileName>
<DestinationFilename>%Skin%\Default\APODPlugin.xml</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{5fcfa3ae-4095-4fef-9110-c3a1d1a1865e}-APODPlugin.xml</ZipFileName>
<DestinationFilename>%Skin%\DefaultWide\APODPlugin.xml</DestinationFilename>
@@ -176,8 +176,8 @@
<CompatibleVersion>
<Items>
<CompatibleVersionItem>
- <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
- <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ <MinRequiredVersion>1.4.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.4.0.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -200,14 +200,16 @@
<Version>
<Major>1</Major>
<Minor>0</Minor>
- <Build>2</Build>
- <Revision>0</Revision>
+ <Build>4</Build>
+ <Revision>1</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription />
+ <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-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
@@ -246,14 +248,14 @@
<Items>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.dll</LocalFileName>
<ZipFileName>Installer{CopyFile}\{746296f1-824c-4cd3-8c66-7d1f0befd7cf}-APODPlugin.dll</ZipFileName>
<DestinationFilename>%Plugins%\Windows\APODPlugin.dll</DestinationFilename>
</FileItem>
<FileItem InstallType="CopyFile" SystemFile="false" Modified="true">
<Param1 />
- <UpdateOption>OverwriteIfOlder</UpdateOption>
+ <UpdateOption>AlwaysOverwrite</UpdateOption>
<LocalFileName>..\APODPlugin\bin\Debug\APODPlugin.xml</LocalFileName>
<ZipFileName>Installer{CopyFile}\{9bd9a2d2-9a0e-4f58-a88e-8342721fc6bb}-APODPlugin.xml</ZipFileName>
<DestinationFilename>%Skin%\Titan\APODPlugin.xml</DestinationFilename>
@@ -262,7 +264,7 @@
<Param1 />
<UpdateOption>OverwriteIfOlder</UpdateOption>
<LocalFileName>M42-130202.jpg</LocalFileName>
- <ZipFileName>Installer{CopyFile}\{fafbb8f2-5d96-4996-8359-c52dbcfd4d20}-M42-130202.jpg</ZipFileName>
+ <ZipFileName>Installer{CopyFile}\{5c23f5fb-2975-416c-9574-47721cd997de}-M42-130202.jpg</ZipFileName>
<DestinationFilename />
</FileItem>
</Items>
Modified: trunk/plugins/APODPlugin/MPE/update.xml
===================================================================
--- trunk/plugins/APODPlugin/MPE/update.xml 2013-07-08 14:59:07 UTC (rev 4599)
+++ trunk/plugins/APODPlugin/MPE/update.xml 2013-07-08 15:13:26 UTC (rev 4600)
@@ -42,43 +42,27 @@
</Items>
</Dependencies>
<PluginDependencies>
- <Items>
- <PluginDependencyItem AssemblyName="APODPlugin.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
- <DesignedForVersion>1.2.300.0</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items>
- <SubSystemItem Name="MP.Config" />
- <SubSystemItem Name="MP.SkinEngine" />
- </Items>
- </SubSystemsUsed>
- </PluginDependencyItem>
- </Items>
+ <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 />
+ <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>0</Build>
+ <Build>4</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription />
+ <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-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
@@ -162,8 +146,8 @@
<CompatibleVersion>
<Items>
<CompatibleVersionItem>
- <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
- <DesignedForVersion>1.2.300.0</DesignedForVersion>
+ <MinRequiredVersion>1.4.0.0</MinRequiredVersion>
+ <DesignedForVersion>1.4.0.0</DesignedForVersion>
</CompatibleVersionItem>
</Items>
</CompatibleVersion>
@@ -181,19 +165,21 @@
<Id>7d9c01e5-0408-4f1b-ba3a-e8afd66c22ab</Id>
<Author>jmbillings</Author>
<HomePage>http://www.team-mediaportal.com/extensions/other/apod-plugin</HomePage>
- <ForumPage />
+ <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>0</Build>
+ <Build>4</Build>
<Revision>1</Revision>
</Version>
<ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <VersionDescription />
+ <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-03-17T12:36:33.840161+00:00</ReleaseDate>
+ <ReleaseDate>2013-07-08T12:36:33</ReleaseDate>
<Tags />
<Location>C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\MPE\APODPlugin.mpe1</Location>
<Params>
@@ -231,120 +217,5 @@
</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 />
- <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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
- <Name>MediaPortal</Name>
- </DependencyItem>
- </Items>
- </Dependencies>
- <PluginDependencies>
- <Items>
- <PluginDependencyItem AssemblyName="APODPlugin.dll">
- <CompatibleVersion>
- <Items>
- <CompatibleVersionItem>
- <MinRequiredVersion>1.2.300.0</MinRequiredVersion>
- <DesignedForVersion>1.2.300.0</DesignedForVersion>
- </CompatibleVersionItem>
- </Items>
- </CompatibleVersion>
- <SubSystemsUsed>
- <Items>
- <SubSystemItem Name="MP.Config" />
- <SubSystemItem Name="MP.SkinEngine" />
- </Items>
- </SubSystemsUsed>
- </PluginDependencyItem>
- </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>2</Build>
- <Revision>0</Revision>
- </Version>
- <ExtensionDescription>Display APOD (Astronomy Picture of the Day) pictures in Mediaportal</ExtensionDescription>
- <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-03-17T12:36:33.840161+00:00</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>
</Items>
</ExtensionCollection>
\ 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: <jmb...@us...> - 2013-07-08 14:59:12
|
Revision: 4599
http://sourceforge.net/p/mp-plugins/code/4599
Author: jmbillings
Date: 2013-07-08 14:59:07 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
unversion .SUO
Removed Paths:
-------------
trunk/plugins/APODPlugin/APODPlugin.v11.suo
Property Changed:
----------------
trunk/plugins/APODPlugin/
Index: trunk/plugins/APODPlugin
===================================================================
--- trunk/plugins/APODPlugin 2013-07-08 08:11:17 UTC (rev 4598)
+++ trunk/plugins/APODPlugin 2013-07-08 14:59:07 UTC (rev 4599)
Property changes on: trunk/plugins/APODPlugin
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+APODPlugin.v11.suo
Deleted: trunk/plugins/APODPlugin/APODPlugin.v11.suo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-08 08:11:21
|
Revision: 4598
http://sourceforge.net/p/mp-plugins/code/4598
Author: jmbillings
Date: 2013-07-08 08:11:17 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Fix for pages where no image is present so we skip over them
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.dll
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/APODPlugin.pdb
trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PostDeploy.ps1
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
trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Added Paths:
-----------
trunk/plugins/APODPlugin/APODPlugin/directions.cs
Modified: trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-05 20:44:18 UTC (rev 4597)
+++ trunk/plugins/APODPlugin/APODPlugin/APODDownloader.cs 2013-07-08 08:11:17 UTC (rev 4598)
@@ -14,12 +14,15 @@
String APODURL = "http://apod.nasa.gov/apod/astropix.html";
internal event downloadErrorEvent onDownloadError;
internal event downloadCompleteEvent onDownloadComplete;
+ internal event downloadNoImageFound onDownloadNoImageFound;
public delegate void downloadErrorEvent(object sender, downloadErrorEventArgs e);
public delegate void downloadCompleteEvent(object sender, downloadCompleteEventArgs e);
+ public delegate void downloadNoImageFound(object sender, downloadNoImageEventArgs e);
WebClient client;
WebClient imageClient;
List<String> apodURLs;
int currentStep = 0;
+ directions direction;
internal APODDownloader()
{
@@ -28,10 +31,11 @@
apodURLs.Add(APODURL);
}
- internal bool GetImage(int step)
+ internal bool GetImage(int step, directions d)
{
try
{
+ direction = d;
currentStep = step;
client.OpenReadCompleted += new OpenReadCompletedEventHandler(readComplete);
client.OpenReadAsync(new Uri(apodURLs[step]));
@@ -67,6 +71,13 @@
client.OpenReadCompleted -= readComplete;
client.Dispose();
+ //Find the previous page URL as well... i.e. <a href="ap130319.html"><</a>
+ Match prevMatcher = Regex.Match(pagesource, "(?<=<a href=\")(.+?)(?=\"><</a>)");
+ String prevURL = "http://apod.nasa.gov/apod/" + prevMatcher.Value;
+ if (!apodURLs.Contains(prevURL))
+ apodURLs.Add(prevURL);
+
+ //Now look for image
Match sourceMatcher = Regex.Match(pagesource, "(?<=<IMG SRC=\")(.+?)(?=\")", RegexOptions.Singleline);
if (sourceMatcher.Success)
{
@@ -75,14 +86,9 @@
}
else
{
- onDownloadError(this, new downloadErrorEventArgs(new Exception("Couldn't find image source :(")));
+ onDownloadNoImageFound(this, new downloadNoImageEventArgs(direction));
+ //onDownloadError(this, new downloadErrorEventArgs(new Exception("No image found, this one might have been a Video... :)")));
}
-
- //Find the previous page URL as well... i.e. <a href="ap130319.html"><</a>
- Match prevMatcher = Regex.Match(pagesource, "(?<=<a href=\")(.+?)(?=\"><</a>)");
- String prevURL = "http://apod.nasa.gov/apod/" + prevMatcher.Value;
- if (!apodURLs.Contains(prevURL))
- apodURLs.Add(prevURL);
}
catch (Exception ex)
{
@@ -134,4 +140,13 @@
bitmap = b;
}
}
+
+ internal class downloadNoImageEventArgs : EventArgs
+ {
+ internal directions scrollDirection;
+ internal downloadNoImageEventArgs(directions d)
+ {
+ scrollDirection = d;
+ }
+ }
}
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-05 20:44:18 UTC (rev 4597)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.cs 2013-07-08 08:11:17 UTC (rev 4598)
@@ -119,7 +119,8 @@
downloader = new APODDownloader();
downloader.onDownloadError += downloader_onDownloadError;
downloader.onDownloadComplete += downloader_onDownloadComplete;
- downloader.GetImage(imageStep);
+ downloader.onDownloadNoImageFound += downloader_onDownloadNoImageFound;
+ downloader.GetImage(imageStep, directions.LEFT);
}
public override void OnAction(MediaPortal.GUI.Library.Action action)
@@ -129,11 +130,28 @@
if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_LEFT)
{
+ doDownload(directions.LEFT);
+ }
+ else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)
+ {
+ doDownload(directions.RIGHT);
+ }
+ else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
+ {
+ //User pressed i
+
+ }
+ }
+
+ private void doDownload(directions d)
+ {
+ if (d == directions.LEFT)
+ {
//User pressed Left
GUIWaitCursor.Show();
downloading = true;
imageStep = imageStep + 1;
- if (!downloader.GetImage(imageStep))
+ if (!downloader.GetImage(imageStep, directions.LEFT))
{
GUIDialogOK dlgOK = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
if (dlgOK != null)
@@ -146,7 +164,7 @@
imageStep = imageStep - 1; //set counter back to where we were
}
}
- else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_MOVE_RIGHT)
+ else if (d == directions.RIGHT)
{
//User pressed right
if (imageStep == 0)
@@ -164,15 +182,17 @@
GUIWaitCursor.Show();
downloading = true;
imageStep = imageStep - 1;
- downloader.GetImage(imageStep);
+ downloader.GetImage(imageStep, directions.RIGHT);
}
- else if (action.wID == MediaPortal.GUI.Library.Action.ActionType.ACTION_SHOW_INFO)
- {
- //User pressed i
-
- }
}
+ void downloader_onDownloadNoImageFound(object sender, downloadNoImageEventArgs e)
+ {
+ //happens when no image found; skip next back/forwards in series.
+ GUIWaitCursor.Hide();
+ doDownload(e.scrollDirection);
+ }
+
void downloader_onDownloadComplete(object sender, downloadCompleteEventArgs e)
{
Rectangle screenRect = Screen.PrimaryScreen.Bounds;
Modified: trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-05 20:44:18 UTC (rev 4597)
+++ trunk/plugins/APODPlugin/APODPlugin/APODPlugin.csproj 2013-07-08 08:11:17 UTC (rev 4598)
@@ -57,6 +57,7 @@
<ItemGroup>
<Compile Include="APODDownloader.cs" />
<Compile Include="APODPlugin.cs" />
+ <Compile Include="directions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
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/PostDeploy.ps1
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PostDeploy.ps1 2013-07-05 20:44:18 UTC (rev 4597)
+++ trunk/plugins/APODPlugin/APODPlugin/bin/Debug/PostDeploy.ps1 2013-07-08 08:11:17 UTC (rev 4598)
@@ -1 +1,59 @@
-print "test"
\ No newline at end of file
+write "Copying Files to Mediaportal folders"
+if ([System.IntPtr]::Size -eq 4)
+{
+ write "32-bit OS detected..."
+ if (Test-Path 'C:\Program Files\team mediaportal\mediaportal\plugins\windows')
+ {
+ Copy-Item -Path '.\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files\team mediaportal\mediaportal\plugins\windows'
+ write "Copied plugin DLL to Mediaportal Plugins folder"
+ }
+ else
+ {
+ write "Mediaportal plugins folder not found. Is Mediaportal installed..?"
+ }
+}
+else
+{
+ write "64-bit OS detected..."
+ if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows')
+ {
+ Copy-Item -Path '.\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows'
+ write "Copied plugin DLL to Mediaportal Plugins folder"
+ }
+ else
+ {
+ write "Mediaportal plugins folder not found. Is Mediaportal installed..?"
+ }
+}
+
+if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Default')
+{
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Default'
+ write "Copied Plugin XML to Default skin folder"
+}
+else
+{
+ write "Default skin folder not found, skipping file copy"
+}
+
+if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\DefaultWide')
+{
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\DefaultWide'
+ write "Copied Plugin XML to DefaultWide skin folder"
+}
+else
+{
+ write "DefaultWide skin folder not found, skipping file copy"
+}
+
+if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Titan')
+{
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Titan'
+ write "Copied Plugin XML to Titan skin folder"
+}
+else
+{
+ write "Titan skin folder not found, skipping file copy"
+}
+
+write "Plugin installation ended"
Added: trunk/plugins/APODPlugin/APODPlugin/directions.cs
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/directions.cs (rev 0)
+++ trunk/plugins/APODPlugin/APODPlugin/directions.cs 2013-07-08 08:11:17 UTC (rev 4598)
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace APODPlugin
+{
+ public enum directions
+ {
+ LEFT,
+ RIGHT
+ }
+}
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-05 20:44:18 UTC (rev 4597)
+++ trunk/plugins/APODPlugin/APODPlugin/obj/Debug/APODPlugin.csproj.FileListAbsolute.txt 2013-07-08 08:11:17 UTC (rev 4598)
@@ -38,3 +38,5 @@
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.dll
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\obj\Debug\APODPlugin.pdb
C:\Users\james.billings\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
+C:\Users\jamesb\Documents\Visual Studio 2012\Projects\APODPlugin\APODPlugin\bin\Debug\PostDeploy.ps1
+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)
Modified: trunk/plugins/APODPlugin/APODPlugin/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-07-05 20:44:21
|
Revision: 4597
http://sourceforge.net/p/mp-plugins/code/4597
Author: doskabouter
Date: 2013-07-05 20:44:18 +0000 (Fri, 05 Jul 2013)
Log Message:
-----------
minor cleanup
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-04 20:59:11 UTC (rev 4596)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-05 20:44:18 UTC (rev 4597)
@@ -308,23 +308,30 @@
}
string loadFav = StartupLink;
-
- if (String.IsNullOrEmpty(webBrowser.Document.Domain))
+ if (!String.IsNullOrEmpty(loadFav))
{
- if ((settings.UseHome) && (string.IsNullOrEmpty(loadFav)))
- {
- webBrowser.Navigate(settings.HomePage);
- MyLog.debug("load home page " + settings.HomePage);
- }
- }
-
- if (!string.IsNullOrEmpty(loadFav))
- {
webBrowser.Navigate(loadFav);
MyLog.debug("load favorite " + loadFav);
StartupLink = string.Empty;
}
+ else
+ {
+ if (String.IsNullOrEmpty(webBrowser.Document.Domain))
+ {
+ if (settings.UseHome)
+ {
+ webBrowser.Navigate(settings.HomePage);
+ MyLog.debug("load home page " + settings.HomePage);
+ }
+ else
+ {
+ webBrowser.Navigate("about:blank");
+ MyLog.debug("load about:blank");
+ }
+ }
+ }
+
#endregion
osd_linkID.Location = new System.Drawing.Point((GUIGraphicsContext.form.Width / 2) - (osd_linkID.Width / 2),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-07-04 20:59:14
|
Revision: 4596
http://sourceforge.net/p/mp-plugins/code/4596
Author: doskabouter
Date: 2013-07-04 20:59:11 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
Fixed some gui issues: briefly flash the desktop, and briefly show a black rectangle at top-left
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-02 19:53:18 UTC (rev 4595)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-04 20:59:11 UTC (rev 4596)
@@ -192,14 +192,14 @@
webBrowser = new GeckoWebBrowser();
webBrowser.Name = "BrowseTheWeb";
webBrowser.NoDefaultContextMenu = true;
-
- GUIGraphicsContext.form.Controls.Add(webBrowser);
webBrowser.Enabled = false;
webBrowser.Visible = false;
+ GUIGraphicsContext.form.Controls.Add(webBrowser);
+
osd_linkID = new OSD_LinkId();
+ osd_linkID.Visible = false;
GUIGraphicsContext.form.Controls.Add(osd_linkID);
- osd_linkID.Visible = false;
string preferenceFile = Path.Combine(Config.GetFolder(Config.Dir.Config), "btwebprefs.js");
if (File.Exists(preferenceFile))
GeckoPreferences.Load(preferenceFile);
@@ -277,14 +277,15 @@
Parameter = _loadParameter;
#region init browser
+
+ webBrowser.Dock = DockStyle.None;
+ SetBrowserWindow();
+
webBrowser.Visible = true;
webBrowser.Enabled = settings.UseMouse;
webBrowser.ClearCachedCOMPtrs();
- webBrowser.Dock = DockStyle.None;
- SetBrowserWindow();
-
MyLog.debug("Create eventhandler");
webBrowser.DocumentCompleted += new EventHandler(webBrowser_DocumentCompleted);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-07-02 19:53:20
|
Revision: 4595
http://sourceforge.net/p/mp-plugins/code/4595
Author: doskabouter
Date: 2013-07-02 19:53:18 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Release 1.3.0.0
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2
trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
Added Paths:
-----------
trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1
Added: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1
===================================================================
(Binary files differ)
Index: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1 2013-07-02 13:26:46 UTC (rev 4594)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1 2013-07-02 19:53:18 UTC (rev 4595)
Property changes on: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2013-07-02 13:26:46 UTC (rev 4594)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml 2013-07-02 19:53:18 UTC (rev 4595)
@@ -584,5 +584,155 @@
</ProjectSettings>
<IsSkin>false</IsSkin>
</PackageClass>
+ <PackageClass>
+ <Version>2.0</Version>
+ <Groups>
+ <Items>
+ <GroupItem Name="Common">
+ <DisplayName>Common</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Common</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Default">
+ <DisplayName>Default</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Default</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="DefaultWide">
+ <DisplayName>DefaultWide</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>DefaultWide</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Titan">
+ <DisplayName>Titan</DisplayName>
+ <DefaulChecked>false</DefaulChecked>
+ <Description>Titan</Description>
+ <Files>
+ <Items />
+ </Files>
+ </GroupItem>
+ <GroupItem Name="Skins">
+ <DisplayName>Skins</DisplayName>
+ <DefaulChecked>true</DefaulChecked>
+ <Description>Skins</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>requires MediaPortal version 1.1.6.27644 to 1.1.6.27644.</Message>
+ <Name>MediaPortal</Name>
+ </DependencyItem>
+ </Items>
+ </Dependencies>
+ <PluginDependencies>
+ <Items>
+ <PluginDependencyItem AssemblyName="BrowseTheWeb.dll">
+ <CompatibleVersion>
+ <Items>
+ <CompatibleVersionItem>
+ <MinRequiredVersion>1.1.7.0</MinRequiredVersion>
+ <DesignedForVersion>1.3.100.0</DesignedForVersion>
+ </CompatibleVersionItem>
+ </Items>
+ </CompatibleVersion>
+ <SubSystemsUsed>
+ <Items>
+ <SubSystemItem Name="MP.Config" />
+ <SubSystemItem Name="MP.DB" />
+ <SubSystemItem Name="MP.SkinEngine" />
+ </Items>
+ </SubSystemsUsed>
+ </PluginDependencyItem>
+ </Items>
+ </PluginDependencies>
+ <GeneralInfo>
+ <Name>Browse The Web</Name>
+ <Id>2869e8cd-579e-4fdb-ad6d-19ff5bd4e46f</Id>
+ <Author>Doskabouter</Author>
+ <HomePage>http://www.team-mediaportal.com/extensions/news-info/browse-the-web-webbrowser</HomePage>
+ <ForumPage>http://forum.team-mediaportal.com/threads/browse-the-web-webbrowser.107285/</ForumPage>
+ <UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
+ <Version>
+ <Major>1</Major>
+ <Minor>3</Minor>
+ <Build>0</Build>
+ <Revision>0</Revision>
+ </Version>
+ <ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
+ <VersionDescription>Fixed creation of thumbnails
+Better handling of <a> elements with onclick handler
+Reuse numbers for <a> elements with same href</VersionDescription>
+ <DevelopmentStatus>Stable</DevelopmentStatus>
+ <OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.1.3.0.0.mpe1</OnlineLocation>
+ <ReleaseDate>2013-07-02T21:43:02.437834+02:00</ReleaseDate>
+ <Tags>webbrowser, internet, web</Tags>
+ <Location>..\..\BrowseTheWeb.mpe1</Location>
+ <Params>
+ <Items>
+ <SectionParam Name="Online Icon">
+ <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>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/browser1.jpg;http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/setup3.jpg</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/BrowseTheWeb/Release/BrowseTheWeb.xmp2
===================================================================
--- trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2013-07-02 13:26:46 UTC (rev 4594)
+++ trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xmp2 2013-07-02 19:53:18 UTC (rev 4595)
@@ -724,18 +724,17 @@
<UpdateUrl>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.xml</UpdateUrl>
<Version>
<Major>1</Major>
- <Minor>2</Minor>
+ <Minor>3</Minor>
<Build>0</Build>
<Revision>0</Revision>
</Version>
<ExtensionDescription>Webrowser based on xulrunner and the "Gecko Browser" / Webbrowser.</ExtensionDescription>
- <VersionDescription>Added compatibility with 1.4.0
-Fixed click issue when zoom isn't 100%
-Fixed missing round corners at link-numbers
-Improved placement of link-numbers</VersionDescription>
+ <VersionDescription>Fixed creation of thumbnails
+Better handling of <a> elements with onclick handler
+Reuse numbers for <a> elements with same href</VersionDescription>
<DevelopmentStatus>Stable</DevelopmentStatus>
<OnlineLocation>http://svn.code.sf.net/p/mp-plugins/code/trunk/plugins/BrowseTheWeb/Release/BrowseTheWeb.[Version].mpe1</OnlineLocation>
- <ReleaseDate>2013-05-18T21:31:58.202852+02:00</ReleaseDate>
+ <ReleaseDate>2013-07-02T21:43:02.437834+02:00</ReleaseDate>
<Tags>webbrowser, internet, web</Tags>
<Location>..\..\BrowseTheWeb.mpe1</Location>
<Params>
Modified: trunk/plugins/BrowseTheWeb/Release/Plugins/Windows/BrowseTheWeb.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2013-07-02 13:26:46 UTC (rev 4594)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/Properties/AssemblyInfo.cs 2013-07-02 19:53:18 UTC (rev 4595)
@@ -38,5 +38,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-02 13:26:48
|
Revision: 4594
http://sourceforge.net/p/mp-plugins/code/4594
Author: jmbillings
Date: 2013-07-02 13:26:46 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix path
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
Modified: trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:22:38 UTC (rev 4593)
+++ trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:26:46 UTC (rev 4594)
@@ -4,7 +4,7 @@
write "32-bit OS detected..."
if (Test-Path 'C:\Program Files\team mediaportal\mediaportal\plugins\windows')
{
- Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files\team mediaportal\mediaportal\plugins\windows'
+ Copy-Item -Path '.\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files\team mediaportal\mediaportal\plugins\windows'
write "Copied plugin DLL to Mediaportal Plugins folder"
}
else
@@ -17,7 +17,7 @@
write "64-bit OS detected..."
if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows')
{
- Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows'
+ Copy-Item -Path '.\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows'
write "Copied plugin DLL to Mediaportal Plugins folder"
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-02 13:22:40
|
Revision: 4593
http://sourceforge.net/p/mp-plugins/code/4593
Author: jmbillings
Date: 2013-07-02 13:22:38 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix it properly. Double muppet.
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
Modified: trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:19:48 UTC (rev 4592)
+++ trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:22:38 UTC (rev 4593)
@@ -2,9 +2,9 @@
if ([System.IntPtr]::Size -eq 4)
{
write "32-bit OS detected..."
- if (Test-Path 'C:\Program Files\team mediaportal\mediaportal\plugins\window')
+ if (Test-Path 'C:\Program Files\team mediaportal\mediaportal\plugins\windows')
{
- Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window'
+ Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files\team mediaportal\mediaportal\plugins\windows'
write "Copied plugin DLL to Mediaportal Plugins folder"
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-02 13:19:51
|
Revision: 4592
http://sourceforge.net/p/mp-plugins/code/4592
Author: jmbillings
Date: 2013-07-02 13:19:48 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Fix plugin path (muppet)
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
Modified: trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:01:42 UTC (rev 4591)
+++ trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:19:48 UTC (rev 4592)
@@ -15,9 +15,9 @@
else
{
write "64-bit OS detected..."
- if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window')
+ if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows')
{
- Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window'
+ Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\windows'
write "Copied plugin DLL to Mediaportal Plugins folder"
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmb...@us...> - 2013-07-02 13:01:46
|
Revision: 4591
http://sourceforge.net/p/mp-plugins/code/4591
Author: jmbillings
Date: 2013-07-02 13:01:42 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Update deployment powershell for OS bitness detection and referencing content folder.
Modified Paths:
--------------
trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
Modified: trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1
===================================================================
--- trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-01 20:30:37 UTC (rev 4590)
+++ trunk/plugins/APODPlugin/APODPlugin/PostDeploy.ps1 2013-07-02 13:01:42 UTC (rev 4591)
@@ -1,17 +1,34 @@
write "Copying Files to Mediaportal folders"
-if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window')
+if ([System.IntPtr]::Size -eq 4)
{
- Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window'
- write "Copied plugin DLL to Mediaportal Plugins folder"
+ write "32-bit OS detected..."
+ if (Test-Path 'C:\Program Files\team mediaportal\mediaportal\plugins\window')
+ {
+ Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window'
+ write "Copied plugin DLL to Mediaportal Plugins folder"
+ }
+ else
+ {
+ write "Mediaportal plugins folder not found. Is Mediaportal installed..?"
+ }
}
else
{
- write "Mediaportal plugins folder not found. Is Mediaportal installed..?"
+ write "64-bit OS detected..."
+ if (Test-Path 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window')
+ {
+ Copy-Item -Path '..\lib\net35\APODPlugin.dll' -Destination 'C:\Program Files (x86)\team mediaportal\mediaportal\plugins\window'
+ write "Copied plugin DLL to Mediaportal Plugins folder"
+ }
+ else
+ {
+ write "Mediaportal plugins folder not found. Is Mediaportal installed..?"
+ }
}
if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Default')
{
- Copy-Item -Path '.\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Default'
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Default'
write "Copied Plugin XML to Default skin folder"
}
else
@@ -21,7 +38,7 @@
if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\DefaultWide')
{
- Copy-Item -Path '.\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\DefaultWide'
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\DefaultWide'
write "Copied Plugin XML to DefaultWide skin folder"
}
else
@@ -31,7 +48,7 @@
if (Test-Path 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Titan')
{
- Copy-Item -Path '.\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Titan'
+ Copy-Item -Path '.\content\APODPlugin.xml' -Destination 'C:\ProgramData\Team Mediaportal\Mediaportal\Skin\Titan'
write "Copied Plugin XML to Titan skin folder"
}
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dos...@us...> - 2013-07-01 20:30:40
|
Revision: 4590
http://sourceforge.net/p/mp-plugins/code/4590
Author: doskabouter
Date: 2013-07-01 20:30:37 +0000 (Mon, 01 Jul 2013)
Log Message:
-----------
- Better handling of <a> elements with onclick handler
- Reuse numbers for <a> elements with same href
Modified Paths:
--------------
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2013-07-01 18:54:43 UTC (rev 4589)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/DomHelper.cs 2013-07-01 20:30:37 UTC (rev 4590)
@@ -1,4 +1,5 @@
using System;
+using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using Gecko;
@@ -85,6 +86,7 @@
private static void AddLinksToPage(GeckoDocument document, int id)
{
+ Dictionary<string, int> hrefs = new Dictionary<string, int>();
GeckoElementCollection links = document.Links;
MyLog.debug("page links cnt : " + links.Count);
foreach (GeckoHtmlElement element in links) // no casting to GeckoAnchorElement, because document.links also returns GeckoAreaElemenets
@@ -105,9 +107,24 @@
GeckoElement ls = element;
while (ls.LastChild != null && ls.LastChild is GeckoElement && !String.IsNullOrEmpty(ls.LastChild.TextContent))
ls = (GeckoElement)ls.LastChild;
- insertSpanAfter(id, lastSpan.ClassName, ls);
- SetLinkAttributes(element, id);
- id++;
+
+ int newId;
+ string url = element.GetAttribute("href");
+ if (!element.HasAttribute("onclick"))
+ {
+ if (hrefs.ContainsKey(url))
+ newId = hrefs[url];
+ else
+ {
+ newId = id++;
+ hrefs.Add(url, newId);
+ }
+ }
+ else
+ newId = id++;
+
+ insertSpanAfter(newId, lastSpan.ClassName, ls);
+ SetLinkAttributes(element, newId);
}
}
Modified: trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs
===================================================================
--- trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-01 18:54:43 UTC (rev 4589)
+++ trunk/plugins/BrowseTheWeb/Source/BrowseTheWeb/GUIPlugin.cs 2013-07-01 20:30:37 UTC (rev 4590)
@@ -956,7 +956,7 @@
return;
}
- if (ge is GeckoAnchorElement)
+ if (ge is GeckoAnchorElement && !ge.HasAttribute("onclick"))
{
string link = ((GeckoAnchorElement)ge).Href;
webBrowser.Navigate(link);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
