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: <rs...@us...> - 2007-09-14 18:38:48
|
Revision: 923
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=923&view=rev
Author: rsparey
Date: 2007-09-14 11:38:46 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-09-14 15:47:56
|
Revision: 922
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=922&view=rev
Author: rsparey
Date: 2007-09-14 08:47:26 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/common.facade.music.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.facade.music.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.facade.music.xml 2007-09-14 12:32:10 UTC (rev 921)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.facade.music.xml 2007-09-14 15:47:26 UTC (rev 922)
@@ -89,6 +89,57 @@
<type>playlistcontrol</type>
<id>50</id>
<scrollOffset>2</scrollOffset>
+
+ <posX>30</posX>
+ <posY>200
+ </posY>
+ <width>1190</width>
+ <height>475</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1270</spinPosX>
+ <spinPosY>480</spinPosY>
+ <spinColor>ffffffff</spinColor>
+
+
+
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font9</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>650</textXOff2>
+ <textYOff2>7</textYOff2>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ <upBtnWidth>35</upBtnWidth>
+ <downBtnWidth>35</downBtnWidth>
+ <deleteBtnWidth>35</deleteBtnWidth>
+ <upBtnHeight>35</upBtnHeight>
+ <downBtnHeight>35</downBtnHeight>
+ <deleteBtnHeight>35</deleteBtnHeight>
+ <upBtnXOffset>1200</upBtnXOffset>
+ <downBtnXOffset>1237</downBtnXOffset>
+ <deleteBtnXOffset>1273</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureMoveUp>arrow_round_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>arrow_round_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>arrow_round_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>arrow_round_down_focus.png</textureMoveDownFocused>
+ <textureDelete>dialogue_shutdown_nofocus.png</textureDelete>
+ <textureDeleteFocused>dialogue_shutdown_focus.png</textureDeleteFocused>
+
</control>
</control>
</control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-14 12:32:10 UTC (rev 921)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-14 15:47:26 UTC (rev 922)
@@ -216,7 +216,202 @@
<hyperlink>510</hyperlink>
</control>
- <import>common.facade.playlist.xml</import>
+<control>
+ <type>group</type>
+ <animation effect="slide" time="400" start="0,-300">WindowOpen</animation>
+ <animation effect="slide" time="400" end="800,0">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <description>group element</description>
+ <control>
+ <description>composite control consisting of a list control and a thumbnail panel</description>
+ <type>facadeview</type>
+ <id>50</id>
+ <control>
+ <description>Thumbnail Panel</description>
+ <type>thumbnailpanel</type>
+ <id>51</id>
+ <onleft>2</onleft>
+ <onright>52</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ <control>
+ <description>album view listcontrol</description>
+ <type>listcontrol</type>
+ <subtype>album</subtype>
+ <id>50</id>
+ <font>font13</font>
+ <font2>font13</font2>
+ <selectedColor>FFFF6600</selectedColor>
+ <textcolor>FFB2D4F5</textcolor>
+ <selectedColor2>FFFF6600</selectedColor2>
+ <textcolor2>FFB2D4F5</textcolor2>
+ <textXOff>36</textXOff>
+ <textYOff>20</textYOff>
+ <textXOff2>712</textXOff2>
+ <textYOff2>80</textYOff2>
+ <itemWidth>136</itemWidth>
+ <itemHeight>102</itemHeight>
+ <spaceBetweenItems>5</spaceBetweenItems>
+ <textureHeight>132</textureHeight>
+ <scrollOffset>2</scrollOffset>
+ <onleft>2</onleft>
+ <onright>52</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ </control>
+ <control>
+ <description>playlist control</description>
+ <type>playlistcontrol</type>
+ <id>53</id>
+ <onleft>2</onleft>
+ <onright>53</onright>
+ <onup>2</onup>
+ <ondown>2</ondown>
+ <posX>30</posX>
+ <posY>200
+ </posY>
+ <width>1190</width>
+ <height>475</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1270</spinPosX>
+ <spinPosY>480</spinPosY>
+ <spinColor>ffffffff</spinColor>
+
+
+
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font9</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>650</textXOff2>
+ <textYOff2>7</textYOff2>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ <upBtnWidth>35</upBtnWidth>
+ <downBtnWidth>35</downBtnWidth>
+ <deleteBtnWidth>35</deleteBtnWidth>
+ <upBtnHeight>35</upBtnHeight>
+ <downBtnHeight>35</downBtnHeight>
+ <deleteBtnHeight>35</deleteBtnHeight>
+ <upBtnXOffset>1200</upBtnXOffset>
+ <downBtnXOffset>1237</downBtnXOffset>
+ <deleteBtnXOffset>1273</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureMoveUp>arrow_round_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>arrow_round_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>arrow_round_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>arrow_round_down_focus.png</textureMoveDownFocused>
+ <textureDelete>dialogue_shutdown_nofocus.png</textureDelete>
+ <textureDeleteFocused>dialogue_shutdown_focus.png</textureDeleteFocused>
+ </control>
+ <control>
+ <description>playlist item button</description>
+ <type>playlistbutton</type>
+ <id>5</id>
+ <posX>189</posX>
+ <posY>133</posY>
+ <width>566</width>
+ <height>50</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <upBtnWidth>33</upBtnWidth>
+ <downBtnWidth>33</downBtnWidth>
+ <deleteBtnWidth>37</deleteBtnWidth>
+ <upBtnHeight>42</upBtnHeight>
+ <downBtnHeight>42</downBtnHeight>
+ <deleteBtnHeight>42</deleteBtnHeight>
+ <upBtnXOffset>654</upBtnXOffset>
+ <downBtnXOffset>703</downBtnXOffset>
+ <deleteBtnXOffset>753</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureFocus>playlist_sub_focus.png</textureFocus>
+ <textureNoFocus>playlist_sub_nofocus.png</textureNoFocus>
+ <textureMoveUp>playlist_item_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>playlist_item_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>playlist_item_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>playlist_item_down_focus.png</textureMoveDownFocused>
+ <textureDelete>playlist_item_delete_nofocus.png</textureDelete>
+ <textureDeleteFocused>playlist_item_delete_focus.png</textureDeleteFocused>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default thumbnail panel</description>
+ <type>thumbnailpanel</type>
+ <id>11</id>
+ <posX>30</posX>
+ <posY>198</posY>
+ <width>1316</width>
+ <height>350</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>80</itemWidth>
+ <itemHeight>60</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>60</textureHeight>
+ <thumbWidth>80</thumbWidth>
+ <thumbHeight>60</thumbHeight>
+ <thumbPosX>15</thumbPosX>
+ <thumbPosY>15</thumbPosY>
+ <imageFolder>-</imageFolder>
+ <imageFolderFocus>-</imageFolderFocus>
+
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>ffb9d5dd</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>105</textureWidthBig><!-- 150 -->
+ <textureHeightBig>105</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>105</itemWidthBig><!-- 180 -->
+ <itemHeightBig>105</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>105</thumbWidthBig>
+ <thumbHeightBig>105</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <unfocusedAlpha>180</unfocusedAlpha>
+ <textXOff>-5000</textXOff>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
+ </control>
+ </control>
+ </control>
<control>
@@ -289,5 +484,6 @@
<animation effect="fade" time="250">visiblechange</animation>
<animation effect="slide" end="0,36" time="250">visiblechange</animation>
</control>
+
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml 2007-09-14 12:32:10 UTC (rev 921)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml 2007-09-14 15:47:26 UTC (rev 922)
@@ -341,116 +341,8 @@
<textXOff>0</textXOff>
<textYOff>0</textYOff>
</control>
- <control>
- <description>default filmstrip</description>
- <type>filmstrip</type>
- <id>11</id>
- <posX>463</posX>
- <posY>560</posY>
- <width>866</width>
- <height>133</height>
- <spinWidth>34</spinWidth>
- <spinHeight>36</spinHeight>
- <spinPosX>800</spinPosX>
- <spinPosY>90</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focus.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <itemWidth>120</itemWidth>
- <itemHeight>136</itemHeight>
- <textureWidth>112</textureWidth>
- <textureHeight>112</textureHeight>
- <thumbWidth>85</thumbWidth>
- <thumbHeight>85</thumbHeight>
- <thumbPosX>13</thumbPosX>
- <thumbPosY>13</thumbPosY>
- <imageFolder>icon_empty_nofocus.png</imageFolder>
- <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
- <font>font13</font>
- <selectedColor>ffffffff</selectedColor>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <remoteColor>ffFFA075</remoteColor>
- <downloadColor>ff80ff80</downloadColor>
- <suffix>|</suffix>
- <textureWidthBig>150</textureWidthBig>
- <textureHeightBig>150</textureHeightBig>
- <itemWidthBig>180</itemWidthBig>
- <itemHeightBig>180</itemHeightBig>
- <thumbWidthBig>112</thumbWidthBig>
- <thumbHeightBig>112</thumbHeightBig>
- <thumbPosXBig>22</thumbPosXBig>
- <thumbPosYBig>16</thumbPosYBig>
- <background>-</background>
- <backgroundx>692</backgroundx>
- <backgroundy>100</backgroundy>
- <backgroundwidth>100</backgroundwidth>
- <backgroundheight>600</backgroundheight>
- <backgrounddiffuse>60ffffff</backgrounddiffuse>
- <InfoImage>-</InfoImage>
- <InfoImagex>692</InfoImagex>
- <InfoImagey>152</InfoImagey>
- <InfoImagewidth>375</InfoImagewidth>
- <InfoImageheight>375</InfoImageheight>
- <InfoImagediffuse>ffffffff</InfoImagediffuse>
- </control>
- <control>
- <description>default filmstrip</description>
- <type>filmstrip</type>
- <id>11</id>
- <posX>463</posX>
- <posY>560</posY>
- <width>866</width>
- <height>133</height>
- <spinWidth>34</spinWidth>
- <spinHeight>36</spinHeight>
- <spinPosX>800</spinPosX>
- <spinPosY>90</spinPosY>
- <spinColor>ffffffff</spinColor>
- <textureUp>page_up_nofocus.png</textureUp>
- <textureDown>page_down_nofocus.png</textureDown>
- <textureUpFocus>page_up_focus.png</textureUpFocus>
- <textureDownFocus>page_down_focus.png</textureDownFocus>
- <itemWidth>120</itemWidth>
- <itemHeight>136</itemHeight>
- <textureWidth>112</textureWidth>
- <textureHeight>112</textureHeight>
- <thumbWidth>85</thumbWidth>
- <thumbHeight>85</thumbHeight>
- <thumbPosX>13</thumbPosX>
- <thumbPosY>13</thumbPosY>
- <imageFolder>icon_empty_nofocus.png</imageFolder>
- <imageFolderFocus>icon_empty_focus.png</imageFolderFocus>
- <font>font13</font>
- <selectedColor>ffffffff</selectedColor>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <remoteColor>ffFFA075</remoteColor>
- <downloadColor>ff80ff80</downloadColor>
- <suffix>|</suffix>
- <textureWidthBig>150</textureWidthBig>
- <textureHeightBig>150</textureHeightBig>
- <itemWidthBig>180</itemWidthBig>
- <itemHeightBig>180</itemHeightBig>
- <thumbWidthBig>112</thumbWidthBig>
- <thumbHeightBig>112</thumbHeightBig>
- <thumbPosXBig>22</thumbPosXBig>
- <thumbPosYBig>16</thumbPosYBig>
- <background>-</background>
- <backgroundx>692</backgroundx>
- <backgroundy>100</backgroundy>
- <backgroundwidth>100</backgroundwidth>
- <backgroundheight>600</backgroundheight>
- <backgrounddiffuse>60ffffff</backgrounddiffuse>
- <InfoImage>-</InfoImage>
- <InfoImagex>692</InfoImagex>
- <InfoImagey>152</InfoImagey>
- <InfoImagewidth>375</InfoImagewidth>
- <InfoImageheight>375</InfoImageheight>
- <InfoImagediffuse>ffffffff</InfoImagediffuse>
- </control>
+
+
<control>
<description>default filmstrip</description>
<type>filmstrip</type>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <chr...@us...> - 2007-09-14 12:32:15
|
Revision: 921
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=921&view=rev
Author: chreekar
Date: 2007-09-14 05:32:10 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Support for .bat-files as Emulator executable
Modified Paths:
--------------
trunk/plugins/MyEmulators/myEmulators/Class1.cs
trunk/plugins/MyEmulators/output.rar
Modified: trunk/plugins/MyEmulators/myEmulators/Class1.cs
===================================================================
--- trunk/plugins/MyEmulators/myEmulators/Class1.cs 2007-09-14 10:17:12 UTC (rev 920)
+++ trunk/plugins/MyEmulators/myEmulators/Class1.cs 2007-09-14 12:32:10 UTC (rev 921)
@@ -286,7 +286,7 @@
String path = selected.getParentItem().getEmulator_path();
String args = "";
//Takes away the switch from path if it exists
- if (!path.EndsWith(".exe"))
+ if (!path.EndsWith(".exe") && !path.EndsWith(".bat"))
{
args += path.Substring(path.LastIndexOf('.') + 5) + " ";
path = path.Remove(path.LastIndexOf('.') + 4);
Modified: trunk/plugins/MyEmulators/output.rar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-09-14 10:17:14
|
Revision: 920
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=920&view=rev
Author: and-81
Date: 2007-09-14 03:17:12 -0700 (Fri, 14 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj
trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj
trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLircServer.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Windows Message Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10 Transceiver.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/X10Transceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/XBCDRC Receiver.csproj
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -513,7 +513,7 @@
BitConverter.GetBytes(keyCode).CopyTo(data, 0);
BitConverter.GetBytes(0).CopyTo(data, 4);
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, data);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, data);
PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Client.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -3,39 +3,18 @@
namespace IRServer
{
- class Client
+ struct Client
{
- #region Variables
-
- string _pipe;
- string _server;
+ public string Pipe;
+ public string Server;
- #endregion
-
- #region Properties
-
- public string Pipe
- {
- get { return _pipe; }
- }
- public string Server
- {
- get { return _server; }
- }
-
- #endregion
-
- #region Constructor
-
public Client(string pipe, string server)
{
- _pipe = pipe;
- _server = server;
+ Pipe = pipe;
+ Server = server;
}
- #endregion Constructor
-
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.Designer.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -34,23 +34,17 @@
this.buttonCancel = new System.Windows.Forms.Button();
this.toolTips = new System.Windows.Forms.ToolTip(this.components);
this.checkBoxRunAtBoot = new System.Windows.Forms.CheckBox();
- this.radioButtonServer = new System.Windows.Forms.RadioButton();
- this.radioButtonRelay = new System.Windows.Forms.RadioButton();
- this.radioButtonRepeater = new System.Windows.Forms.RadioButton();
this.groupBoxTransceiver = new System.Windows.Forms.GroupBox();
this.gridPlugins = new SourceGrid.Grid();
- this.groupBoxMode = new System.Windows.Forms.GroupBox();
- this.labelComputer = new System.Windows.Forms.Label();
- this.comboBoxComputer = new System.Windows.Forms.ComboBox();
this.buttonHelp = new System.Windows.Forms.Button();
+ this.buttonAdvanced = new System.Windows.Forms.Button();
this.groupBoxTransceiver.SuspendLayout();
- this.groupBoxMode.SuspendLayout();
this.SuspendLayout();
//
// buttonOK
//
this.buttonOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonOK.Location = new System.Drawing.Point(296, 408);
+ this.buttonOK.Location = new System.Drawing.Point(352, 280);
this.buttonOK.Name = "buttonOK";
this.buttonOK.Size = new System.Drawing.Size(64, 24);
this.buttonOK.TabIndex = 4;
@@ -62,7 +56,7 @@
//
this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.buttonCancel.Location = new System.Drawing.Point(368, 408);
+ this.buttonCancel.Location = new System.Drawing.Point(424, 280);
this.buttonCancel.Name = "buttonCancel";
this.buttonCancel.Size = new System.Drawing.Size(64, 24);
this.buttonCancel.TabIndex = 5;
@@ -72,51 +66,16 @@
//
// checkBoxRunAtBoot
//
- this.checkBoxRunAtBoot.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.checkBoxRunAtBoot.Location = new System.Drawing.Point(16, 408);
+ this.checkBoxRunAtBoot.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+ this.checkBoxRunAtBoot.AutoSize = true;
+ this.checkBoxRunAtBoot.Location = new System.Drawing.Point(168, 288);
this.checkBoxRunAtBoot.Name = "checkBoxRunAtBoot";
- this.checkBoxRunAtBoot.Size = new System.Drawing.Size(176, 24);
- this.checkBoxRunAtBoot.TabIndex = 2;
+ this.checkBoxRunAtBoot.Size = new System.Drawing.Size(165, 17);
+ this.checkBoxRunAtBoot.TabIndex = 3;
this.checkBoxRunAtBoot.Text = "&Start IR Server with Windows";
this.toolTips.SetToolTip(this.checkBoxRunAtBoot, "Run IR Server when windows boots up?");
this.checkBoxRunAtBoot.UseVisualStyleBackColor = true;
//
- // radioButtonServer
- //
- this.radioButtonServer.Location = new System.Drawing.Point(16, 24);
- this.radioButtonServer.Name = "radioButtonServer";
- this.radioButtonServer.Size = new System.Drawing.Size(128, 24);
- this.radioButtonServer.TabIndex = 0;
- this.radioButtonServer.TabStop = true;
- this.radioButtonServer.Text = "Server mode";
- this.toolTips.SetToolTip(this.radioButtonServer, "Server mode (default)");
- this.radioButtonServer.UseVisualStyleBackColor = true;
- this.radioButtonServer.CheckedChanged += new System.EventHandler(this.radioButtonServer_CheckedChanged);
- //
- // radioButtonRelay
- //
- this.radioButtonRelay.Location = new System.Drawing.Point(16, 56);
- this.radioButtonRelay.Name = "radioButtonRelay";
- this.radioButtonRelay.Size = new System.Drawing.Size(128, 24);
- this.radioButtonRelay.TabIndex = 1;
- this.radioButtonRelay.TabStop = true;
- this.radioButtonRelay.Text = "Button relay mode";
- this.toolTips.SetToolTip(this.radioButtonRelay, "Relays button presses to another IR Server");
- this.radioButtonRelay.UseVisualStyleBackColor = true;
- this.radioButtonRelay.CheckedChanged += new System.EventHandler(this.radioButtonRelay_CheckedChanged);
- //
- // radioButtonRepeater
- //
- this.radioButtonRepeater.Location = new System.Drawing.Point(16, 88);
- this.radioButtonRepeater.Name = "radioButtonRepeater";
- this.radioButtonRepeater.Size = new System.Drawing.Size(128, 24);
- this.radioButtonRepeater.TabIndex = 2;
- this.radioButtonRepeater.TabStop = true;
- this.radioButtonRepeater.Text = "IR repeater mode";
- this.toolTips.SetToolTip(this.radioButtonRepeater, "Acts as a repeater for another IR Server\'s IR blasting");
- this.radioButtonRepeater.UseVisualStyleBackColor = true;
- this.radioButtonRepeater.CheckedChanged += new System.EventHandler(this.radioButtonRepeater_CheckedChanged);
- //
// groupBoxTransceiver
//
this.groupBoxTransceiver.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
@@ -125,10 +84,10 @@
this.groupBoxTransceiver.Controls.Add(this.gridPlugins);
this.groupBoxTransceiver.Location = new System.Drawing.Point(8, 8);
this.groupBoxTransceiver.Name = "groupBoxTransceiver";
- this.groupBoxTransceiver.Size = new System.Drawing.Size(424, 256);
+ this.groupBoxTransceiver.Size = new System.Drawing.Size(480, 256);
this.groupBoxTransceiver.TabIndex = 0;
this.groupBoxTransceiver.TabStop = false;
- this.groupBoxTransceiver.Text = "Device plugin";
+ this.groupBoxTransceiver.Text = "Device plugins";
//
// gridPlugins
//
@@ -141,83 +100,53 @@
this.gridPlugins.Name = "gridPlugins";
this.gridPlugins.OptimizeMode = SourceGrid.CellOptimizeMode.ForRows;
this.gridPlugins.SelectionMode = SourceGrid.GridSelectionMode.Row;
- this.gridPlugins.Size = new System.Drawing.Size(392, 216);
+ this.gridPlugins.Size = new System.Drawing.Size(448, 216);
this.gridPlugins.TabIndex = 0;
this.gridPlugins.TabStop = true;
this.gridPlugins.ToolTipText = "";
//
- // groupBoxMode
- //
- this.groupBoxMode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.groupBoxMode.Controls.Add(this.labelComputer);
- this.groupBoxMode.Controls.Add(this.radioButtonRepeater);
- this.groupBoxMode.Controls.Add(this.radioButtonRelay);
- this.groupBoxMode.Controls.Add(this.radioButtonServer);
- this.groupBoxMode.Controls.Add(this.comboBoxComputer);
- this.groupBoxMode.Location = new System.Drawing.Point(8, 272);
- this.groupBoxMode.Name = "groupBoxMode";
- this.groupBoxMode.Size = new System.Drawing.Size(424, 120);
- this.groupBoxMode.TabIndex = 1;
- this.groupBoxMode.TabStop = false;
- this.groupBoxMode.Text = "Mode";
- //
- // labelComputer
- //
- this.labelComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.labelComputer.Location = new System.Drawing.Point(160, 56);
- this.labelComputer.Name = "labelComputer";
- this.labelComputer.Size = new System.Drawing.Size(248, 32);
- this.labelComputer.TabIndex = 3;
- this.labelComputer.Text = "Button Relay / IR Repeater mode host computer:";
- this.labelComputer.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- //
- // comboBoxComputer
- //
- this.comboBoxComputer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.comboBoxComputer.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
- this.comboBoxComputer.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
- this.comboBoxComputer.Enabled = false;
- this.comboBoxComputer.FormattingEnabled = true;
- this.comboBoxComputer.Location = new System.Drawing.Point(160, 88);
- this.comboBoxComputer.Name = "comboBoxComputer";
- this.comboBoxComputer.Size = new System.Drawing.Size(248, 21);
- this.comboBoxComputer.TabIndex = 4;
- //
// buttonHelp
//
- this.buttonHelp.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
- this.buttonHelp.Location = new System.Drawing.Point(208, 408);
+ this.buttonHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonHelp.Location = new System.Drawing.Point(8, 280);
this.buttonHelp.Name = "buttonHelp";
this.buttonHelp.Size = new System.Drawing.Size(64, 24);
- this.buttonHelp.TabIndex = 3;
+ this.buttonHelp.TabIndex = 1;
this.buttonHelp.Text = "Help";
this.buttonHelp.UseVisualStyleBackColor = true;
this.buttonHelp.Click += new System.EventHandler(this.buttonHelp_Click);
//
+ // buttonAdvanced
+ //
+ this.buttonAdvanced.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.buttonAdvanced.Location = new System.Drawing.Point(80, 280);
+ this.buttonAdvanced.Name = "buttonAdvanced";
+ this.buttonAdvanced.Size = new System.Drawing.Size(64, 24);
+ this.buttonAdvanced.TabIndex = 2;
+ this.buttonAdvanced.Text = "Advanced";
+ this.toolTips.SetToolTip(this.buttonAdvanced, "Click here for advanced options");
+ this.buttonAdvanced.UseVisualStyleBackColor = true;
+ this.buttonAdvanced.Click += new System.EventHandler(this.buttonAdvanced_Click);
+ //
// Config
//
- this.AcceptButton = this.buttonOK;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.CancelButton = this.buttonCancel;
- this.ClientSize = new System.Drawing.Size(440, 440);
+ this.ClientSize = new System.Drawing.Size(496, 319);
+ this.Controls.Add(this.buttonAdvanced);
this.Controls.Add(this.buttonHelp);
this.Controls.Add(this.checkBoxRunAtBoot);
- this.Controls.Add(this.groupBoxMode);
this.Controls.Add(this.groupBoxTransceiver);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
- this.MinimumSize = new System.Drawing.Size(448, 474);
+ this.MinimumSize = new System.Drawing.Size(504, 346);
this.Name = "Config";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "IR Server - Configuration";
this.groupBoxTransceiver.ResumeLayout(false);
- this.groupBoxMode.ResumeLayout(false);
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -227,14 +156,9 @@
private System.Windows.Forms.Button buttonCancel;
private System.Windows.Forms.ToolTip toolTips;
private System.Windows.Forms.GroupBox groupBoxTransceiver;
- private System.Windows.Forms.GroupBox groupBoxMode;
private System.Windows.Forms.CheckBox checkBoxRunAtBoot;
- private System.Windows.Forms.ComboBox comboBoxComputer;
private System.Windows.Forms.Button buttonHelp;
- private System.Windows.Forms.RadioButton radioButtonRelay;
- private System.Windows.Forms.RadioButton radioButtonServer;
- private System.Windows.Forms.RadioButton radioButtonRepeater;
- private System.Windows.Forms.Label labelComputer;
private SourceGrid.Grid gridPlugins;
+ private System.Windows.Forms.Button buttonAdvanced;
}
}
\ No newline at end of file
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -22,44 +22,24 @@
IRServerPlugin[] _transceivers;
+ IRServerMode _mode = IRServerMode.ServerMode;
+ string _hostComputer = String.Empty;
+
#endregion Variables
#region Properties
public IRServerMode Mode
{
- get
- {
- if (radioButtonRelay.Checked)
- return IRServerMode.RelayMode;
- else if (radioButtonRepeater.Checked)
- return IRServerMode.RepeaterMode;
- else
- return IRServerMode.ServerMode;
- }
- set
- {
- switch (value)
- {
- case IRServerMode.ServerMode:
- radioButtonServer.Checked = true;
- break;
-
- case IRServerMode.RelayMode:
- radioButtonRelay.Checked = true;
- break;
-
- case IRServerMode.RepeaterMode:
- radioButtonRepeater.Checked = true;
- break;
- }
- }
+ get { return _mode; }
+ set { _mode = value; }
}
public string HostComputer
{
- get { return comboBoxComputer.Text; }
- set { comboBoxComputer.Text = value; }
+ get { return _hostComputer; }
+ set { _hostComputer = value; }
}
+
public string PluginReceive
{
get
@@ -148,14 +128,6 @@
{
IrssLog.Error(ex.ToString());
}
-
- ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers();
- if (networkPCs != null)
- {
- foreach (string computer in networkPCs.ToArray(typeof(string)))
- if (computer != Environment.MachineName)
- comboBoxComputer.Items.Add(computer);
- }
}
#endregion Constructor
@@ -347,22 +319,24 @@
MessageBox.Show(this, ex.Message, "Failed to load help", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
-
- private void radioButtonServer_CheckedChanged(object sender, EventArgs e)
+
+ private void buttonAdvanced_Click(object sender, EventArgs e)
{
- comboBoxComputer.Enabled = false;
+ Advanced advanced = new Advanced();
+
+ advanced.Mode = _mode;
+ advanced.HostComputer = _hostComputer;
+
+ if (advanced.ShowDialog(this) == DialogResult.OK)
+ {
+ _mode = advanced.Mode;
+ _hostComputer = advanced.HostComputer;
+ }
}
- private void radioButtonRelay_CheckedChanged(object sender, EventArgs e)
- {
- comboBoxComputer.Enabled = true;
- }
- private void radioButtonRepeater_CheckedChanged(object sender, EventArgs e)
- {
- comboBoxComputer.Enabled = true;
- }
#endregion Controls
+
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -59,7 +59,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -95,6 +95,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Advanced.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Advanced.Designer.cs">
+ <DependentUpon>Advanced.cs</DependentUpon>
+ </Compile>
<Compile Include="Client.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -117,6 +123,10 @@
<Content Include="Icon16.ico" />
</ItemGroup>
<ItemGroup>
+ <EmbeddedResource Include="Advanced.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>Advanced.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="Config.resx">
<DependentUpon>Config.cs</DependentUpon>
<SubType>Designer</SubType>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -57,16 +57,13 @@
List<Client> _registeredClients;
List<Client> _registeredRepeaters;
- Thread _messageHandlerThread;
+ MessageQueue _messageQueue;
- Queue _messageQueue;
- bool _processMessageQueue;
-
IRServerMode _mode;
string _hostComputer;
string _localPipeName = String.Empty;
- bool _registered = false;
+ bool _registered = false; // Used for relay and repeater modes.
string _pluginNameReceive = String.Empty;
IRServerPlugin _pluginReceive = null;
@@ -82,6 +79,8 @@
public IRServer()
{
+ _messageQueue = new MessageQueue(new MessageQueueSink(HandlePipeMessage));
+
// Setup taskbar icon
_notifyIcon = new NotifyIcon();
_notifyIcon.ContextMenuStrip = new ContextMenuStrip();
@@ -145,7 +144,7 @@
}
- StartMessageQueue();
+ _messageQueue.Start();
switch (_mode)
{
@@ -156,7 +155,7 @@
_registeredRepeaters = new List<Client>();
// Start server pipe
- PipeAccess.StartServer(Common.ServerPipeName, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(Common.ServerPipeName, new PipeMessageHandler(_messageQueue.Enqueue));
IrssLog.Info("Server Mode: \\\\" + Environment.MachineName + "\\pipe\\" + Common.ServerPipeName);
break;
@@ -293,15 +292,7 @@
IrssLog.Error(ex.ToString());
}
- // Stop Message Queue
- try
- {
- StopMessageQueue();
- }
- catch (Exception ex)
- {
- IrssLog.Error(ex.ToString());
- }
+ _messageQueue.Stop();
// Stop Server
try
@@ -369,34 +360,6 @@
_inConfiguration = false;
}
- void StartMessageQueue()
- {
- _processMessageQueue = true;
-
- // Create a FIFO message queue
- _messageQueue = Queue.Synchronized(new Queue());
-
- // Start message queue handling thread
- _messageHandlerThread = new Thread(new ThreadStart(MessageHandlerThread));
- _messageHandlerThread.IsBackground = true;
- _messageHandlerThread.Name = "IR Server Message Queue";
- _messageHandlerThread.Start();
- }
- void StopMessageQueue()
- {
- _processMessageQueue = false;
-
- try
- {
- if (_messageHandlerThread != null && _messageHandlerThread.IsAlive)
- _messageHandlerThread.Abort();
- }
- catch { }
-
- _messageQueue.Clear();
- _messageQueue = null;
- }
-
bool StartRelay()
{
bool retry = false;
@@ -424,7 +387,7 @@
}
else
{
- PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(_messageQueue.Enqueue));
_localPipeName = localPipeTest;
retry = false;
}
@@ -491,7 +454,7 @@
}
else
{
- PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(QueueMessage));
+ PipeAccess.StartServer(localPipeTest, new PipeMessageHandler(_messageQueue.Enqueue));
_localPipeName = localPipeTest;
retry = false;
}
@@ -822,23 +785,14 @@
if (_mode != IRServerMode.ServerMode)
return false;
- Client removeClient = null;
+ Client removeClient = new Client(pipe, server);
lock (_registeredClients)
{
- foreach (Client client in _registeredClients)
- {
- if (client.Pipe == pipe && client.Server == server)
- {
- removeClient = client;
- break;
- }
- }
-
- if (removeClient != null)
- _registeredClients.Remove(removeClient);
- else
+ if (!_registeredClients.Contains(removeClient))
return false;
+
+ _registeredClients.Remove(removeClient);
}
IrssLog.Info("Unregistered: \\\\{0}\\pipe\\{1}", server, pipe);
@@ -883,26 +837,17 @@
if (String.IsNullOrEmpty(pipe) || String.IsNullOrEmpty(server))
return false;
- if (_mode != IRServerMode.ServerMode)
+ if (_mode != IRServerMode.RepeaterMode)
return false;
- Client removeClient = null;
+ Client removeClient = new Client(pipe, server);
lock (_registeredRepeaters)
{
- foreach (Client client in _registeredRepeaters)
- {
- if (client.Pipe == pipe && client.Server == server)
- {
- removeClient = client;
- break;
- }
- }
-
- if (removeClient != null)
- _registeredRepeaters.Remove(removeClient);
- else
+ if (!_registeredRepeaters.Contains(removeClient))
return false;
+
+ _registeredRepeaters.Remove(removeClient);
}
IrssLog.Info("Unregistered Repeater: \\\\{0}\\pipe\\{1}", server, pipe);
@@ -982,10 +927,17 @@
return status;
}
- void HandlePipeMessage(PipeMessage received)
+ void HandlePipeMessage(string message)
{
- IrssLog.Debug("Message received from client \\\\{0}\\pipe\\{1} = {2}", received.FromServer, received.FromPipe, received.ToString());
+ PipeMessage received = PipeMessage.FromString(message);
+ if (received == null)
+ {
+ IrssLog.Warn("Invalid message received: {0}", message);
+ return;
+ }
+ IrssLog.Debug("Message received from client \\\\{0}\\pipe\\{1} = {2}", received.FromServer, received.FromPipe, message);
+
try
{
switch (received.Type)
@@ -1194,33 +1146,7 @@
}
}
- void QueueMessage(string message)
- {
- PipeMessage pipeMessage = PipeMessage.FromString(message);
- if (pipeMessage == null)
- return;
- lock (((ICollection)_messageQueue).SyncRoot)
- _messageQueue.Enqueue(pipeMessage);
- }
- void MessageHandlerThread()
- {
- try
- {
- while (_processMessageQueue)
- {
- Thread.Sleep(50);
-
- lock (((ICollection)_messageQueue).SyncRoot)
- {
- if (_messageQueue.Count > 0)
- HandlePipeMessage((PipeMessage)_messageQueue.Dequeue());
- }
- }
- }
- catch { }
- }
-
void ClickSetup(object sender, EventArgs e)
{
if (_inConfiguration)
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -28,7 +28,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
return;
}
@@ -112,7 +112,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
return null;
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -48,7 +48,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -38,7 +38,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -188,7 +188,7 @@
if (!PipeAccess.ServerRunning)
return;
- PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, keyCode);
+ PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, keyCode);
PipeAccess.SendMessage(Common.ServerPipeName, Program.ServerHost, message);
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -140,7 +140,7 @@
}
else
{
- PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, button);
+ PipeMessage message = new PipeMessage(Program.LocalPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Notify, button);
PipeAccess.SendMessage(Common.ServerPipeName, Program.ServerHost, message);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -46,7 +46,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -510,7 +510,7 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
Modified: trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs
===================================================================
--- trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/Common/IrssUtils/IrssLog.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -72,7 +72,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
@@ -86,7 +86,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
}
@@ -113,7 +113,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
try
@@ -126,7 +126,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
}
}
}
Modified: trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/AppModule.InterProcessComm.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -78,7 +78,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
Modified: trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/AppModule.NamedPipes.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -78,7 +78,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<BaseAddress>285212672</BaseAddress>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/Named Pipes.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
@@ -63,6 +63,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="MessageQueue.cs" />
<Compile Include="PipeAccess.cs" />
<Compile Include="PipeManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -146,7 +146,7 @@
_data = null;
}
- public PipeMessage(string fromServer, string fromPipe, PipeMessageType type)
+ PipeMessage(string fromServer, string fromPipe, PipeMessageType type)
: this()
{
_fromServer = fromServer;
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionRemoteReceiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -216,7 +216,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.Message);
+ Trace.WriteLine(ex.Message);
return false;
}
}
@@ -377,7 +377,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -37,7 +37,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -160,7 +160,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -197,7 +197,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
_repeatDelay = 500;
_serialPortName = "COM1";
@@ -223,7 +223,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/IRMan Receiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -35,7 +35,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTrans Transceiver.csproj 2007-09-14 10:17:12 UTC (rev 920)
@@ -36,7 +36,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\x86\Debug\</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
+ <DefineConstants>TRACE;DEBUG</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/IRTransTransceiver.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -242,7 +242,7 @@
catch (SocketException ex)
{
// Nothing to worry about
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -285,7 +285,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
_irTransRemoteModel = DefaultRemoteModel;
_irTransServerAddress = DefaultServerAddress;
@@ -313,7 +313,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
@@ -330,7 +330,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
return false;
}
@@ -350,7 +350,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
static void OnDataReceived(IAsyncResult asyn)
@@ -390,7 +390,7 @@
}
catch (Exception ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
break;
@@ -409,7 +409,7 @@
}
catch (SocketException ex)
{
- Console.WriteLine(ex.ToString());
+ Trace.WriteLine(ex.ToString());
}
}
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-09-14 04:47:21 UTC (rev 919)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/IrDecoder.cs 2007-09-14 10:17:12 UTC (rev 920)
@@ -123,7 +123,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("JVC HeaderPulse");
+ //Trace.WriteLine("JVC HeaderPulse");
if (pulse && duration >= 8200 && duration <= 8600)
{
@@ -135,7 +135,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("JVC HeaderSpace");
+ //Trace.WriteLine("JVC HeaderSpace");
if (!pulse && duration >= 4000 && duration <= 4400)
{
@@ -150,7 +150,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("JVC Data");
+ //Trace.WriteLine("JVC Data");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -174,7 +174,7 @@
}
else
{
- //Console.WriteLine("JVC Error");
+ //Trace.WriteLine("JVC Error");
}
if (JVC_Data.Bit == 16)
@@ -187,7 +187,7 @@
#region Leading
case RemoteDetectionState.Leading:
- //Console.WriteLine("JVC Leading");
+ //Trace.WriteLine("JVC Leading");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -223,7 +223,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("NEC HeaderPulse");
+ //Trace.WriteLine("NEC HeaderPulse");
if (pulse && duration >= 8800 && duration <= 9200)
{
@@ -235,7 +235,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("NEC HeaderSpace");
+ //Trace.WriteLine("NEC HeaderSpace");
if (!pulse && duration >= 4300 && duration <= 4700)
{
@@ -257,7 +257,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("NEC Data");
+ //Trace.WriteLine("NEC Data");
if (pulse && duration >= 350 && duration <= 750)
{
@@ -281,7 +281,7 @@
}
else
{
- //Console.WriteLine("NEC Error");
+ //Trace.WriteLine("NEC Error");
}
if (NEC_Data.Bit == 32)
@@ -317,7 +317,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RC5 HeaderPulse");
+ //Trace.WriteLine("RC5 HeaderPulse");
if (pulse)
{
@@ -342,7 +342,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RC5 HeaderSpace");
+ //Trace.WriteLine("RC5 HeaderSpace");
if (!pulse && (duration >= 750) && (duration <= 1000))
{
@@ -355,7 +355,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RC5 Data");
+ //Trace.WriteLine("RC5 Data");
if (RC5_Data.HalfBit == 0)
{
@@ -373,7 +373,7 @@
}
else
{
- //Console.WriteLine("RC5 Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Error {0} on bit {1}", duration, bit);
}
}
else
@@ -396,7 +396,7 @@
}
else
{
- //Console.WriteLine("RC5 Space Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Space Error {0} on bit {1}", duration, bit);
}
}
break;
@@ -419,14 +419,14 @@
}
else
{
- //Console.WriteLine("RC5 Duration Error {0} on bit {1}", duration, bit);
+ //Trace.WriteLine("RC5 Duration Error {0} on bit {1}", duration, bit);
}
break;
#endregion Data
#region Leading
case RemoteDetectionState.Leading:
- //Console.WriteLine("RC5 Leading");
+ //Trace.WriteLine("RC5 Leading");
if (pulse)
break;
@@ -477,7 +477,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RC6 HeaderPulse");
+ //Trace.WriteLine("RC6 HeaderPulse");
if (pulse && (duration >= 2600) && (duration <= 3300))
{
@@ -495,7 +495,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RC6 HeaderSpace");
+ //Trace.WriteLine("RC6 HeaderSpace");
if (!pulse && (duration >= 750) && (duration <= 1000))
{
@@ -508,7 +508,7 @@
#region PreData
case RemoteDetectionState.PreData:
- //Console.WriteLine("RC6 PreData");
+ //Trace.WriteLine("RC6 PreData");
if (pulse)
{
@@ -537,7 +537,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
}
}
else
@@ -571,7 +571,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Bit {0} {1} {2}", bit, pulse ? "Pulse" : "Space", duration));
}
}
@@ -598,7 +598,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RC6 Data");
+ //Trace.WriteLine("RC6 Data");
if ((RC6_Data.HalfBit % 2) == 0)
{
@@ -619,7 +619,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Halfbit0 {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Halfbit0 {0} {1}", pulse ? "Pulse" : "Space", duration));
}
break;
}
@@ -629,7 +629,7 @@
RC6_Data.LongPulse = false;
if (pulse)
{
- //Console.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
break;
}
@@ -648,7 +648,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error Pulse LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
}
}
else if (RC6_Data.LongSpace)
@@ -657,7 +657,7 @@
if (!pulse)
{
- //Console.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error Pulse after LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
break;
}
@@ -687,7 +687,7 @@
}
else
{
- //Console.WriteLine(string.Format("RC6 Error LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
+ //Trace.WriteLine(string.Format("RC6 Error LongPulse {0} {1}", pulse ? "Pulse" : "Space", duration));
}
}
break;
@@ -729,7 +729,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RCA HeaderPulse");
+ //Trace.WriteLine("RCA HeaderPulse");
if (pulse && duration >= 3800 && duration <= 4200)
{
@@ -741,7 +741,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RCA HeaderSpace");
+ //Trace.WriteLine("RCA HeaderSpace");
if (!pulse && duration >= 3800 && duration <= 4200)
{
@@ -756,7 +756,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RCA Data");
+ //Trace.WriteLine("RCA Data");
if (pulse && duration >= 300 && duration <= 700)
{
@@ -780,7 +780,7 @@
}
else
{
- //Console.WriteLine("RCA Error");
+ //Trace.WriteLine("RCA Error");
}
if (RCA_Data.Bit == 12)
@@ -816,7 +816,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- //Console.WriteLine("RECS80 HeaderPulse");
+ //Trace.WriteLine("RECS80 HeaderPulse");
if (pulse && (duration >= 3300) && (duration <= 4100))
{
@@ -828,7 +828,7 @@
#region HeaderSpace
case RemoteDetectionState.HeaderSpace:
- //Console.WriteLine("RECS80 HeaderSpace");
+ //Trace.WriteLine("RECS80 HeaderSpace");
if (!pulse && (duration >= 1400) && (duration <= 1800))
{
@@ -844,7 +844,7 @@
#region Data
case RemoteDetectionState.Data:
- //Console.WriteLine("RECS80 Data");
+ //Trace.WriteLine("RECS80 Data");
if ((RECS80_Data.HalfBit % 2) == 0)
{
@@ -919,7 +919,7 @@
#region HeaderPulse
case RemoteDetectionState.HeaderPulse:
- /...
[truncated message content] |
|
From: <se...@us...> - 2007-09-14 04:47:25
|
Revision: 919
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=919&view=rev
Author: sergem1
Date: 2007-09-13 21:47:21 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Fixed new top URL that lead to empty page on start-up
Added up and down paging control on info page (while Play button is selected)
Modified Paths:
--------------
trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs
trunk/plugins/ETVNet/ETVNet/ETVNetStreamInfo.cs
trunk/plugins/ETVNet/ETVNet/TODO.txt
Modified: trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs
===================================================================
--- trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs 2007-09-13 13:36:29 UTC (rev 918)
+++ trunk/plugins/ETVNet/ETVNet/ETVBrowser.cs 2007-09-14 04:47:21 UTC (rev 919)
@@ -172,7 +172,7 @@
public Hashtable getTopDirectoryPage()
{
- Uri baseUrl = new Uri("http://www.etvnet.ca/main.html");
+ Uri baseUrl = new Uri("http://www.etvnet.ca/cgi-bin/video/eitv_browse.fcgi?action=channels");
String todayPage = getHTMLAsString(baseUrl.AbsoluteUri, null, null);
MatchCollection matches = regexTopLinks.Matches(todayPage, 0);
//
Modified: trunk/plugins/ETVNet/ETVNet/ETVNetStreamInfo.cs
===================================================================
--- trunk/plugins/ETVNet/ETVNet/ETVNetStreamInfo.cs 2007-09-13 13:36:29 UTC (rev 918)
+++ trunk/plugins/ETVNet/ETVNet/ETVNetStreamInfo.cs 2007-09-14 04:47:21 UTC (rev 919)
@@ -76,10 +76,28 @@
public override void OnAction(Action action)
{
- if (action.wID == Action.ActionType.ACTION_PREVIOUS_MENU || action.wID == Action.ActionType.ACTION_CONTEXT_MENU)
+ switch (action.wID)
{
- Close();
- return;
+ case Action.ActionType.ACTION_PREVIOUS_MENU:
+ case Action.ActionType.ACTION_CONTEXT_MENU:
+ Close();
+ return;
+ case Action.ActionType.ACTION_MOVE_UP:
+ {
+ Action newAction = new Action(Action.ActionType.ACTION_PAGE_UP, 0, 0);
+ streamInfo.OnAction(newAction);
+ return;
+ }
+ case Action.ActionType.ACTION_MOVE_DOWN:
+ {
+ Action newAction = new Action(Action.ActionType.ACTION_PAGE_DOWN, 0, 0);
+ streamInfo.OnAction(newAction);
+ return;
+ }
+ case Action.ActionType.ACTION_PAGE_DOWN:
+ case Action.ActionType.ACTION_PAGE_UP:
+ streamInfo.OnAction(action);
+ return;
}
base.OnAction(action);
}
Modified: trunk/plugins/ETVNet/ETVNet/TODO.txt
===================================================================
--- trunk/plugins/ETVNet/ETVNet/TODO.txt 2007-09-13 13:36:29 UTC (rev 918)
+++ trunk/plugins/ETVNet/ETVNet/TODO.txt 2007-09-14 04:47:21 UTC (rev 919)
@@ -7,6 +7,7 @@
aspect ratio
support hardware keyboard input
demo link playback
+page up/down on description page while focus is on the button
localization
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-09-13 13:36:32
|
Revision: 918
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=918&view=rev
Author: rsparey
Date: 2007-09-13 06:36:29 -0700 (Thu, 13 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/TVSeries.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhomeServer.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/Thumb_Mask_non2.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/bottomborder.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/view_block.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/temp tv home info.xml
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/Thumb_Mask_non2.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/Thumb_Mask_non2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/bottomborder.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/bottomborder.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/view_block.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/view_block.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/TVSeries.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/TVSeries.xml 2007-09-12 16:02:09 UTC (rev 917)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/TVSeries.xml 2007-09-13 13:36:29 UTC (rev 918)
@@ -1,929 +1,924 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<window>
- <id>9811</id>
- <defaultcontrol>50</defaultcontrol>
- <allowoverlay>no</allowoverlay>
- <!-- <define>#header.hover:hover_my tv series.png</define> -->
- <define>#header.location:134</define>
-
- <controls>
-
-<!-- ***********************************DUMMY LABELS********************************************* -->
-
-
- <control>
- <type>label</type>
- <description>Dummy Label for Fanart triggers</description>
- <id>1232</id>
- <posX>-50</posX>
- <posY>-50</posY>
- <width>620</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label></label>
- <visible>false</visible>
- <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
- <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
- </control>
-
- <control>
- <type>label</type>
- <description>Dummy Label for dark Fanart triggers</description>
- <id>1233</id>
- <posX>-50</posX>
- <posY>-50</posY>
- <width>620</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label></label>
- <visible>false</visible>
- <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
- <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
- </control>
-
- <control>
- <type>label</type>
- <description>Dummy Label for light Fanart triggers</description>
- <id>1234</id>
- <posX>-50</posX>
- <posY>-50</posY>
- <width>620</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label></label>
- <visible>false</visible>
- <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
- <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
- </control>
- <control>
- <type>label</type>
- <description>Dummy Label for List triggers</description>
- <id>1235</id>
- <posX>-50</posX>
- <posY>-50</posY>
- <width>0</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label></label>
- <visible>false</visible>
- <!-- to make a control visible only when the facade is in list mode do this: <visible>Control.IsVisible(1235)</visible> -->
- <!-- to make a control invisible when the facade is in list mode do this: <visible>!Control.IsVisible(1235)</visible> -->
- </control>
-
-
-
-<!-- ********************** BACKGROUNDS************************************** -->
-
-
-
-
- <control>
- <description>BG</description>
- <type>image</type>
- <id>1</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1280</width>
- <height>720</height>
- <texture>background.png</texture>
- <colordiffuse>ccffffff</colordiffuse>
- <animation effect="fade" time="1000" reversible="false">visiblechange</animation>
- </control>
-
- <control>
- <description>Fan Art Image</description>
- <type>image</type>
- <id>524</id>
- <posX>0</posX>
- <posY>0</posY>
- <width>1280</width>
- <height>720</height>
- <texture>-</texture>
- <colordiffuse>ccffffff</colordiffuse>
- <animation effect="fade" time="600" delay="200" reversible="false">hidden</animation>
- <animation effect="fade" time="1000" reversible="false">visible</animation>
- </control>
-
-
-
- <control>
- <description>ListBackground (dark background)</description>
- <type>image</type>
- <id>3435</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>650</posX>
- <posY>240</posY>
- <texture>tvseries\ListBackGround.png</texture>
- <colordiffuse>ff999999</colordiffuse>
- <visible>Control.IsVisible(1235)</visible>
- </control>
-
- <control>
- <description>roof (dark background)</description>
- <type>image</type>
- <id>3435</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>660</posX>
- <posY>165</posY>
- <texture>tvseries\Roof.png</texture>
- <colordiffuse>ff999999</colordiffuse>
- <visible>Control.IsVisible(1235)</visible>
- </control>
-
-
-
-
- <control>
- <description>ListBackground (light background)</description>
- <type>image</type>
- <id>3435</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>650</posX>
- <posY>240</posY>
- <texture>tvseries\ListBackGround.png</texture>
- <colordiffuse>ff333333</colordiffuse>
- <visible>Control.IsVisible(1235)+Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <description>roof (light background)</description>
- <type>image</type>
- <id>3435</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>660</posX>
- <posY>165</posY>
- <texture>tvseries\Roof.png</texture>
- <colordiffuse>ff333333</colordiffuse>
- <visible>Control.IsVisible(1235)+Control.IsVisible(1234)</visible>
- </control>
-
-
-
-
-<!-- ********************** IMPORT PROCESS *************************************** -->
-
-
- <control>
- <description>Process label</description>
- <type>fadelabel</type>
- <id>2345</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>570</posX>
- <posY>625</posY>
- <width>150</width>
- <height>20</height>
- <label>8033</label>
- <font>font9</font>
- <align>center</align>
- <textcolor>99ffffff</textcolor>
- <visible>Control.IsVisible(51)</visible>
- </control>
-
-
-
- <control>
- <description>Import Animation</description>
- <type>animation</type>
- <id>51</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>570</posX>
- <posY>625</posY>
- <width>150</width>
- <height>60</height>
- <textures>
- tvseries_progress\tvseries.waiting.1.png;
- tvseries_progress\tvseries.waiting.2.png;
- tvseries_progress\tvseries.waiting.3.png;
- tvseries_progress\tvseries.waiting.4.png;
- tvseries_progress\tvseries.waiting.5.png;
- tvseries_progress\tvseries.waiting.6.png;
- tvseries_progress\tvseries.waiting.7.png;
- tvseries_progress\tvseries.waiting.8.png;
- tvseries_progress\tvseries.waiting.9.png;
- tvseries_progress\tvseries.waiting.10.png;
- tvseries_progress\tvseries.waiting.11.png
- </textures> <!-- <textures>common.waiting.1.png;common.waiting.2.png;common.waiting.3.png;common.waiting.4.png;common.waiting.5.png;common.waiting.6.png;common.waiting.7.png;common.waiting.8.png</textures> -->
- <Duration>0:0:01.5</Duration>
- <keepaspectratio>yes</keepaspectratio>
- <colordiffuse>ccffffff</colordiffuse>
- </control>
-
-
-
-
-
-
-<!-- *****************************************INFORMATION IN LIST VIEW***************************************************************** -->
-
-
- <control>
- <type>label</type>
- <description>Information Text (no fanart)</description>
- <id>6353</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>190</posY>
- <width>620</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label>Information</label>
- <visible>!Control.IsVisible(1232)</visible>
- <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
- </control>
-
- <control>
- <description>Splittline ( no fanart )</description>
- <type>image</type>
- <id>6352</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>225</posY>
- <texture>tvseries\SplittLine.png</texture>
- <visible>!Control.IsVisible(1232)</visible>
- <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Title (no fanart)</description>
- <id>640</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>230</posY>
- <width>620</width>
- <label>#TVSeries.Title</label>
- <textcolor>d4d2d2</textcolor>
- <font>font16</font>
- <visible>!Control.IsVisible(1232)</visible>
- <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Subtitle</description>
- <id>33</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>265</posY>
- <width>620</width>
- <label>#TVSeries.Subtitle</label>
- <textcolor>ffb9d5ff</textcolor>
- <font>font13</font>
- <visible>!Control.IsVisible(1232)</visible>
- </control>
-
- <control>
- <type>textboxscrollup</type>
- <description>Description (no fanart)</description>
- <id>631</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>300</posY>
- <width>570</width>
- <height>400</height>
- <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
- <dimColor>ff000000</dimColor>
- <textcolor>d4d2d2</textcolor>
- <font>font12</font>
- <visible>!Control.IsVisible(1232)</visible>
- <label>#TVSeries.Description</label>
- <animation effect="slide" end="0,280" time="600" acceleration="-0.9">hidden</animation>
- </control>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <control>
- <type>label</type>
- <description>Information Text (light background)</description>
- <id>6353</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>490</posY>
- <width>620</width>
- <textcolor>333333</textcolor>
- <font>font14</font>
- <label>Information</label>
- <visible>Control.IsVisible(1234)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <description>Splittline ( light background )</description>
- <type>image</type>
- <id>6352</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>525</posY>
- <texture>tvseries\SplittLine.png</texture>
- <colordiffuse>aa000000</colordiffuse>
- <visible>Control.IsVisible(1234)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Title (light background)</description>
- <id>640</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>530</posY>
- <width>620</width>
- <label>#TVSeries.Title</label>
- <textcolor>333333</textcolor>
- <font>font16</font>
- <visible>Control.IsVisible(1234)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <type>textboxscrollup</type>
- <description>Description (light background)</description>
- <id>631</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>580</posY>
- <width>570</width>
- <height>130</height>
- <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
- <dimColor>ff000000</dimColor>
- <textcolor>333333</textcolor>
- <font>font12</font>
- <visible>Control.IsVisible(1234)</visible>
- <label>#TVSeries.Description</label>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
-
-
-
-
-
-
-
-
-
-
-
- <control>
- <type>label</type>
- <description>Information Text (dark background)</description>
- <id>4353</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>490</posY>
- <width>620</width>
- <textcolor>d4d2d2</textcolor>
- <font>font14</font>
- <label>Information</label>
- <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <description>Splittline ( dark background )</description>
- <type>image</type>
- <id>4352</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>525</posY>
- <texture>tvseries\SplittLine.png</texture>
- <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Title (dark background)</description>
- <id>40</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>530</posY>
- <width>620</width>
- <label>#TVSeries.Title</label>
- <textcolor>d4d2d2</textcolor>
- <font>font16</font>
- <colordiffuse>ffffffff</colordiffuse>
- <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
- <control>
- <type>textboxscrollup</type>
- <description>Description (dark background)</description>
- <id>31</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>580</posY>
- <width>570</width>
- <height>130</height>
- <label>#TVSeries.Description</label>
- <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
- <dimColor>ffffffff</dimColor>
- <textcolor>d4d2d2</textcolor>
- <font>font12</font>
- <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
- <animation effect="fade" delay="600" time="400">visible</animation>
- </control>
-
-
-
-
-
-
-
-
-<!-- ***************************** LOGOS / BANNERS ******************************** -->
-
- <control>
- <type>image</type>
- <description>Series Logo (Logo when series are selected)</description>
- <id>30</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>30</posX>
- <posY>20</posY>
- <width>620</width>
- <height>150</height>
- <centered>yes</centered>
- <keepaspectratio>yes</keepaspectratio>
- <texture flipY="true" diffuse="Thumb_Mask_non2.png">#TVSeries.SeriesBanner</texture>
- <visible>!Control.IsVisible(1232)+Control.IsVisible(1235)</visible>
- <!-- <animation effect="fade" delay="300" time="600">visible</animation>
- <animation effect="fade" delay="300" time="300">hidden</animation> -->
- </control>
-
- <control>
- <type>image</type>
- <description>Season image ( season image background )</description>
- <id>46</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>1000</posX>
- <posY>25</posY>
- <width>270</width>
- <height>150</height>
- <centered>yes</centered>
- <keepaspectratio>yes</keepaspectratio>
- <colordiffuse>ffFFFFFF</colordiffuse>
- <texture flipY="true" diffuse="Thumb_Mask.png">#TVSeries.SeasonBanner</texture>
- <animation effect="fade" time="600">visible</animation>
- </control>
-
- <control>
- <type>image</type>
- <description>Episode logo big</description>
- <id>67</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>780</posX>
- <posY>40</posY>
- <width>240</width>
- <height>140</height>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <texture flipY="true" diffuse="Thumb_Mask.png">#TVSeries.EpisodeImage</texture>
- <animation effect="fade" time="600">visible</animation>
- </control>
-
- <control>
- <type>image</type>
- <description>thumb Logos</description>
- <id>66</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>820</posX>
- <posY>155</posY>
- <width>730</width>
- <height>50</height>
- <texture flipY="true" diffuse="Thumb_Mask.png">#TVSeries.Logos</texture>
- <centered>no</centered>
- <keepaspectratio>yes</keepaspectratio>
- <colordiffuse>ffFFFFFF</colordiffuse>
- <animation effect="fade" time="600">visible</animation>
- </control>
-
-
-
-
-<!-- ************************** VIEW SELECTION ***********************************-->
-
- <control>
- <type>label</type>
- <description>Last View (light background)</description>
- <id>78</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>700</posX>
- <posY>671</posY>
- <width>200</width>
- <label>#TVSeries.LastView</label>
- <align>right</align>
- <textcolor>333333</textcolor>
- <font>font11</font>
- <visible>Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <type>label</type>
- <description>cur_view (light background</description>
- <id>77</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>720</posX>
- <posY>685</posY>
- <width>200</width>
- <label>#TVSeries.CurrentView</label>
- <align>center</align>
- <textcolor>333333</textcolor>
- <font>font18</font>
- <shadow>10</shadow>
- <visible>Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <type>label</type>
- <description>next view (light background</description>
- <id>79</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>930</posX>
- <posY>671</posY>
- <width>200</width>
- <label>#TVSeries.NextView</label>
- <align>left</align>
- <textcolor>333333</textcolor>
- <font>font11</font>
- <visible>Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <description>left arrow (light background)</description>
- <type>image</type>
- <id>4352</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>720</posX>
- <posY>668</posY>
- <texture>tvseries\ArrowLeft.png</texture>
- <colordiffuse>ff000000</colordiffuse>
- <visible>Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <description>right arrow (light background)</description>
- <type>image</type>
- <id>4353</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>900</posX>
- <posY>668</posY>
- <colordiffuse>ff000000</colordiffuse>
- <texture>tvseries\ArrowRight.png</texture>
- <visible>Control.IsVisible(1234)</visible>
- </control>
-
-
-
-
-
-
-
-
- <control>
- <type>label</type>
- <description>Last View (dark background)</description>
- <id>78</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>700</posX>
- <posY>671</posY>
- <width>200</width>
- <label>#TVSeries.LastView</label>
- <align>right</align>
- <textcolor>d4d2d2</textcolor>
- <font>font11</font>
- <visible>!Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <type>label</type>
- <description>cur_view (dark background</description>
- <id>77</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>720</posX>
- <posY>685</posY>
- <width>200</width>
- <label>#TVSeries.CurrentView</label>
- <align>center</align>
- <textcolor>d4d2d2</textcolor>
- <font>font18</font>
- <shadow>10</shadow>
- <visible>!Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <type>label</type>
- <description>next view (dark background</description>
- <id>79</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>930</posX>
- <posY>671</posY>
- <width>200</width>
- <label>#TVSeries.NextView</label>
- <align>left</align>
- <textcolor>d4d2d2</textcolor>
- <font>font11</font>
- <visible>!Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <description>left arrow (dark background)</description>
- <type>image</type>
- <id>4352</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>720</posX>
- <posY>668</posY>
- <texture>tvseries\ArrowLeft.png</texture>
- <visible>!Control.IsVisible(1234)</visible>
- </control>
-
- <control>
- <description>right arrow (dark background)</description>
- <type>image</type>
- <id>4353</id>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <posX>900</posX>
- <posY>668</posY>
- <texture>tvseries\ArrowRight.png</texture>
- <visible>!Control.IsVisible(1234)</visible>
- </control>
-
-
-
-
- <control>
- <description>ViewBackGround</description>
- <type>image</type>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <id>515</id>
- <posX>565</posX>
- <posY>662</posY>
- <width>500</width>
- <texture>Tvseries\ViewBackground.png</texture>
- </control>
-
-
-
-<!-- *********************** LIST /GRAPHICAL VIEW*********************************** -->
-
-
-
-
-
- <control>
- <type>group</type>
- <animation effect="fade" time="400">WindowClose</animation>
- <animation effect="fade" time="400">WindowOpen</animation>
- <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
- <description>group element</description>
- <id>28</id>
- <layout>StackLayout</layout>
- <posX>60</posX>
- <posY>97</posY>
- <control>
- <description>composite control consisting of a list control and a thumbnail panel</description>
- <type>facadeview</type>
- <id>50</id>
-
- <control>
- <description>graphical list (series and seasons if set)</description>
- <type>listcontrol</type>
- <subtype>album</subtype>
- <id>50</id>
- <posX>680</posX><!-- 750 -->
- <posY>10</posY><!-- 185 -->
- <width>600</width>
- <height>700</height>
- <IconXOff>15</IconXOff>
- <IconYOff>3</IconYOff>
- <spaceBetweenItems>2</spaceBetweenItems>
- <remoteColor>FFa6c3e1</remoteColor> <!-- Watched color -->
- <downloadColor>d4d2d2</downloadColor> <!-- not watched color (normal) -->
- <textcolor>FF78ace0</textcolor> <!-- local file not present color -->
- <textcolor2>FF78ace0</textcolor2> <!-- local file not present color column 2-->
- <textcolor3>FF78ace0</textcolor3> <!-- local file not present color column 3-->
- <spinPosX>1180</spinPosX>
- <spinPosY>620</spinPosY>
- <textureFocus>Tvseries\tv_green_border2.png</textureFocus>
- <textureUp>Tvseries\arrow_round_up_nofocus.png</textureUp>
- <textureDown>Tvseries\arrow_round_down_nofocus.png</textureDown>
- <textureUpFocus>Tvseries\arrow_round_up_focus.png</textureUpFocus>
- <textureDownFocus>Tvseries\arrow_round_down_focus.png</textureDownFocus>
- </control>
-
-
- <!-- 9 line version (outdated)-->
- <!-- <control>
- <description>text list</description>
- <type>listcontrol</type>
- <id>50</id>
- <textureHeight>45</textureHeight>
- <itemWidth>40</itemWidth>
- <itemHeight>25</itemHeight>
- <IconXOff>15</IconXOff>
- <IconYOff>10</IconYOff>
- <posX>650</posX>
- <posY>230</posY>
- <width>500</width>
- <height>420</height>
- <textXOff2>610</textXOff2>
- <textYOff2>7</textYOff2>
- <textYOff>7</textYOff>
- <textXOff>25</textXOff>
- <spaceBetweenItems>-5</spaceBetweenItems>
- <remoteColor>FFa6c3e1</remoteColor> --> <!-- watched color -->
- <!-- <downloadColor>FF00BBCC</downloadColor> --> <!-- not watched color (normal) -->
- <!-- <textcolor>FFE31919</textcolor> --> <!-- local file not present color -->
- <!-- <textcolor2>FFE31919</textcolor2> --> <!-- local file not present color column 2-->
- <!-- <textcolor3>FFE31919</textcolor3> --> <!-- local file not present color column 3-->
- <!-- <spinPosX>800</spinPosX>
- <spinPosY>620</spinPosY>
- <keepaspectratio>true</keepaspectratio>
- </control> -->
-
-
-
- <!-- 5 lined version -->
- <control>
- <description>text list</description>
- <type>listcontrol</type>
- <id>50</id>
- <textureHeight>80</textureHeight>
- <itemWidth>80</itemWidth>
- <itemHeight>50</itemHeight>
- <IconXOff>18</IconXOff>
- <IconYOff>12</IconYOff>
- <posX>665</posX>
- <posY>240</posY>
- <width>500</width>
- <height>400</height>
- <textXOff2>610</textXOff2> <!-- 635 -->
- <textYOff2>27</textYOff2>
- <textYOff>23</textYOff>
- <textXOff>25</textXOff>
- <spaceBetweenItems>-13</spaceBetweenItems>
- <remoteColor>FFa6c3e1</remoteColor> <!-- watched color -->
- <downloadColor>FF00BBCC</downloadColor> <!-- not watched color (normal) -->
- <textcolor>FFE31919</textcolor> <!-- local file not present color -->
- <textcolor2>FFE31919</textcolor2> <!-- local file not present color column 2-->
- <textcolor3>FFE31919</textcolor3> <!-- local file not present color column 3-->
- <spinPosX>1180</spinPosX>
- <spinPosY>620</spinPosY>
- <textureFocus>TVseries\selectbar2.png</textureFocus>
- <textureNoFocus>TVseries\selectbarNo2.png</textureNoFocus>
- <keepaspectratio>true</keepaspectratio>
- <textureUp>Tvseries\arrow_round_up_nofocus.png</textureUp>
- <textureDown>Tvseries\arrow_round_down_nofocus.png</textureDown>
- <textureUpFocus>Tvseries\arrow_round_up_focus.png</textureUpFocus>
- <textureDownFocus>Tvseries\arrow_round_down_focus.png</textureDownFocus>
- </control>
- </control>
- </control>
-
-
- <control>
- <description>video rectangle</description>
- <type>image</type>
- <id>0</id>
- <posX>1075</posX>
- <posY>595</posY>
- <width>207</width>
- <height>126</height>
- <texture>Tvseries\VizzulationCoverBackground.png</texture>
- <colorkey>0</colorkey>
- <colordiffuse>eeffffff</colordiffuse>
- <animation effect="fade" time="600">WindowClose</animation>
- <animation effect="fade" time="1000">WindowOpen</animation>
- <visible>Player.HasVideo</visible>
- </control>
- <control>
- <description>video preview window</description>
- <type>videowindow</type>
- <id>1</id>
- <posX>1100</posX>
- <posY>614</posY>
- <width>162</width>
- <height>92</height>
- <action>18</action>
- <textureFocus>Tvseries\tv_green_border.png</textureFocus>
- <animation effect="fade" time="600">WindowClose</animation>
- <animation effect="fade" time="1000">WindowOpen</animation>
- <visible>Player.HasVideo</visible>
- </control>
- </controls>
-</window>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<window>
+ <id>9811</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>no</allowoverlay>
+ <!-- <define>#header.hover:hover_my tv series.png</define> -->
+ <define>#header.location:134</define>
+
+ <controls>
+
+<!-- ***********************************DUMMY LABELS********************************************* -->
+
+
+ <control>
+ <type>label</type>
+ <description>Dummy Label for Fanart triggers</description>
+ <id>1232</id>
+ <posX>-50</posX>
+ <posY>-50</posY>
+ <width>620</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label></label>
+ <visible>false</visible>
+ <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
+ <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Dummy Label for dark Fanart triggers</description>
+ <id>1233</id>
+ <posX>-50</posX>
+ <posY>-50</posY>
+ <width>620</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label></label>
+ <visible>false</visible>
+ <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
+ <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Dummy Label for light Fanart triggers</description>
+ <id>1234</id>
+ <posX>-50</posX>
+ <posY>-50</posY>
+ <width>620</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label></label>
+ <visible>false</visible>
+ <!-- to make a control visible only when a light fanart is loaded do this: <visible>Control.IsVisible(1234)</visible> -->
+ <!-- to make a control invisible when a light fanart is loaded do this: <visible>!Control.IsVisible(1234)</visible> -->
+ </control>
+ <control>
+ <type>label</type>
+ <description>Dummy Label for List triggers</description>
+ <id>1235</id>
+ <posX>-50</posX>
+ <posY>-50</posY>
+ <width>0</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label></label>
+ <visible>false</visible>
+ <!-- to make a control visible only when the facade is in list mode do this: <visible>Control.IsVisible(1235)</visible> -->
+ <!-- to make a control invisible when the facade is in list mode do this: <visible>!Control.IsVisible(1235)</visible> -->
+ </control>
+
+
+
+<!-- ********************** BACKGROUNDS************************************** -->
+
+
+
+
+ <control>
+ <description>BG</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1366</width>
+ <height>768</height>
+ <texture>background.png</texture>
+ <colordiffuse>ccffffff</colordiffuse>
+ <animation effect="fade" time="1000" reversible="false">visiblechange</animation>
+ </control>
+
+ <!-- TEXT TOP LEFT START (Only visible when there is no banner/fanart present) -->
+
+ <control>
+ <description>icon background</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>377</width>
+ <height>133</height>
+ <texture>Logo_background.png</texture>
+ <animation effect="fade" time="500" delay="1000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <visible>!Control.IsVisible(1235)</visible>
+ </control>
+ <control>
+ <type>image</type>
+ <id>1</id>
+ <posX>15</posX>
+ <posY>0</posY>
+ <width>61</width>
+ <height>122</height>
+ <texture>hover_my tv.png</texture>
+ <animation effect="fade" time="1000" delay="2000">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <visible>!Control.IsVisible(1235)</visible>
+ </control>
+ <control>
+ <type>image</type>
+ <description>Television top left text logo</description>
+ <id>1</id>
+ <posX>90</posX>
+ <posY>23</posY>
+ <texture>tvseries_logo.png</texture>
+ <animation effect="fade" time="500" delay="1300">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <visible>!Control.IsVisible(1235)</visible>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Recorded TV Label</description>
+ <id>1</id>
+ <posX>251</posX>
+ <posY>68</posY>
+ <label>3019</label>
+ <font>wipeouts</font>
+ <align>center</align>
+ <textcolor>ffffffff</textcolor>
+ <animation effect="fade" time="1000" end="60" delay="2000">WindowOpen</animation>
+ <animation effect="slide" time="1000" delay="2000" start="-600,0" end="0,0" acceleration="-1">WindowOpen</animation>
+ <animation effect="fade" time="500" start="50">WindowClose</animation>
+ <visible>!Control.IsVisible(1235)</visible>
+ </control>
+
+ <!-- TEXT TOP LEFT END -->
+
+ <control>
+ <description>Fan Art Image</description>
+ <type>image</type>
+ <id>524</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <width>1366</width>
+ <height>768</height>
+ <texture>-</texture>
+ <colordiffuse>ccffffff</colordiffuse>
+ <animation effect="fade" time="600" delay="200" reversible="false">hidden</animation>
+ <animation effect="fade" time="1000" reversible="false">visible</animation>
+ </control>
+
+
+
+ <control>
+ <description>ListBackground (dark background)</description>
+ <type>image</type>
+ <id>3435</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>650</posX>
+ <posY>240</posY>
+ <texture></texture>
+ <colordiffuse>ff999999</colordiffuse>
+ <visible>Control.IsVisible(1235)</visible>
+ </control>
+
+ <control>
+ <description>roof (dark background)</description>
+ <type>image</type>
+ <id>3435</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>660</posX>
+ <posY>165</posY>
+ <texture></texture>
+ <colordiffuse>ff999999</colordiffuse>
+ <visible>Control.IsVisible(1235)</visible>
+ </control>
+
+
+
+
+ <control>
+ <description>ListBackground (light background)</description>
+ <type>image</type>
+ <id>3435</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>650</posX>
+ <posY>240</posY>
+ <texture></texture>
+ <colordiffuse>ff333333</colordiffuse>
+ <visible>Control.IsVisible(1235)+Control.IsVisible(1234)</visible>
+ </control>
+
+ <control>
+ <description>roof (light background)</description>
+ <type>image</type>
+ <id>3435</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>660</posX>
+ <posY>165</posY>
+ <texture></texture>
+ <colordiffuse>ff333333</colordiffuse>
+ <visible>Control.IsVisible(1235)+Control.IsVisible(1234)</visible>
+ </control>
+
+
+
+
+<!-- ********************** IMPORT PROCESS *************************************** -->
+
+<!--
+ <control>
+ <description>Process label</description>
+ <type>fadelabel</type>
+ <id>2345</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>720</posX>
+ <posY>665</posY>
+ <width>150</width>
+ <height>20</height>
+ <label>8033</label>
+ <font>font9</font>
+ <align>center</align>
+ <textcolor>99ffffff</textcolor>
+ <visible>Control.IsVisible(51)</visible>
+ </control>
+-->
+
+
+ <control>
+ <description>Import Animation</description>
+ <type>animation</type>
+ <id>51</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>720</posX>
+ <posY>675</posY>
+ <width>150</width>
+ <height>60</height>
+ <textures>common.waiting.1.png;common.waiting.2.png;common.waiting.3.png;common.waiting.4.png;common.waiting.5.png;common.waiting.6.png;common.waiting.7.png;common.waiting.8.png</textures>
+ <Duration>0:0:01.5</Duration>
+ <keepaspectratio>yes</keepaspectratio>
+ <colordiffuse>ccffffff</colordiffuse>
+ </control>
+
+
+
+
+
+
+<!-- *****************************************INFORMATION IN LIST VIEW***************************************************************** -->
+
+
+ <control>
+ <type>label</type>
+ <description>Information Text (no fanart)</description>
+ <id>6353</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>30</posX>
+ <posY>190</posY>
+ <width>620</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label>Information</label>
+ <visible>!Control.IsVisible(1232)</visible>
+ <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
+ </control>
+
+ <control>
+ <description>Splittline ( no fanart )</description>
+ <type>image</type>
+ <id>6352</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>30</posX>
+ <posY>220</posY>
+ <texture>tvseries\SplittLine.png</texture>
+ <visible>!Control.IsVisible(1232)</visible>
+ <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Title (no fanart)</description>
+ <id>640</id>
+<!-- <animation effect="fade" time="400">WindowClose</animation> -->
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+<!-- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation> -->
+ <posX>30</posX>
+ <posY>230</posY>
+ <width>620</width>
+ <label>#TVSeries.Title</label>
+ <textcolor>d4d2d2</textcolor>
+ <font>font16</font>
+ <visible>!Control.IsVisible(1232)</visible>
+ <animation effect="slide" end="0,300" time="600" acceleration="-0.9">hidden</animation>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Subtitle</description>
+ <id>33</id>
+ <!-- <animation effect="fade" time="400" >WindowClose</animation> -->
+ <animation effect="fade" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+<!-- <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation> -->
+ <posX>30</posX>
+ <posY>265</posY>
+ <width>620</width>
+ <label>#TVSeries.Subtitle</label>
+ <textcolor>ffb9d5ff</textcolor>
+ <font>font13</font>
+ <visible>!Control.IsVisible(1232)</visible>
+ </control>
+
+ <control>
+ <type>textboxscrollup</type>
+ <description>Description (no fanart)</description>
+ <id>631</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>30</posX>
+ <posY>300</posY>
+ <width>570</width>
+ <height>400</height>
+ <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
+ <dimColor>ff000000</dimColor>
+ <textcolor>d4d2d2</textcolor>
+ <font>font12</font>
+ <visible>!Control.IsVisible(1232)</visible>
+ <label>#TVSeries.Description</label>
+ <animation effect="slide" end="0,280" time="600" acceleration="-0.9">hidden</animation>
+ </control>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <control>
+ <type>label</type>
+ <description>Information Text (light background)</description>
+ <id>6353</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>530</posY>
+ <width>620</width>
+ <textcolor>333333</textcolor>
+ <font>font14</font>
+ <label>Information</label>
+ <visible>Control.IsVisible(1234)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <description>Splittline ( light background )</description>
+ <type>image</type>
+ <id>6352</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>560</posY>
+ <texture>tvseries\SplittLine.png</texture>
+ <colordiffuse>aa000000</colordiffuse>
+ <visible>Control.IsVisible(1234)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Title (light background)</description>
+ <id>640</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>575</posY>
+ <width>620</width>
+ <label>#TVSeries.Title</label>
+ <textcolor>333333</textcolor>
+ <font>font16</font>
+ <visible>Control.IsVisible(1234)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <type>textboxscrollup</type>
+ <description>Description (light background)</description>
+ <id>631</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>615</posY>
+ <width>570</width>
+ <height>130</height>
+ <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
+ <dimColor>ff000000</dimColor>
+ <textcolor>333333</textcolor>
+ <font>font12</font>
+ <visible>Control.IsVisible(1234)</visible>
+ <label>#TVSeries.Description</label>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+
+
+
+
+
+
+
+
+
+
+
+ <control>
+ <type>label</type>
+ <description>Information Text (dark background)</description>
+ <id>4353</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>530</posY>
+ <width>620</width>
+ <textcolor>d4d2d2</textcolor>
+ <font>font14</font>
+ <label>Information</label>
+ <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <description>Splittline ( dark background )</description>
+ <type>image</type>
+ <id>4352</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>560</posY>
+ <texture>tvseries\SplittLine.png</texture>
+ <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Title (dark background)</description>
+ <id>40</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>575</posY>
+ <width>620</width>
+ <label>#TVSeries.Title</label>
+ <textcolor>d4d2d2</textcolor>
+ <font>font16</font>
+ <colordiffuse>ffffffff</colordiffuse>
+ <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+ <control>
+ <type>textboxscrollup</type>
+ <description>Description (dark background)</description>
+ <id>31</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>25</posX>
+ <posY>615</posY>
+ <width>570</width>
+ <height>130</height>
+ <label>#TVSeries.Description</label>
+ <seperator>-----------------------------------------------------------------------------------------------------------------------</seperator>
+ <dimColor>ffffffff</dimColor>
+ <textcolor>d4d2d2</textcolor>
+ <font>font12</font>
+ <visible>!Control.IsVisible(1234)+Control.IsVisible(1232)</visible>
+ <animation effect="fade" delay="600" time="400">visible</animation>
+ </control>
+
+
+
+
+
+
+
+
+<!-- ***************************** LOGOS / BANNERS ******************************** -->
+
+ <control>
+ <type>image</type>
+ <description>Series Logo (Logo when series are selected)</description>
+ <id>30</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>30</posX>
+ <posY>20</posY>
+ <width>620</width>
+ <height>150</height>
+ <centered>yes</centered>
+ <keepaspectratio>yes</keepaspectratio>
+ <texture flipY="true" diffuse="Thumb_Mask_non2.png">#TVSeries.SeriesBanner</texture>
+ <visible>!Control.IsVisible(1232)+Control.IsVisible(1235)</visible>
+ <!-- <animation effect="fade" delay="300" time="600">visible</animation>
+ <animation effect="fade" delay="300" time="300">hidden</animation> -->
+ </control>
+
+ <control>
+ <type>image</type>
+ <description>Season image ( season image background )</description>
+ <id>46</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <animation effect="zoom" start="70,70" end="100,100" center="640,360" time="400" >WindowOpen</animation>
+ <animation effect="zoom" start="100,100" end="130,130" center="640,360" time="400" >WindowClose</animation>
+ <posX>11...
[truncated message content] |
|
From: <an...@us...> - 2007-09-12 16:02:24
|
Revision: 917
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=917&view=rev
Author: and-81
Date: 2007-09-12 09:02:09 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -39,5 +38,4 @@
[assembly: CLSCompliant(true)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("a94fbaf3-2d68-45da-8f4f-7dee41f00040")]
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -39,5 +38,4 @@
[assembly: CLSCompliant(true)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("00506894-d61e-47b9-9039-879c543a73e1")]
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -28,7 +28,7 @@
#region Enumerations
- public enum IoCtrl : uint
+ enum IoCtrl : uint
{
StartReceive = 0x0F608028,
StopReceive = 0x0F60802C,
@@ -42,7 +42,7 @@
/// IR Device Capability Flags.
/// </summary>
[Flags]
- public enum DeviceCapabilityFlags : uint
+ enum DeviceCapabilityFlags : uint
{
/// <summary>
/// Hardware supports legacy key signing.
@@ -83,7 +83,7 @@
}
[Flags]
- public enum TransmitFlags : uint
+ enum TransmitFlags : uint
{
/// <summary>
/// Pulse Mode.
@@ -112,7 +112,7 @@
#region Structures
[StructLayout(LayoutKind.Sequential)]
- public struct TransmitChunk
+ struct TransmitChunk
{
/// <summary>
/// Next chunk offset.
@@ -129,7 +129,7 @@
}
[StructLayout(LayoutKind.Sequential)]
- public struct TransmitParams
+ struct TransmitParams
{
/// <summary>
/// Bitmask containing ports to transmit on.
@@ -151,7 +151,7 @@
}
[StructLayout(LayoutKind.Sequential)]
- public struct ReceiveParams
+ struct ReceiveParams
{
/// <summary>
/// Last packet in block?
@@ -168,7 +168,7 @@
}
[StructLayout(LayoutKind.Sequential)]
- public struct StartReceiveParams
+ struct StartReceiveParams
{
/// <summary>
/// Index of the receiver to use.
@@ -181,7 +181,7 @@
}
[StructLayout(LayoutKind.Sequential)]
- public struct DeviceCapabilities
+ struct DeviceCapabilities
{
/// <summary>
/// Protocol version. Currently must be 100 (1.0).
@@ -306,7 +306,7 @@
{
Marshal.StructureToPtr(structure, structPtr, false);
- IoControlSync(IoCtrl.StartReceive, structPtr, Marshal.SizeOf(structure), IntPtr.Zero, 0, out bytesReturned);
+ IoControl(IoCtrl.StartReceive, structPtr, Marshal.SizeOf(structure), IntPtr.Zero, 0, out bytesReturned);
}
catch
{
@@ -321,7 +321,7 @@
void StopReceive()
{
int bytesReturned;
- IoControlSync(IoCtrl.StopReceive, IntPtr.Zero, 0, IntPtr.Zero, 0, out bytesReturned);
+ IoControl(IoCtrl.StopReceive, IntPtr.Zero, 0, IntPtr.Zero, 0, out bytesReturned);
}
void GetDeviceCapabilities()
@@ -336,7 +336,7 @@
{
Marshal.StructureToPtr(structure, structPtr, false);
- IoControlSync(IoCtrl.GetDetails, IntPtr.Zero, 0, structPtr, Marshal.SizeOf(structure), out bytesReturned);
+ IoControl(IoCtrl.GetDetails, IntPtr.Zero, 0, structPtr, Marshal.SizeOf(structure), out bytesReturned);
structure = (DeviceCapabilities)Marshal.PtrToStructure(structPtr, typeof(DeviceCapabilities));
}
@@ -387,7 +387,7 @@
{
Marshal.StructureToPtr(data, pointerToData, false);
- IoControlSync(IoCtrl.GetBlasters, IntPtr.Zero, 0, pointerToData, sizeof(uint), out bytesReturned);
+ IoControl(IoCtrl.GetBlasters, IntPtr.Zero, 0, pointerToData, sizeof(uint), out bytesReturned);
data = (uint)Marshal.PtrToStructure(pointerToData, typeof(uint));
}
@@ -447,7 +447,7 @@
Marshal.Copy(buffer, 0, bufferPtr, buffer.Length);
- IoControlSync(IoCtrl.Transmit, structurePtr, Marshal.SizeOf(typeof(TransmitParams)), bufferPtr, bufferSize, out bytesReturned);
+ IoControl(IoCtrl.Transmit, structurePtr, Marshal.SizeOf(typeof(TransmitParams)), bufferPtr, bufferSize, out bytesReturned);
}
catch
{
@@ -460,7 +460,7 @@
}
}
- void IoControlSync(IoCtrl ioControlCode, IntPtr inBuffer, int inBufferSize, IntPtr outBuffer, int outBufferSize, out int bytesReturned)
+ void IoControl(IoCtrl ioControlCode, IntPtr inBuffer, int inBufferSize, IntPtr outBuffer, int outBufferSize, out int bytesReturned)
{
NativeOverlapped overlapped;
overlapped.InternalLow = IntPtr.Zero;
@@ -708,7 +708,7 @@
while (_readThreadMode != ReadThreadMode.Stop)
{
- IoControlSync(IoCtrl.Receive, IntPtr.Zero, 0, receiveParamsPtr, receiveParamsSize, out bytesRead);
+ IoControl(IoCtrl.Receive, IntPtr.Zero, 0, receiveParamsPtr, receiveParamsSize, out bytesRead);
if (bytesRead > Marshal.SizeOf(receiveParams))
{
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-12 16:02:09 UTC (rev 917)
@@ -253,6 +253,18 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MediaPortal 2 Plugins", "MediaPortal 2 Plugins", "{925C6589-16EF-4B2B-A184-FA44FF04C2F6}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP2 Control Plugin", "MediaPortal 2 Plugins\MP2 Control Plugin\MP2 Control Plugin.csproj", "{E5A37205-4AA5-4697-BF16-D2F560F2314E}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -546,6 +558,12 @@
{6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|Any CPU.Build.0 = Release|Any CPU
{6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|x86.ActiveCfg = Release|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -587,5 +605,6 @@
{CA15769C-232E-4CA7-94FD-206A06CA3ABB} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{08F57DD7-2C6E-484E-9CC5-835F70C5BC64} = {E757F80C-23C5-4AD6-B178-16799E337E03}
{BCAFDF45-70DD-46FD-8B98-880DDA585AD2} = {E757F80C-23C5-4AD6-B178-16799E337E03}
+ {E5A37205-4AA5-4697-BF16-D2F560F2314E} = {925C6589-16EF-4B2B-A184-FA44FF04C2F6}
EndGlobalSection
EndGlobal
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -68,5 +67,4 @@
[assembly: CLSCompliant(false)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("59123d08-2c0c-4220-b9e6-1944e218892b")]
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -68,5 +67,4 @@
[assembly: CLSCompliant(true)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("0f4a15ea-ff0f-4031-87bd-eebfd5d0e7da")]
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -68,5 +67,4 @@
[assembly: CLSCompliant(true)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("5bdbc5bc-1085-4c12-9056-f6fade27d919")]
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs 2007-09-12 12:28:29 UTC (rev 916)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs 2007-09-12 16:02:09 UTC (rev 917)
@@ -2,7 +2,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
-using System.Security.Permissions;
//
// General Information about an assembly is controlled through the following
@@ -68,5 +67,4 @@
[assembly: CLSCompliant(true)]
-[assembly: SecurityPermission(SecurityAction.RequestMinimum, UnmanagedCode = true)]
[assembly: GuidAttribute("d9a51585-70cf-47cc-a787-7a784d46a36f")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-09-12 12:28:36
|
Revision: 916
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=916&view=rev
Author: and-81
Date: 2007-09-12 05:28:29 -0700 (Wed, 12 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -349,7 +349,6 @@
this.buttonIRBlastAutoTest.Text = "IRBlast Auto-Test";
this.toolTips.SetToolTip(this.buttonIRBlastAutoTest, "Runs a random number blasting test");
this.buttonIRBlastAutoTest.UseVisualStyleBackColor = true;
- this.buttonIRBlastAutoTest.Visible = false;
this.buttonIRBlastAutoTest.Click += new System.EventHandler(this.buttonAutoTest_Click);
//
// buttonHelp
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -163,7 +163,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- this.Invoke(_AddStatusLine, new Object[] { String.Format("Received Message: \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type)) });
+ this.Invoke(_AddStatusLine, new Object[] { String.Format("Received Message: \"{0}, {1}\"", received.Type, received.Flags) });
try
{
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -441,7 +441,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
@@ -500,7 +500,7 @@
file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request, outData);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request | PipeMessageFlags.ForceNotRespond, outData);
PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -403,7 +403,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
@@ -462,7 +462,7 @@
file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request, outData);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request | PipeMessageFlags.ForceNotRespond, outData);
PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -257,7 +257,7 @@
if (_mode == IRServerMode.ServerMode)
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown, PipeMessageFlags.Request);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown, PipeMessageFlags.Notify);
SendToAll(message);
}
@@ -498,7 +498,7 @@
}
while (retry);
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterRepeater);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterRepeater, PipeMessageFlags.Request);
PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
catch (Exception ex)
@@ -517,7 +517,7 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterRepeater);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterRepeater, PipeMessageFlags.Request);
PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
}
@@ -541,14 +541,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.Notify, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Request, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -573,14 +573,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.Notify, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardKeyboardEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardKeyboardEvent, PipeMessageFlags.Request, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -606,14 +606,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.Notify, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardMouseEvent, PipeMessageFlags.None, bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardMouseEvent, PipeMessageFlags.Request, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -657,7 +657,7 @@
// Inform clients ...
if (_mode == IRServerMode.ServerMode)
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown, PipeMessageFlags.Notify);
SendToAll(message);
}
break;
@@ -935,23 +935,30 @@
return false;
}
}
- byte[] LearnIR()
+ LearnStatus LearnIR(out byte[] data)
{
IrssLog.Debug("Learn IR");
- if (_pluginTransmit == null || !(_pluginTransmit is ILearnIR))
+ data = null;
+
+ if (_pluginTransmit == null)
{
- IrssLog.Debug("Active transceiver doesn't support learn");
- return null;
+ IrssLog.Debug("No transmit plugin loaded, can't learn");
+ return LearnStatus.Failure;
}
+ else if (!(_pluginTransmit is ILearnIR))
+ {
+ IrssLog.Debug("Active transmit plugin doesn't support learn");
+ return LearnStatus.Failure;
+ }
- Thread.Sleep(500);
+ Thread.Sleep(250);
- byte[] data = null;
+ LearnStatus status = LearnStatus.Failure;
try
{
- LearnStatus status = (_pluginTransmit as ILearnIR).Learn(out data);
+ status = (_pluginTransmit as ILearnIR).Learn(out data);
switch (status)
{
case LearnStatus.Success:
@@ -972,7 +979,7 @@
IrssLog.Error(ex.ToString());
}
- return data;
+ return status;
}
void HandlePipeMessage(PipeMessage received)
@@ -984,49 +991,43 @@
switch (received.Type)
{
case PipeMessageType.ForwardRemoteEvent:
- {
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.None, received.DataAsBytes);
if (_mode == IRServerMode.RelayMode)
{
- forward.Type = received.Type;
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.Request, received.DataAsBytes);
SendTo(Common.ServerPipeName, _hostComputer, forward);
}
else
{
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.Notify, received.DataAsBytes);
SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
break;
- }
case PipeMessageType.ForwardKeyboardEvent:
- {
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.None, received.DataAsBytes);
if (_mode == IRServerMode.RelayMode)
{
- forward.Type = received.Type;
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ForwardKeyboardEvent, PipeMessageFlags.Request, received.DataAsBytes);
SendTo(Common.ServerPipeName, _hostComputer, forward);
}
else
{
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.Notify, received.DataAsBytes);
SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
break;
- }
case PipeMessageType.ForwardMouseEvent:
- {
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.None, received.DataAsBytes);
if (_mode == IRServerMode.RelayMode)
{
- forward.Type = received.Type;
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ForwardMouseEvent, PipeMessageFlags.Request, received.DataAsBytes);
SendTo(Common.ServerPipeName, _hostComputer, forward);
}
else
{
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.Notify, received.DataAsBytes);
SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
break;
- }
case PipeMessageType.BlastIR:
{
@@ -1047,7 +1048,9 @@
response.Flags |= PipeMessageFlags.Failure;
}
- SendTo(received.FromPipe, received.FromServer, response);
+ if ((received.Flags & PipeMessageFlags.ForceNotRespond) != PipeMessageFlags.ForceNotRespond)
+ SendTo(received.FromPipe, received.FromServer, response);
+
break;
}
@@ -1061,12 +1064,25 @@
}
else
{
- byte[] bytes = LearnIR();
+ byte[] bytes = null;
- if (bytes == null)
- response.Flags |= PipeMessageFlags.Failure;
- else
- response.Flags |= PipeMessageFlags.Success;
+ LearnStatus status = LearnIR(out bytes);
+
+ switch (status)
+ {
+ case LearnStatus.Success:
+ response.Flags |= PipeMessageFlags.Success;
+ response.DataAsBytes = bytes;
+ break;
+
+ case LearnStatus.Failure:
+ response.Flags |= PipeMessageFlags.Failure;
+ break;
+
+ case LearnStatus.Timeout:
+ response.Flags |= PipeMessageFlags.Timeout;
+ break;
+ }
}
SendTo(received.FromPipe, received.FromServer, response);
@@ -1076,14 +1092,21 @@
case PipeMessageType.ServerShutdown:
if (_mode == IRServerMode.ServerMode)
{
- IrssLog.Info("Shutdown command received");
- Stop();
- Application.Exit();
+ if ((received.Flags & PipeMessageFlags.Request) == PipeMessageFlags.Request)
+ {
+ IrssLog.Info("Shutdown command received");
+ Stop();
+ Application.Exit();
+ }
}
else
{
- IrssLog.Warn("Host server has shut down");
- _registered = false;
+ if ((received.Flags & PipeMessageFlags.Notify) == PipeMessageFlags.Notify)
+ {
+
+ IrssLog.Warn("Host server has shut down");
+ _registered = false;
+ }
}
break;
@@ -1095,47 +1118,50 @@
}
case PipeMessageType.RegisterClient:
- if ((received.Flags & PipeMessageFlags.Response) == PipeMessageFlags.Response)
+ if (_mode == IRServerMode.ServerMode)
{
- if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ if ((received.Flags & PipeMessageFlags.Request) == PipeMessageFlags.Request)
{
- IrssLog.Info("Registered with host server");
- _registered = true;
- }
- else
- {
- IrssLog.Warn("Host server refused registration");
- _registered = false;
- }
- }
- else if ((received.Flags & PipeMessageFlags.Request) == PipeMessageFlags.Request)
- {
- PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RegisterClient, PipeMessageFlags.Response);
+ PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RegisterClient, PipeMessageFlags.Response);
- if (RegisterClient(received.FromPipe, received.FromServer))
- {
- IRServerInfo irServerInfo = new IRServerInfo();
+ if (RegisterClient(received.FromPipe, received.FromServer))
+ {
+ IRServerInfo irServerInfo = new IRServerInfo();
- if (_pluginReceive != null)
- irServerInfo.CanReceive = true;
+ if (_pluginReceive != null)
+ irServerInfo.CanReceive = true;
- if (_pluginTransmit != null)
+ if (_pluginTransmit != null)
+ {
+ irServerInfo.CanLearn = (_pluginTransmit is ILearnIR);
+ irServerInfo.CanTransmit = true;
+ irServerInfo.Ports = (_pluginTransmit as ITransmitIR).AvailablePorts;
+ }
+
+ response.DataAsBytes = irServerInfo.ToBytes();
+ response.Flags |= PipeMessageFlags.Success;
+ }
+ else
{
- irServerInfo.CanLearn = (_pluginTransmit is ILearnIR);
- irServerInfo.CanTransmit = true;
- irServerInfo.Ports = (_pluginTransmit as ITransmitIR).AvailablePorts;
+ response.Flags |= PipeMessageFlags.Failure;
}
- response.DataAsBytes = irServerInfo.ToBytes();
- response.Flags |= PipeMessageFlags.Success;
+ SendTo(received.FromPipe, received.FromServer, response);
}
+ }
+ else if ((received.Flags & PipeMessageFlags.Response) == PipeMessageFlags.Response)
+ {
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ {
+ IrssLog.Info("Registered with host server");
+ _registered = true;
+ }
else
{
- response.Flags |= PipeMessageFlags.Failure;
+ IrssLog.Warn("Host server refused registration");
+ _registered = false;
}
-
- SendTo(received.FromPipe, received.FromServer, response);
- }
+ }
break;
case PipeMessageType.UnregisterClient:
@@ -1163,7 +1189,7 @@
catch (Exception ex)
{
IrssLog.Error(ex.ToString());
- PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.Error, PipeMessageFlags.None, ex.Message);
+ PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.Error, PipeMessageFlags.Notify, ex.Message);
SendTo(received.FromPipe, received.FromServer, response);
}
Modified: trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Translator/Program.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -906,7 +906,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -409,7 +409,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -471,7 +471,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -528,7 +528,7 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ IrssLog.Debug("Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -43,18 +43,18 @@
Request = 0x0001,
Response = 0x0002,
- //Notify = 0x0004,
+ Notify = 0x0004,
Success = 0x0008,
Failure = 0x0010,
Timeout = 0x0020,
- Error = 0x0040,
+ //Error = 0x0040,
//DataString = 0x0080,
//DataBytes = 0x0100,
//ForceRespond = 0x0200,
- //ForceNotRespond = 0x0400,
+ ForceNotRespond = 0x0400,
}
#endregion Enumerations
@@ -182,10 +182,9 @@
if (_data != null && _data.Length != 0)
data = ByteArrayToByteString(_data);
- string messageType = Enum.GetName(typeof(PipeMessageType), _type);
+ string messageType = ((int)_type).ToString();
+ string flags = ((int)_flags).ToString();
- string flags = _flags.ToString();
-
return String.Format(
"{0},{1},{2},{3},{4}",
_fromServer,
@@ -213,8 +212,8 @@
if (stringItems.Length != 5)
return null;
- PipeMessageType type = (PipeMessageType)Enum.Parse(typeof(PipeMessageType), stringItems[2]);
- PipeMessageFlags flags = (PipeMessageFlags)Enum.Parse(typeof(PipeMessageFlags), stringItems[3]);
+ PipeMessageType type = (PipeMessageType)int.Parse(stringItems[2]);
+ PipeMessageFlags flags = (PipeMessageFlags)int.Parse(stringItems[3]);
if (String.IsNullOrEmpty(stringItems[4]))
{
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Driver.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -8,6 +8,8 @@
using Microsoft.Win32.SafeHandles;
+using IRServerPluginInterface;
+
namespace MicrosoftMceTransceiver
{
@@ -212,13 +214,14 @@
/// Stop access to the device.
/// </summary>
public abstract void Stop();
- // TODO: Change learn interface to return LearnStatus
+
/// <summary>
/// Learn an IR Command.
/// </summary>
/// <param name="learnTimeout">How long to wait before aborting learn.</param>
- /// <returns>Newly learned IR Command.</returns>
- public abstract IrCode Learn(int learnTimeout);
+ /// <param name="learned">Newly learned IR Command.</param>
+ /// <returns>Learn status.</returns>
+ public abstract LearnStatus Learn(int learnTimeout, out IrCode learned);
/// <summary>
/// Send an IR Command.
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverReplacement.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -9,6 +9,8 @@
using Microsoft.Win32.SafeHandles;
+using IRServerPluginInterface;
+
namespace MicrosoftMceTransceiver
{
@@ -222,10 +224,11 @@
//_debugFile.Close();
}
- public override IrCode Learn(int learnTimeout)
+ public override LearnStatus Learn(int learnTimeout, out IrCode learned)
{
//_debugFile.WriteLine("Start Learn");
+ learned = null;
_learningCode = new IrCode();
SetInputPort(InputPort.Learning);
@@ -244,27 +247,31 @@
_readThreadMode = ReadThreadMode.Receiving;
SetInputPort(InputPort.Receive);
+ LearnStatus status = LearnStatus.Failure;
+
switch (modeWas)
{
case ReadThreadMode.Learning:
- // Timeout.
- return null;
+ status = LearnStatus.Timeout;
+ break;
case ReadThreadMode.LearningFailed:
- // Failure.
- return null;
+ status = LearnStatus.Failure;
+ break;
case ReadThreadMode.LearningDone:
//_debugFile.WriteLine(_learningCode.ToByteArray());
if (_learningCode.FinalizeData())
- return _learningCode; // Success.
- else
- return null; // Failure.
+ {
+ learned = _learningCode;
+ status = LearnStatus.Success;
+ }
+ break;
+ }
- default:
- return null;
- }
+ _learningCode = null;
+ return status;
}
public override void Send(IrCode code, uint port)
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverVista.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -9,6 +9,8 @@
using Microsoft.Win32.SafeHandles;
+using IRServerPluginInterface;
+
namespace MicrosoftMceTransceiver
{
@@ -537,12 +539,13 @@
//_debugFile.Close();
}
- public override IrCode Learn(int learnTimeout)
+ public override LearnStatus Learn(int learnTimeout, out IrCode learned)
{
//_debugFile.WriteLine("Learn");
StopReadThread();
+ learned = null;
_learningCode = new IrCode();
StartReceive(_learnPort, PacketTimeout);
@@ -569,29 +572,33 @@
StartReadThread();
+ LearnStatus status = LearnStatus.Failure;
+
switch (modeWas)
{
case ReadThreadMode.Learning:
- // Timeout.
- return null;
+ status = LearnStatus.Timeout;
+ break;
case ReadThreadMode.LearningFailed:
- // Failure.
- return null;
+ status = LearnStatus.Failure;
+ break;
case ReadThreadMode.LearningDone:
//_debugFile.WriteLine(_learningCode.ToByteArray());
if (_learningCode.FinalizeData())
- return _learningCode; // Success.
- else
- return null; // Failure.
-
- default:
- return null;
+ {
+ learned = _learningCode;
+ status = LearnStatus.Success;
+ }
+ break;
}
+
+ _learningCode = null;
+ return status;
}
-
+
public override void Send(IrCode code, uint port)
{
byte[] data = DataPacket(code);
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/DriverXP.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -9,6 +9,8 @@
using Microsoft.Win32.SafeHandles;
+using IRServerPluginInterface;
+
namespace MicrosoftMceTransceiver
{
@@ -216,10 +218,11 @@
//_debugFile.Close();
}
- public override IrCode Learn(int learnTimeout)
+ public override LearnStatus Learn(int learnTimeout, out IrCode learned)
{
//_debugFile.WriteLine("Start Learn");
+ learned = null;
_learningCode = new IrCode();
SetInputPort(InputPort.Learning);
@@ -238,27 +241,31 @@
_readThreadMode = ReadThreadMode.Receiving;
SetInputPort(InputPort.Receive);
+ LearnStatus status = LearnStatus.Failure;
+
switch (modeWas)
{
case ReadThreadMode.Learning:
- // Timeout.
- return null;
+ status = LearnStatus.Timeout;
+ break;
case ReadThreadMode.LearningFailed:
- // Failure.
- return null;
+ status = LearnStatus.Failure;
+ break;
case ReadThreadMode.LearningDone:
//_debugFile.WriteLine(_learningCode.ToByteArray());
if (_learningCode.FinalizeData())
- return _learningCode; // Success.
- else
- return null; // Failure.
+ {
+ learned = _learningCode;
+ status = LearnStatus.Success;
+ }
+ break;
+ }
- default:
- return null;
- }
+ _learningCode = null;
+ return status;
}
public override void Send(IrCode code, uint port)
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/MicrosoftMceTransceiver.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -245,18 +245,16 @@
}
public LearnStatus Learn(out byte[] data)
{
- IrCode code = _driver.Learn(_learnTimeout);
+ IrCode code = null;
+ LearnStatus status = _driver.Learn(_learnTimeout, out code);
+
if (code != null)
- {
data = code.ToByteArray();
- return LearnStatus.Success;
- }
else
- {
data = null;
- return LearnStatus.Failure;
- }
+
+ return status;
}
void LoadSettings()
Modified: trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/UirtTransceiver.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -86,13 +86,14 @@
static extern bool UUIRTLearnIR(
IntPtr hHandle,
int codeFormat,
- [MarshalAs(UnmanagedType.LPStr)] StringBuilder ircode,
+ //[MarshalAs(UnmanagedType.LPStr)]
+ StringBuilder ircode,
IRLearnCallbackDelegate progressProc,
- int userData,
- ref int pAbort,
+ IntPtr userData,
+ IntPtr abort,
int param1,
- [MarshalAs(UnmanagedType.AsAny)] Object o,
- [MarshalAs(UnmanagedType.AsAny)] Object oo);
+ IntPtr reserved1,
+ IntPtr reserved2);
[DllImport("uuirtdrv.dll")]
[return: MarshalAs(UnmanagedType.Bool)]
@@ -132,7 +133,7 @@
static readonly string[] Ports = new string[] { "Default", "Port 1", "Port 2", "Port 3" };
- const int AbortLearn = -1;
+ const int AbortLearn = 1;
const int AllowLearn = 0;
#endregion Constants
@@ -147,14 +148,12 @@
int _blastRepeats;
int _learnTimeout;
- //ulong _learnCarrierFreq;
-
string _lastCode = String.Empty;
DateTime _lastCodeTime = DateTime.Now;
// -------
- int _abortLearn = AllowLearn;
+ IntPtr _abortLearn = IntPtr.Zero;
bool _learnTimedOut;
UUIRTReceiveCallbackDelegate _receiveCallback = null;
bool _isUsbUirtLoaded = false;
@@ -236,7 +235,11 @@
}
public override void Stop()
{
- UUIRTClose(_usbUirtHandle);
+ if (_abortLearn != IntPtr.Zero)
+ Marshal.WriteInt32(_abortLearn, AbortLearn);
+
+ if (_usbUirtHandle != new IntPtr(-1))
+ UUIRTClose(_usbUirtHandle);
_usbUirtHandle = IntPtr.Zero;
_isUsbUirtLoaded = false;
@@ -303,35 +306,34 @@
data = null;
- StringBuilder irCode = new StringBuilder("1", 2048);
- _abortLearn = AllowLearn;
+ StringBuilder irCode = new StringBuilder(4096);
_learnTimedOut = false;
- //_learnCarrierFreq = 0;
-
Timer timer = new Timer();
timer.Interval = _learnTimeout;
timer.Tick += new EventHandler(timer_Tick);
timer.Enabled = true;
timer.Start();
- //IRLearnCallbackDelegate learnCallback = new IRLearnCallbackDelegate(UUIRTLearnCallback);
-
+ _abortLearn = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(int)));
+ Marshal.WriteInt32(_abortLearn, AllowLearn);
+
result = UirtTransceiver.UUIRTLearnIR(
_usbUirtHandle, // Handle to USB-UIRT
- UirtTransceiver.UUIRTDRV_IRFMT_PRONTO | UirtTransceiver.UUIRTDRV_IRFMT_LEARN_FREQDETECT, // | UirtTransceiver.UUIRTDRV_IRFMT_LEARN_FORCERAW
+ UirtTransceiver.UUIRTDRV_IRFMT_PRONTO,
irCode, // Where to put the IR Code
null, // Learn status callback
- 0, // User data
- ref _abortLearn, // Abort flag?
+ IntPtr.Zero, // User data
+ _abortLearn, // Abort flag?
0,
- null,
- null);
+ IntPtr.Zero,
+ IntPtr.Zero);
+ Marshal.FreeHGlobal(_abortLearn);
+ _abortLearn = IntPtr.Zero;
+
timer.Stop();
- //MessageBox.Show(_learnCarrierFreq.ToString());
-
if (_learnTimedOut)
{
return LearnStatus.Timeout;
@@ -364,7 +366,7 @@
Console.WriteLine(ex.ToString());
_repeatDelay = 500;
- _blastRepeats = 4;
+ _blastRepeats = 3;
_learnTimeout = 10000;
}
}
@@ -425,7 +427,9 @@
*/
void timer_Tick(object sender, EventArgs e)
{
- _abortLearn = AbortLearn;
+ if (_abortLearn != IntPtr.Zero)
+ Marshal.WriteInt32(_abortLearn, AbortLearn);
+
_learnTimedOut = true;
((Timer)sender).Stop();
Modified: trunk/plugins/IR Server Suite/IR Server Suite.sln
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/IR Server Suite.sln 2007-09-12 12:28:29 UTC (rev 916)
@@ -247,6 +247,12 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Named Pipes Tool", "Applications\NamedPipesTool\Named Pipes Tool.csproj", "{6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -534,6 +540,12 @@
{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|Any CPU.Build.0 = Release|Any CPU
{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.ActiveCfg = Release|x86
{8ADDE1CB-2D23-4AB1-88B1-A241C60C16BA}.Release|x86.Build.0 = Release|x86
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -550,6 +562,7 @@
{905131F8-F8AC-4A65-A722-37783902D7B8} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A533F58F-2402-47CF-A258-377A669DB56F} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
+ {6E7C6F27-DA95-4F2F-A97D-1EA8E1517A4C} = {0C209E91-5AD5-4662-AD0E-976A940D4806}
{A4023992-CCD6-461E-8E14-219A496734C5} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{7C686499-7517-4338-8837-7E8617549D9A} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
{BABC30EB-7D0F-4398-9FCB-E517EA8D2AA9} = {0D1620EE-01B9-43B5-9FAA-E983BD9EBDBD}
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -557,7 +557,7 @@
PipeMessage received = PipeMessage.FromString(message);
if (LogVerbose)
- Log.Debug("MPBlastZonePlugin: Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ Log.Debug("MPBlastZonePlugin: Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -817,7 +817,7 @@
PipeMessage received = PipeMessage.FromString(message);
if (LogVerbose)
- Log.Debug("MPControlPlugin: Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ Log.Debug("MPControlPlugin: Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -152,7 +152,7 @@
public bool CanEnable() { return true; }
public bool HasSetup() { return true; }
- public string PluginName() { return "TV2 STB Blaster Plugin for IR Server"; }
+ public string PluginName() { return "TV2 Blaster Plugin for IR Server"; }
public bool DefaultEnabled() { return true; }
public int GetWindowId() { return 0; }
public string Author() { return "and-81"; }
@@ -430,7 +430,7 @@
PipeMessage received = PipeMessage.FromString(message);
if (LogVerbose)
- Log.Debug("TV2BlasterPlugin: Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ Log.Debug("TV2BlasterPlugin: Received Message \"{0}\"", received.Type);
try
{
Modified: trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
===================================================================
--- trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-09-11 19:30:37 UTC (rev 915)
+++ trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs 2007-09-12 12:28:29 UTC (rev 916)
@@ -66,7 +66,7 @@
/// <summary>
/// Returns the name of the plugin.
/// </summary>
- public string Name { get { return "TV3 STB Blaster Plugin for IR Server"; } }
+ public string Name { get { return "TV3 Blaster Plugin for IR Server"; } }
/// <summary>
/// Returns the version of the plugin.
/// </summary>
@@ -407,7 +407,7 @@
PipeMessage received = PipeMessage.FromString(message);
if (LogVerbose)
- Log.Debug("TV3BlasterPlugin: Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
+ Log.Debug("TV3BlasterPlugin: Received Message \"{0}\"", received.Type);
try
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-09-11 19:30:40
|
Revision: 915
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=915&view=rev
Author: rsparey
Date: 2007-09-11 12:30:37 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
changing reference file, so is more compatible with blue two wide
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/common.MS.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/common.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvchannel.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtvgenre.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -45,9 +45,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -56,9 +56,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -67,9 +67,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.MS.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.MS.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.MS.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -5,33 +5,34 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
- </control>
-
+
+ </control>
<control>
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
- </control>
-
+
+ </control>
<control>
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
+
</control>
</controls>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -5,33 +5,34 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
- </control>
-
+
+ </control>
<control>
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
- </control>
-
+
+ </control>
<control>
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
+
</control>
</controls>
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml (rev 0)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/golden reference.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -0,0 +1,595 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<controls>
+ <skin>
+ <width>1366</width>
+ <height>768</height>
+ <version>0.2.3.0</version>
+ </skin>
+ <control>
+ <description>default image</description>
+ <type>image</type>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ <colorkey>0</colorkey>
+ <colordiffuse>ffffffff</colordiffuse>
+ <filtered>yes</filtered>
+ <centered>no</centered>
+ <keepaspectratio>no</keepaspectratio>
+ <visible>yes</visible>
+ </control>
+ <control>
+ <description>default label</description>
+ <type>label</type>
+ <id>1</id>
+ <posX>151</posX>
+ <posY>80</posY>
+ <label>6</label>
+ <font>font13</font>
+ <textcolor>FFdddddd</textcolor>
+ <disabledcolor>80ffffff</disabledcolor>
+ </control>
+ <control>
+ <description>default button</description>
+ <type>button</type>
+ <id>1</id>
+ <posX>569</posX>
+ <posY>266</posY>
+ <width>220</width>
+ <height>40</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <textureFocus>menu_list_focus.png</textureFocus>
+ <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <!-- <selectedColor>white</selectedColor> -->
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default updownbutton</description>
+ <type>updownbutton</type>
+ <id>1</id>
+ <posX>569</posX>
+ <posY>266</posY>
+ <width>220</width>
+ <height>40</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <textureFocus>menu_list_focus.png</textureFocus>
+ <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+
+ <control>
+ <description>default togglebutton</description>
+ <type>togglebutton</type>
+ <id>4</id>
+ <posX>569</posX>
+ <posY>266</posY>
+ <width>220</width>
+ <height>40</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <textureFocus>togglebutton-on-focus.png</textureFocus>
+ <textureNoFocus>togglebutton-on-nofocus.png</textureNoFocus>
+ <AltTextureFocus>togglebutton-off-focus.png</AltTextureFocus>
+ <AltTextureNoFocus>togglebutton-off-nofocus.png</AltTextureNoFocus>
+ <label>-</label>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>sort button</description>
+ <type>sortbutton</type>
+ <id>3</id>
+ <width>220</width>
+ <height>40</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <textureFocus>menu_list_focus.png</textureFocus>
+ <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused>
+ <textureDescending>arrow_round_down_nofocus.png</textureDescending>
+ <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
+ <offsetSortButtonX>195</offsetSortButtonX>
+ <offsetSortButtonY>8</offsetSortButtonY>
+ <font>font13</font>
+ <textcolor>White</textcolor>
+ <colordiffuse>White</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <label>103</label>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default listcontrol</description>
+ <type>listcontrol</type>
+ <id>10</id>
+ <posX>30</posX>
+ <posY>200</posY>
+ <width>1306</width>
+ <height>330</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font10</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <playedColor>ffa0d0ff</playedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>1250</textXOff2>
+ <textYOff2>7</textYOff2>
+ <textXOff3>1300</textXOff3>
+ <textYOff3>7</textYOff3>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ </control>
+ <control>
+ <description>default checklistcontrol</description>
+ <type>checklistcontrol</type>
+ <id>10</id>
+ <posX>30</posX>
+ <posY>160</posY>
+ <width>1310</width>
+ <height>330</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1270</spinPosX>
+ <spinPosY>480</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font12</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textureCheckmark>check-box.png</textureCheckmark>
+ <textureCheckmarkNoFocus>check-boxNF.png</textureCheckmarkNoFocus>
+ <MarkWidth>21</MarkWidth>
+ <MarkHeight>21</MarkHeight>
+ <MarkOffsetX>30</MarkOffsetX>
+ <MarkOffsetY>21</MarkOffsetY>
+ <textXOff>32</textXOff>
+ <textYOff>1</textYOff>
+ <textXOff2>722</textXOff2>
+ <textYOff2>1</textYOff2>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ </control>
+ <control>
+ <description>default up/downlistcontrol</description>
+ <type>updownlistcontrol</type>
+ <id>10</id>
+ <posX>30</posX>
+ <posY>160</posY>
+ <width>1310</width>
+ <height>475</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1270</spinPosX>
+ <spinPosY>480</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font12</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>1</textYOff>
+ <textXOff2>722</textXOff2>
+ <textYOff2>1</textYOff2>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ </control>
+ <control>
+ <description>default playlist item listcontrol</description>
+ <type>playlistcontrol</type>
+ <id>10</id>
+ <posX>30</posX>
+ <posY>200
+ </posY>
+ <width>1190</width>
+ <height>475</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1270</spinPosX>
+ <spinPosY>480</spinPosY>
+ <spinColor>ffffffff</spinColor>
+
+
+
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font9</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>650</textXOff2>
+ <textYOff2>7</textYOff2>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
+ <upBtnWidth>35</upBtnWidth>
+ <downBtnWidth>35</downBtnWidth>
+ <deleteBtnWidth>35</deleteBtnWidth>
+ <upBtnHeight>35</upBtnHeight>
+ <downBtnHeight>35</downBtnHeight>
+ <deleteBtnHeight>35</deleteBtnHeight>
+ <upBtnXOffset>1200</upBtnXOffset>
+ <downBtnXOffset>1237</downBtnXOffset>
+ <deleteBtnXOffset>1273</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureMoveUp>arrow_round_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>arrow_round_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>arrow_round_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>arrow_round_down_focus.png</textureMoveDownFocused>
+ <textureDelete>dialogue_shutdown_nofocus.png</textureDelete>
+ <textureDeleteFocused>dialogue_shutdown_focus.png</textureDeleteFocused>
+ </control>
+ <control>
+ <description>playlist item button</description>
+ <type>playlistbutton</type>
+ <id>5</id>
+ <posX>189</posX>
+ <posY>133</posY>
+ <width>566</width>
+ <height>50</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <upBtnWidth>33</upBtnWidth>
+ <downBtnWidth>33</downBtnWidth>
+ <deleteBtnWidth>37</deleteBtnWidth>
+ <upBtnHeight>42</upBtnHeight>
+ <downBtnHeight>42</downBtnHeight>
+ <deleteBtnHeight>42</deleteBtnHeight>
+ <upBtnXOffset>654</upBtnXOffset>
+ <downBtnXOffset>703</downBtnXOffset>
+ <deleteBtnXOffset>753</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureFocus>playlist_sub_focus.png</textureFocus>
+ <textureNoFocus>playlist_sub_nofocus.png</textureNoFocus>
+ <textureMoveUp>playlist_item_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>playlist_item_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>playlist_item_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>playlist_item_down_focus.png</textureMoveDownFocused>
+ <textureDelete>playlist_item_delete_nofocus.png</textureDelete>
+ <textureDeleteFocused>playlist_item_delete_focus.png</textureDeleteFocused>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default thumbnail panel</description>
+ <type>thumbnailpanel</type>
+ <id>11</id>
+ <posX>30</posX>
+ <posY>198</posY>
+ <width>1316</width>
+ <height>350</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>80</itemWidth>
+ <itemHeight>60</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>60</textureHeight>
+ <thumbWidth>80</thumbWidth>
+ <thumbHeight>60</thumbHeight>
+ <thumbPosX>15</thumbPosX>
+ <thumbPosY>15</thumbPosY>
+ <imageFolder>-</imageFolder>
+ <imageFolderFocus>-</imageFolderFocus>
+
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>ffb9d5dd</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>105</textureWidthBig><!-- 150 -->
+ <textureHeightBig>105</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>105</itemWidthBig><!-- 180 -->
+ <itemHeightBig>105</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>105</thumbWidthBig>
+ <thumbHeightBig>105</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <unfocusedAlpha>180</unfocusedAlpha>
+ <textXOff>-5000</textXOff>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
+ </control>
+<control>
+ <description>default filmstrip</description>
+ <type>filmstrip</type>
+ <id>11</id>
+ <posX>0</posX>
+ <posY>260</posY>
+ <width>1360</width>
+ <height>400</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>110</itemWidth>
+ <itemHeight>220</itemHeight>
+ <textureWidth>180</textureWidth>
+ <textureHeight>1600</textureHeight>
+ <thumbWidth>101</thumbWidth>
+ <thumbHeight>101</thumbHeight>
+ <thumbPosX>35</thumbPosX><!-- 10 -->
+ <thumbPosY>15</thumbPosY><!-- 10 -->
+ <imageFolder>icon_empty_nofocus_music.png</imageFolder>
+ <imageFolderFocus>icon_empty_focus_music.png</imageFolderFocus>
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>white</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>120</textureWidthBig>
+ <textureHeightBig>120</textureHeightBig>
+ <itemWidthBig>150</itemWidthBig>
+ <itemHeightBig>129</itemHeightBig>
+ <thumbWidthBig>84</thumbWidthBig>
+ <thumbHeightBig>84</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig>
+ <thumbPosYBig>0</thumbPosYBig>
+ <background>-</background>
+ <backgroundx>915</backgroundx>
+ <backgroundy>130</backgroundy>
+ <backgroundwidth>320</backgroundwidth>
+ <backgroundheight>460</backgroundheight>
+ <backgrounddiffuse>60ffffff</backgrounddiffuse>
+ <InfoImage>-</InfoImage>
+ <InfoImagex>920</InfoImagex>
+ <InfoImagey>135</InfoImagey>
+ <InfoImagewidth>310</InfoImagewidth>
+ <InfoImageheight>450</InfoImageheight>
+ <InfoImagediffuse>ffffffff</InfoImagediffuse>
+
+ <thumbs flipY="true" diffuse="Thumb_Mask.png"/>
+
+ <InfoImage flipY="true" diffuse="Thumb_Mask.png"/>
+
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
+
+ </control>
+ <control>
+ <description>default fadelabel</description>
+ <type>fadelabel</type>
+ <id>5</id>
+ <posX>104</posX>
+ <posY>706</posY>
+ <width>240</width>
+ <align>left</align>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ </control>
+ <control>
+ <description>default textarea</description>
+ <type>textbox</type>
+ <id>4</id>
+ <posX>417</posX>
+ <posY>293</posY>
+ <width>546</width>
+ <height>400</height>
+ <spinWidth>21</spinWidth>
+ <spinHeight>21</spinHeight>
+ <spinPosX>1157</spinPosX>
+ <spinPosY>706</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <image>icon-folder.png</image>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ </control>
+ <control>
+ <description>default progress control</description>
+ <type>progress</type>
+ <id>20</id>
+ <posX>189</posX>
+ <posY>433</posY>
+ <height>33</height>
+ <texturebg>progress_back.png</texturebg>
+ <lefttexture>osd_progress_left.png</lefttexture>
+ <midtexture>osd_progress_mid.png</midtexture>
+ <righttexture>osd_progress_right.png</righttexture>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>default horizontal scrollbar control</description>
+ <type>hscrollbar</type>
+ <id>20</id>
+ <posX>189</posX>
+ <posY>433</posY>
+ <texturebg>bar_hor.png</texturebg>
+ <lefttexture>mouse_left_horizontal.png</lefttexture>
+ <righttexture>mouse_right_horizontal.png</righttexture>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>default vertical scrollbar control</description>
+ <type>vscrollbar</type>
+ <id>20</id>
+ <posX>189</posX>
+ <posY>33</posY>
+ <scrollbarbg>bar_vert.png</scrollbarbg>
+ <scrollbartop>mouse_left_vertical.png</scrollbartop>
+ <scrollbarbottom>mouse_right_vertical.png</scrollbarbottom>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>default spin control</description>
+ <type>spincontrol</type>
+ <id>2</id>
+ <posX>626</posX>
+ <posY>168</posY>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <align>left</align>
+ <width>21</width>
+ <height>21</height>
+ <font>font13</font>
+ <reverse>yes</reverse>
+ <textcolor>white</textcolor>
+ <disabledcolor>60ffffff</disabledcolor>
+ <spintype>text</spintype>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default checkmark</description>
+ <type>checkmark</type>
+ <id>4</id>
+ <posX>394</posX>
+ <posY>221</posY>
+ <textcolor>ffffffff</textcolor>
+ <disabledcolor>60ffffff</disabledcolor>
+ <font>font13</font>
+ <label>167</label>
+ <textureCheckmark>check-box.png</textureCheckmark>
+ <textureCheckmarkNoFocus>check-boxNF.png</textureCheckmarkNoFocus>
+ <MarkWidth>21</MarkWidth>
+ <MarkHeight>21</MarkHeight>
+ <align>left</align>
+ <shadow>no</shadow>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+ <control>
+ <description>default select button</description>
+ <type>selectbutton</type>
+ <id>6</id>
+ <posX>104</posX>
+ <posY>306</posY>
+ <width>220</width>
+ <height>40</height>
+ <label>457</label>
+ <font>font13</font>
+ <textXOff>28</textXOff>
+ <textYOff>6</textYOff>
+ <textXOff2>18</textXOff2>
+ <textYOff2>6</textYOff2>
+ <textureFocus>menu_list_focus.png</textureFocus>
+ <textureNoFocus>menu_list_nofocus.png</textureNoFocus>
+ <texturebg>menu_list_nofocus.png</texturebg>
+ <textureLeft>arrow_round_left_nofocus.png</textureLeft>
+ <textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
+ <textureRight>arrow_round_right_nofocus.png</textureRight>
+ <textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <onleft>50</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>7</ondown>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
+ </control>
+</controls>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -69,9 +69,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -80,9 +80,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -91,9 +91,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
@@ -125,7 +125,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>2</onleft>
+ <onleft>10</onleft>
<onright>3</onright>
<onup>21</onup>
<ondown>50</ondown>
@@ -218,7 +218,7 @@
<width>209</width>
<height>36</height>
<onleft>7</onleft>
- <onright>9</onright>
+ <onright>10</onright>
<onup>21</onup>
<ondown>50</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -229,7 +229,7 @@
<control>
<description>My Playlists</description>
<type>button</type>
- <id>9</id>
+ <id>10</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
<posY>155</posY>
@@ -240,9 +240,9 @@
<width>209</width>
<height>36</height>
<onleft>8</onleft>
- <onright>9</onright>
+ <onright>2</onright>
<onup>21</onup>
- <ondown>50</ondown>
+ <ondown>11</ondown>
<textureFocus>tab_down.png</textureFocus>
<textureNoFocus>tab_up.png</textureNoFocus>
<textcolor>white</textcolor>
@@ -256,7 +256,8 @@
<description>composite control consisting of a list control and a thumbnail panel</description>
<type>facadeview</type>
<id>50</id>
- <control>
+
+ <control>
<description>listcontrol</description>
<type>listcontrol</type>
<id>50</id>
@@ -264,10 +265,44 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- <spinPosX>1240</spinPosX>
+ <posX>30</posX>
+ <posY>200</posY>
+ <width>1306</width>
+ <height>330</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
<spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font10</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <playedColor>ffa0d0ff</playedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>1250</textXOff2>
+ <textYOff2>7</textYOff2>
+ <textXOff3>1300</textXOff3>
+ <textYOff3>7</textYOff3>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
</control>
- <control>
+ <control>
<description>Thumbnail Panel</description>
<type>thumbnailpanel</type>
<id>50</id>
@@ -275,28 +310,57 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- <spinPosX>1240</spinPosX>
+ <posX>30</posX>
+ <posY>198</posY>
+ <width>1316</width>
+ <height>350</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
<spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>80</itemWidth>
+ <itemHeight>60</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>60</textureHeight>
+ <thumbWidth>80</thumbWidth>
+ <thumbHeight>60</thumbHeight>
+ <thumbPosX>15</thumbPosX>
+ <thumbPosY>15</thumbPosY>
+ <imageFolder>-</imageFolder>
+ <imageFolderFocus>-</imageFolderFocus>
+
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>ffb9d5dd</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>105</textureWidthBig><!-- 150 -->
+ <textureHeightBig>105</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>105</itemWidthBig><!-- 180 -->
+ <itemHeightBig>105</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>105</thumbWidthBig>
+ <thumbHeightBig>105</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <unfocusedAlpha>180</unfocusedAlpha>
+ <textXOff>-5000</textXOff>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
</control>
- <control>
- <description>album view listcontrol</description>
- <type>listcontrol</type>
- <subtype>album</subtype>
- <id>52</id>
- <font>font13</font>
- <font2>font13</font2>
- <selectedColor2>FFF8BC70</selectedColor2>
- <textXOff>36</textXOff>
- <textYOff>20</textYOff>
- <textXOff2>712</textXOff2>
- <textYOff2>80</textYOff2>
- <itemWidth>136</itemWidth>
- <itemHeight>102</itemHeight>
- <spaceBetweenItems>5</spaceBetweenItems>
- <textureHeight>132</textureHeight>
- <onleft>2</onleft>
- </control>
- <control>
+ <control>
<description>Filmstrip view</description>
<type>filmstrip</type>
<id>50</id>
@@ -375,8 +439,57 @@
<animation effect="fade" time="500">delay="1300">WindowOpen</animation>
+
</control>
</control>
</control>
+ <control>
+ <description> playlist</description>
+
+ <type>button</type>
+ <id>11</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>194</posY>
+ <posX>1057</posX>
+ <hyperlink>500</hyperlink>
+ <label>136</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>8</onleft>
+ <onright>2</onright>
+ <onup>10</onup>
+ <ondown>12</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)|Control.HasFocus(12)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <description> playing now</description>
+
+ <type>button</type>
+ <id>12</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>230</posY>
+ <posX>1057</posX>
+ <hyperlink>510</hyperlink>
+ <label>100510</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>8</onleft>
+ <onright>2</onright>
+ <onup>11</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <visible>Control.HasFocus(10)|Control.HasFocus(12)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-72" end="0,0" time="250">visiblechange</animation>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -63,9 +63,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -74,9 +74,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -85,9 +85,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -68,9 +68,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -79,9 +79,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -90,9 +90,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
@@ -125,7 +125,7 @@
<posX>12</posX>
<label>100</label>
<font>font14</font>
- <onleft>2</onleft>
+ <onleft>10</onleft>
<onright>3</onright>
<onup>21</onup>
<ondown>50</ondown>
@@ -242,7 +242,7 @@
<onleft>8</onleft>
<onright>2</onright>
<onup>21</onup>
- <ondown>50</ondown>
+ <ondown>11</ondown>
<textureFocus>tab_down.png</textureFocus>
<textureNoFocus>tab_up.png</textureNoFocus>
<textcolor>white</textcolor>
@@ -271,8 +271,42 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- <spinPosX>1240</spinPosX>
+ <posX>30</posX>
+ <posY>200</posY>
+ <width>1306</width>
+ <height>330</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
<spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font10</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <playedColor>ffa0d0ff</playedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>1250</textXOff2>
+ <textYOff2>7</textYOff2>
+ <textXOff3>1300</textXOff3>
+ <textYOff3>7</textYOff3>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
</control>
<control>
<description>Thumbnail Panel</description>
@@ -282,8 +316,55 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- <spinPosX>1240</spinPosX>
+ <posX>30</posX>
+ <posY>198</posY>
+ <width>1316</width>
+ <height>350</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
<spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>80</itemWidth>
+ <itemHeight>60</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>60</textureHeight>
+ <thumbWidth>80</thumbWidth>
+ <thumbHeight>60</thumbHeight>
+ <thumbPosX>15</thumbPosX>
+ <thumbPosY>15</thumbPosY>
+ <imageFolder>-</imageFolder>
+ <imageFolderFocus>-</imageFolderFocus>
+
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>ffb9d5dd</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>105</textureWidthBig><!-- 150 -->
+ <textureHeightBig>105</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>105</itemWidthBig><!-- 180 -->
+ <itemHeightBig>105</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>105</thumbWidthBig>
+ <thumbHeightBig>105</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <unfocusedAlpha>180</unfocusedAlpha>
+ <textXOff>-5000</textXOff>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
</control>
<control>
<description>Filmstrip view</description>
@@ -394,10 +475,10 @@
<font>font14</font>
<width>209</width>
<height>36</height>
- <onleft>9</onleft>
+ <onleft>8</onleft>
<onright>2</onright>
- <onup>20</onup>
- <ondown>50</ondown>
+ <onup>10</onup>
+ <ondown>12</ondown>
<textureFocus>tab_down.png</textureFocus>
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(10)|Control.HasFocus(11)|Control.HasFocus(12)</visible>
@@ -405,7 +486,7 @@
<animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
- <description> playlist</description>
+ <description> playing now</description>
<type>button</type>
<id>12</id>
@@ -418,9 +499,9 @@
<font>font14</font>
<width>209</width>
<height>36</height>
- <onleft>9</onleft>
+ <onleft>8</onleft>
<onright>2</onright>
- <onup>20</onup>
+ <onup>11</onup>
<ondown>50</ondown>
<textureFocus>tab_down.png</textureFocus>
<textureNoFocus>tab_up.png</textureNoFocus>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -62,9 +62,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -73,9 +73,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -84,9 +84,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
@@ -238,6 +238,42 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
+ <posX>30</posX>
+ <posY>200</posY>
+ <width>1306</width>
+ <height>330</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <textureHeight>35</textureHeight>
+ <image>folder_focus.png</image>
+ <font>font10</font>
+ <shadedColor>20ffffff</shadedColor>
+ <selectedColor>FFF8BC70</selectedColor>
+ <playedColor>ffa0d0ff</playedColor>
+ <textcolor>ffffffff</textcolor>
+ <textcolor2>ffffffff</textcolor2>
+ <textcolor3>ffffffff</textcolor3>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <textXOff>32</textXOff>
+ <textYOff>7</textYOff>
+ <textXOff2>1250</textXOff2>
+ <textYOff2>7</textYOff2>
+ <textXOff3>1300</textXOff3>
+ <textYOff3>7</textYOff3>
+ <IconXOff>24</IconXOff>
+ <IconYOff>9</IconYOff>
+ <suffix>|</suffix>
</control>
<control>
<description>Thumbnail Panel</description>
@@ -247,7 +283,57 @@
<onright>2</onright>
<onup>2</onup>
<ondown>50</ondown>
- </control>
+ <posX>30</posX>
+ <posY>198</posY>
+ <width>1316</width>
+ <height>350</height>
+ <spinWidth>27</spinWidth>
+ <spinHeight>27</spinHeight>
+ <spinPosX>1240</spinPosX>
+ <spinPosY>515</spinPosY>
+ <spinColor>ffffffff</spinColor>
+ <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>
+ <itemWidth>80</itemWidth>
+ <itemHeight>60</itemHeight>
+ <textureWidth>80</textureWidth>
+ <textureHeight>60</textureHeight>
+ <thumbWidth>80</thumbWidth>
+ <thumbHeight>60</thumbHeight>
+ <thumbPosX>15</thumbPosX>
+ <thumbPosY>15</thumbPosY>
+ <imageFolder>-</imageFolder>
+ <imageFolderFocus>-</imageFolderFocus>
+
+ <font>-</font>
+ <selectedColor>ffffffff</selectedColor>
+ <textcolor>ffb9d5dd</textcolor>
+ <colordiffuse>ffffffff</colordiffuse>
+ <remoteColor>ffFFA075</remoteColor>
+ <downloadColor>ff80ff80</downloadColor>
+ <suffix>|</suffix>
+ <textureWidthBig>105</textureWidthBig><!-- 150 -->
+ <textureHeightBig>105</textureHeightBig> <!-- 150 -->
+ <itemWidthBig>105</itemWidthBig><!-- 180 -->
+ <itemHeightBig>105</itemHeightBig><!-- 180 -->
+ <thumbWidthBig>105</thumbWidthBig>
+ <thumbHeightBig>105</thumbHeightBig>
+ <thumbPosXBig>0</thumbPosXBig><!-- 19 -->
+ <thumbPosYBig>0</thumbPosYBig> <!-- 19 -->
+ <unfocusedAlpha>180</unfocusedAlpha>
+ <textXOff>-5000</textXOff>
+ <showFrame>yes</showFrame>
+ <showFolder>no</showFolder>
+ <showBackGround>yes</showBackGround>
+ <showInfoImage>no</showInfoImage>
+ <enableFocusZoom>no</enableFocusZoom>
+ <thumbs flipY="false" diffuse="Thumb_Mask.png"/>
+ <thumbAnimation effect="zoom" start="100,100" end="150,150" time="200">focus</thumbAnimation>
+ <thumbAnimation effect="zoom" start="150,150" end="100,100" time="200">unfocus</thumbAnimation>
+ </control>
+
<control>
<description>Filmstrip view</description>
<type>filmstrip</type>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradio.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -59,9 +59,9 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
@@ -70,9 +70,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
@@ -81,9 +81,9 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -5,15 +5,13 @@
<allowoverlay>no</allowoverlay>
<controls>
<import>common.window.xml</import>
- <import>common.time.xml</import>
-
- <control>
+ <import>common.time.xml</import> <control>
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1388</width>
<height>365</height>
<texture>mid_strip.png</texture>
<animation effect="zoom" start="100,100" end="100,135" center="12,186" time="1000" acceleration ="-1" >WindowOpen</animation>
@@ -23,9 +21,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1388</width>
<height>18</height>
<texture>bottom_strip.png</texture>
<animation effect="slide" time="1000" start="0,0" end="0,130" acceleration="-1" >WindowOpen</animation>
@@ -35,12 +33,11 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1388</width>
<height>36</height>
<texture>top-strip.png</texture>
-
</control>
<control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvguide.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -5,15 +5,13 @@
<allowoverlay>no</allowoverlay>
<controls>
<import>common.window.xml</import>
- <import>common.time.xml</import>
-
- <control>
+ <import>common.time.xml</import> <control>
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1388</width>
<height>365</height>
<texture>mid_strip.png</texture>
<animation effect="zoom" start="100,100" end="100,135" center="12,186" time="1000" acceleration ="-1" >WindowOpen</animation>
@@ -23,9 +21,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1388</width>
<height>18</height>
<texture>bottom_strip.png</texture>
<animation effect="slide" time="1000" start="0,0" end="0,130" acceleration="-1" >WindowOpen</animation>
@@ -35,12 +33,11 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1388</width>
<height>36</height>
<texture>top-strip.png</texture>
-
</control>
<control>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -24,31 +24,31 @@
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1390</width>
<height>365</height>
<texture>mid_strip.png</texture>
-
+
</control>
<control>
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1390</width>
<height>18</height>
<texture>bottom_strip.png</texture>
-
+
</control>
<control>
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1390</width>
<height>36</height>
<texture>top-strip.png</texture>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-09-11 18:30:11 UTC (rev 914)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvrecordedtv.xml 2007-09-11 19:30:37 UTC (rev 915)
@@ -14,14 +14,13 @@
<height>768</height>
</control>
- <import>common.time.xml</import>
- <control>
+ <import>common.time.xml</import> <control>
<type>image</type>
<decription>mid_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>186</posY>
- <width>1342</width>
+ <width>1388</width>
<height>365</height>
<texture>mid_strip.png</texture>
<animation effect="zoom" start="100,100" end="100,135" center="12,186" time="1000" acceleration ="-1" >WindowOpen</animation>
@@ -31,9 +30,9 @@
<type>image</type>
<decription>bottom_strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>547</posY>
- <width>1342</width>
+ <width>1388</width>
<height>18</height>
<texture>bottom_strip.png</texture>
<animation effect="slide" time="1000" start="0,0" end="0,130" acceleration="-1" >WindowOpen</animation>
@@ -43,12 +42,11 @@
<type>image</type>
<decription>top-strip</decription>
<id>1</id>
- <posX>12</posX>
+ <posX>-12</posX>
<posY>155</posY>
- <width>1342</width>
+ <width>1388</width>
<height>36</height>
<texture>top-strip.png</texture>
-
</control>
<control>
<description>icon background</description>
@@ -138,7 +136,7 @@
<posY>155</posY>
<posX>12</posX>
<label>100</label>
- <font>font10</font>
+ <font>font14</font>
<onleft>7</onleft>
<onright>3</onright>
<onup>22</onup>
@@ -161,7 +159,7 @@
<posY>155</posY>
<posX>221</posX>
<label>103</label>
- <font>font10</font>
+ <font>font14</font>
<width>209</width>
<height>36</height>
<onleft>2</onleft>
@@ -176,7 +174,7 @@
<textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
<offsetSortButtonX>180</offsetSortButtonX>
<offsetSortButtonY>8</offsetSortButtonY>
- <textcolor>black</textcolor>
+ <textcolor>white</textcolor>
</control>
<control>
@@ -189,7 +187,7 @@
<posY>155</posY>
<posX>430</posX>
<label>457</label>
- <font>font10</font>
+ <font>font14</font>
<width>209</width>
<height>36</height>
<onleft>3</onleft>
@@ -210,7 +208,7 @@
<posY>155</posY>
<posX>639</posX>
<label>624</label>
- <font>font10</font>
+ <font>font14</font>
<width>209</width>
<height>36</height>
<onleft>5</onleft>
@@ -232,7 +230,7 @@
<posY>155</posY>
<posX>848</posX>...
[truncated message content] |
|
From: <gre...@us...> - 2007-09-11 18:30:14
|
Revision: 914
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=914&view=rev
Author: gregmac45
Date: 2007-09-11 11:30:11 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesTrailerUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/AppleTrailers.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/TrailerIndex.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Main.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/OnlineVideos.csproj
trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SoapBoxUtil.cs
Added Paths:
-----------
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/AbcUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/BlipTvUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/BreakUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/CbsUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/CnnUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/DailyMotionUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/GameTrailersUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/GenericSiteUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/GoogleVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/GrouperUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/GubaUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/LiveVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/MetaCafeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/SiteUtilFactory.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/Stage6Util.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/VideoJugUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/VidiLifeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Sites/YouTubeUtil.cs
Removed Paths:
-------------
trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GenericSiteUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GrouperUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GubaUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/HDHelper.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/MetaCafeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilFactory.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/Stage6Util.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/VideoJugUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/VidiLifeUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/YouTubeUtil.cs
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/AbcUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,125 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class AbcUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "8";
- }
- public override List<OnlineVideos.GUIOnlineVideos.VideoInfo> getSiteFavorites(string fsUser)
- {
- return new List<OnlineVideos.GUIOnlineVideos.VideoInfo>();
- }
-
- //private String msXmlLink;
-
-
-
- protected override String getUrl(String fsId)
- {
- //String [] urlArray = fsId.Split(new char[] { ',' });
- //return urlArray[0] ;
- return fsId;
- }
-
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<GUIOnlineVideos.VideoInfo> list= new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video = new GUIOnlineVideos.VideoInfo();
- video.Title = "test";
- video.VideoUrl = "RTMP://wdig.fcod.llnwd.net/a339/o2/abc/streaming/episodes/SXD_112_SurstrommingOrASlice_Segment_1_1325482_highband.flv";
- list.Add(video);
- return list;
- //return getRssData;
- }
-
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create("http://ll.static.abc.com/streaming/s/catalog?aff=&isIE=true"));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
- XmlNode StreamServerNode = doc.SelectSingleNode("//config/streamServer");
- String lsStreamServer = "RTMP://"+StreamServerNode.InnerText;
- Console.WriteLine("Stream Server ={0} ",lsStreamServer);
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//streaming/catalog/channel", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//streaming/catalog/channel[title='Six Degrees']/episode");
- //Console.WriteLine(nodeList.Count);
-
-
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- //XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- XmlNode node = chileNode.SelectSingleNode("title");
- loRssItem.Title = node.InnerText;
-
- //node = chileNode.SelectSingleNode("link");
- //loRssItem.link = node.InnerText;
-
- node = chileNode.SelectSingleNode("description");
- loRssItem.Description = node.InnerText;
-
- node = chileNode.SelectSingleNode("screenShot", expr);
- if (node != null)
- {
- //ac = node.Attributes;
- loRssItem.ImageUrl = node.InnerText;
- }
-
-
- XmlNodeList SegNodeList = chileNode.SelectNodes("segment/HighStreamURL", expr);
- loRssItem.VideoUrl = "";
- foreach(XmlNode SegNode in SegNodeList )
- {
- //ac = node.Attributes;
- loRssItem.VideoUrl = loRssItem.VideoUrl+lsStreamServer+SegNode.InnerText+",";
- }
- //Console.WriteLine(loRssItem.VideoUrl.ToString());
-
- //Log.Write(loRssItem.ToString());
- //loListItem = new GUIListItem(loRssItem.title);
- //loListItem.Path = loRssItem.videoUrl;
- loRssItems.Add(loRssItem);
-
-
- }
- return loRssItems;
- }
-
-
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BlipTvUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,123 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class BlipTvUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "9";
- }
-
- protected override String getUrl(String fsId)
- {
- String lsUrl = "";
- Log.Info("BlipTv getUrl with "+fsId);
- String lsHtml = getHTMLData(fsId);
- Match loMatch = Regex.Match(lsHtml,"class=\"permalink_input\" value=\"([^\"]*.flv)");
- if(loMatch.Success){
- lsUrl = loMatch.Groups[1].Value;
- //lsUrl = System.Web.HttpUtility.UrlDecode(lsUrl);
- //lsUrl = "http://blip.tv"+lsUrl;
- }else{
- Log.Info("BlipTv video not found. Site may have changed layout.");
- }
- return lsUrl;
- }
-
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.mediaDescription;
- video.ImageUrl = rssItem.mediaThumbnail;
- video.Title = rssItem.title;
- video.VideoUrl = rssItem.link;
- loVideoList.Add(video);
- }
- return loVideoList;
- }
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create(fsUrl));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- XmlNode node = chileNode.SelectSingleNode("title");
- loRssItem.Title = node.InnerText;
-
- //node = chileNode.SelectSingleNode("link");
- //loRssItem.link = node.InnerText;
-
- node = chileNode.SelectSingleNode("description");
- loRssItem.Description = node.InnerText;
-
- node = chileNode.SelectSingleNode("media:thumbnail", expr);
- if (node != null)
- {
- ac = node.Attributes;
- loRssItem.ImageUrl = ac["url"].InnerText;
- }
-
-
- node = chileNode.SelectSingleNode("media:group/media:content[@type=\"video/x-flv\"]", expr);
- if (node != null)
- {
- ac = node.Attributes;
- loRssItem.VideoUrl = ac["url"].InnerText;
- }
-
- //Log.Write(loRssItem.ToString());
- //loListItem = new GUIListItem(loRssItem.title);
- //loListItem.Path = loRssItem.videoUrl;
- loRssItems.Add(loRssItem);
-
-
- }
- return loRssItems;
- }
-
-
-
-
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,123 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class BreakUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "22";
- }
-
- protected override String getUrl(String fsId)
- { String lsUrl = "";
- String lsHtml = getHTMLData(fsId);
- //Log.Write("html to parse to get url = \n{0}",lsHtml);
- Regex loPathRegex = new Regex("sGlobalFileName='([^']*)';[^;]*;.+sGlobalContentFilePath='([^']*)'");
- Regex loUrlRegex = new Regex(@"so.addVariable\('videoPath',\s'([^']*)");
- Match urlField = loUrlRegex.Match(lsHtml);
- if(urlField.Success){
- lsUrl = urlField.Groups[1].Value;
- Match loMatch = loPathRegex.Match(lsHtml);
- if(loMatch.Success){
- String lsFileName = loMatch.Groups[1].Value;
- String lsPathName = loMatch.Groups[2].Value;
- lsUrl = lsUrl+lsPathName+"/"+lsFileName+".flv";
- Log.Info("break flv url = {0}",lsUrl);
- }
- }
- return lsUrl;
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.description;
- video.ImageUrl = rssItem.enclosure;
- video.Title = rssItem.title;
- //foreach(MediaContent content in rssItem.contentList){
- // if(content.type.Contains("flv")){
- video.VideoUrl = rssItem.link;
- // break;
- // }
- loVideoList.Add(video);
- }
- return loVideoList;
- }
- /*
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create(fsUrl));
- //XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- //expr.AddNamespace("", "http://search.yahoo.com/mrss");
- //Console.WriteLine(doc.InnerXml);
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item");
- if(root==null){
- Console.WriteLine(root);
-
- }
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- XmlNode node = chileNode.SelectSingleNode("title");
- loRssItem.Title = node.InnerText;
-
- node = chileNode.SelectSingleNode("link");
- loRssItem.VideoUrl = node.InnerText;
-
- node = chileNode.SelectSingleNode("description");
- loRssItem.Description = node.InnerText;
-
- node = chileNode.SelectSingleNode("enclosure");
- if (node != null)
- {
- ac = node.Attributes;
- loRssItem.ImageUrl = ac["url"].InnerText;
- }
- loRssItems.Add(loRssItem);
-
-
- }
-
- return loRssItems;
- }
- */
-
-
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/CbsUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,128 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class CbsUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "10";
- }
-
-
- protected override String getUrl(String fsId)
- {
- return "http://video.cgi.cbs.com/vplayer3/play.pl?id="+fsId;
-
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- return getRssData(fsUrl);
- }
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create("http://www.cbs.com/innertube/xmlProxy.php?type=videoList&id="+fsUrl));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//videoList/list/video", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//videoList/list/video");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode childNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
- ac = childNode.Attributes;
-
- //XmlNode node = chileNode.SelectSingleNode("title");
- loRssItem.Title = ac["show"].InnerText;
- loRssItem.Description = ac["summary"].InnerText;
- loRssItem.ImageUrl = "http://www.cbs.com"+ac["image"].InnerText;
- loRssItem.VideoUrl = ac["videoID"].InnerText;
-
-
- //Log.Write(loRssItem.ToString());
- //loListItem = new GUIListItem(loRssItem.title);
- //loListItem.Path = loRssItem.videoUrl;
- loRssItems.Add(loRssItem);
-
-
- }
- return loRssItems;
- }
- public List<GUIOnlineVideos.VideoInfo> getCategories(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create(fsUrl));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//browseMenu/primary/secondary", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//browseMenu/primary/secondary");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- //XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- XmlNode node = chileNode.SelectSingleNode("name");
- loRssItem.Title = node.InnerText;
-
- //node = chileNode.SelectSingleNode("link");
- //loRssItem.link = node.InnerText;
-
- node = chileNode.SelectSingleNode("id");
- loRssItem.VideoUrl = node.InnerText;
-
- //node = chileNode.SelectSingleNode("media:group/media:thumbnail", expr);
- //get the description and images for the categories
-
-
- loRssItems.Add(loRssItem);
-
-
- }
- return loRssItems;
- }
-
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/DailyMotionUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,120 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class DailyMotionUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "6";
- }
-
- protected override String getUrl(String fsId)
- {
- String lsUrl = "";
- Log.Info("DMotion getUrl with "+fsId);
- String lsHtml = getHTMLData(fsId);
- Match loMatch = Regex.Match(lsHtml,"addVariable\\(\"url\", \"([^\"]*)");
- if(loMatch.Success){
- lsUrl = loMatch.Groups[1].Value;
- lsUrl = System.Web.HttpUtility.UrlDecode(lsUrl);
- lsUrl = lsUrl+"&txe=.flv";
- }else{
- Log.Info("Dailymotion video not found. Site could have changed layout.");
- }
- return lsUrl;
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.description;
- video.ImageUrl = rssItem.mediaThumbnail;
- video.Title = rssItem.title;
- video.Length = rssItem.contentList[0].duration;
- video.VideoUrl = rssItem.guid;
- loVideoList.Add(video);
- }
- return loVideoList;
- }
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
-
- doc.Load(XmlReader.Create(fsUrl));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
-
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- //RssItem loRssItem;
- //GUIListItem loListItem;
- GUIOnlineVideos.VideoInfo loVideoInfo;
- foreach (XmlNode chileNode in nodeList)
- {
- //loRssItem = new RssItem();
- loVideoInfo = new GUIOnlineVideos.VideoInfo();
- XmlNode node = chileNode.SelectSingleNode("title");
- //loRssItem.title = node.InnerText;
- loVideoInfo.Title = node.InnerText;
-
- //node = chileNode.SelectSingleNode("link");
- //loRssItem.link = node.InnerText;
-
-
- node = chileNode.SelectSingleNode("description");
- //loRssItem.description = node.InnerText;
- loVideoInfo.Description = node.InnerText;
-
- node = chileNode.SelectSingleNode("media:thumbnail", expr);
- if (node != null)
- {
- ac = node.Attributes;
- //loRssItem.imageUrl = ac["url"].InnerText;
- loVideoInfo.ImageUrl = ac["url"].InnerText;
- }
-
-
- node = chileNode.SelectSingleNode("guid", expr);
- if (node != null)
- {
- //loRssItem.videoUrl = ac["url"].InnerText;
- loVideoInfo.VideoUrl = node.InnerText;
-
- }
-
- //Log.Write(loRssItem.ToString());
- //loListItem = new GUIListItem(loRssItem.title);
- //loListItem.Path = loRssItem.videoUrl;
- loRssItems.Add(loVideoInfo);
-
-
- }
- return loRssItems;
- }
- }
-}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -23,10 +23,10 @@
{
[SkinControlAttribute(2)]
protected GUIButtonControl btnViewAs = null;
- [SkinControlAttribute(3)]
- protected GUIButtonControl btnNext = null;
- [SkinControlAttribute(4)]
- protected GUIButtonControl btnPrevious = null;
+ [SkinControlAttribute(3)]
+ protected GUIButtonControl btnNext = null;
+ [SkinControlAttribute(4)]
+ protected GUIButtonControl btnPrevious = null;
[SkinControlAttribute(50)]
protected GUIFacadeControl facadeView = null;
[SkinControlAttribute(1)]
@@ -44,11 +44,11 @@
private VideoInfo moSelectedVideo;
private State _CurrentState = State.home;
- private String msDownloadDir = Directory.GetCurrentDirectory()+"\\";
+ //private String msDownloadDir = Directory.GetCurrentDirectory()+"\\";
private List<VideoInfo> moCurrentVideoList = new List<VideoInfo>();
- private List<VideoInfo> moCurrentTrailerList = new List<VideoInfo>();
+ private List<VideoInfo> moCurrentTrailerList = new List<VideoInfo>();
private String []msFilterArray;
- private String msThumbLocation;
+ //private String msThumbLocation;
private int miSelectedIndex = 0;
private bool mbPlayFullscreen = true;
public enum State
@@ -217,7 +217,7 @@
if (_CurrentState == State.home)
{
DisplaySites();
- SwitchView();
+ SwitchView();
//currentView = View.List;
//ChangeFacadeView();
@@ -240,7 +240,7 @@
protected override void OnShowContextMenu()
{
int liSelected = facadeView.SelectedListItemIndex-1;
- if (liSelected < 0 || msSelectedSiteId=="99" || _CurrentState!=State.videos || _CurrentState!=State.info)
+ if (liSelected < 0 || msSelectedSiteId=="99" || _CurrentState==State.home || _CurrentState==State.categories || (msSelectedSiteId=="15" && _CurrentState == State.videos))
{
return;
}
@@ -250,7 +250,9 @@
dlgSel.Reset();
if (dlgSel != null)
{
- dlgSel.Add("Save"); // Save
+ if(String.IsNullOrEmpty(OnlineVideoSettings.getInstance().msDownloadDir)==false){
+ dlgSel.Add("Save"); // Save
+ }
//Log.Info("msSelectedCategoryValue = "+msSelectedCategoryValue);
if(msSelectedCategoryValue.StartsWith("fav:") ==false){
dlgSel.Add("Add to favorites");
@@ -267,21 +269,35 @@
}
dlgSel.DoModal(GetID);
int liSelectedIdx = dlgSel.SelectedId;
+ VideoInfo loSelectedVideo;
+ if(_CurrentState == State.videos){
+ loSelectedVideo = moCurrentVideoList[liSelected];
+ }
+ else{
+ loSelectedVideo = moCurrentTrailerList[liSelected];
+ }
//Log.Info("Selected id {0}",liSelectedIdx);
switch(liSelectedIdx){
case 1:
- SaveVideo(moCurrentVideoList[facadeView.SelectedListItemIndex -1]);
- break;
+ if(String.IsNullOrEmpty(OnlineVideoSettings.getInstance().msDownloadDir)==false){
+ SaveVideo(loSelectedVideo);
+
+ break;
+ }else{
+ goto case 2;
+ }
case 2:
SiteUtilBase siteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
SiteSettings loSite = moSiteList [msSelectedSiteId];
if(msSelectedCategoryValue.StartsWith("fav:") == false){
//siteUtil.addFavorite(moCurrentVideoList[liSelected].VideoUrl,loSite.username,loSite.password);
Log.Info("Received request to add video to favorites.");
- siteUtil.AddFavorite(moCurrentVideoList[liSelected],msSelectedSiteId);
+ siteUtil.AddFavorite(loSelectedVideo,msSelectedSiteId);
+
+
}else{
- siteUtil.RemoveFavorite(moCurrentVideoList[liSelected]);
+ siteUtil.RemoveFavorite(loSelectedVideo);
DisplayVideos(true);
}
break;
@@ -354,7 +370,7 @@
if(msSelectedSiteId == "15"){
DisplayVideoDetails(moCurrentVideoList[facadeView.SelectedListItemIndex - 1]);
_CurrentState = State.info;
- }else{
+ }else{
//play the video
Play(moCurrentVideoList[facadeView.SelectedListItemIndex -1]);
}
@@ -384,55 +400,55 @@
//do
//{
//shouldContinue = false;
- }
- else if (control == btnNext)
- {
- moCurrentVideoList = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getNextPageVideos();
- DisplayVideos(false);
- UpdateViewState();
- }
- else if (control == btnPrevious)
- {
- moCurrentVideoList = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getPreviousPageVideos();
- DisplayVideos(false);
- UpdateViewState();
- }
+ }
+ else if (control == btnNext)
+ {
+ moCurrentVideoList = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getNextPageVideos();
+ DisplayVideos(false);
+ UpdateViewState();
+ }
+ else if (control == btnPrevious)
+ {
+ moCurrentVideoList = SiteUtilFactory.getSiteUtil(msSelectedSiteId).getPreviousPageVideos();
+ DisplayVideos(false);
+ UpdateViewState();
+ }
base.OnClicked(controlId, control, actionType);
}
private void OnShowPreviousMenu2(){
if (_CurrentState == State.categories)
- {
-
- DisplaySites();
- _CurrentState = State.home;
-
-
- }
- else if (_CurrentState == State.videos)
- {
- Log.Info("Set the stopDownload to true 3");
- ImageDownloader._stopDownload = true;
-
- DisplayCategories();
- _CurrentState = State.categories;
-
-
- }
- else if (_CurrentState == State.info)
- {
- //Log.Info("Set the stopDownload to true 2");
- ImageDownloader._stopDownload = true;
-
- DisplayVideos(false);
- SwitchView();
- btnViewAs.Visible = true;
- _CurrentState = State.videos;
-
-
- }
- DisplayVideoInfo(null);
- UpdateViewState();
+ {
+
+ DisplaySites();
+ _CurrentState = State.home;
+
+
+ }
+ else if (_CurrentState == State.videos)
+ {
+ Log.Info("Set the stopDownload to true 3");
+ ImageDownloader._stopDownload = true;
+
+ DisplayCategories();
+ _CurrentState = State.categories;
+
+
+ }
+ else if (_CurrentState == State.info)
+ {
+ //Log.Info("Set the stopDownload to true 2");
+ ImageDownloader._stopDownload = true;
+
+ DisplayVideos(false);
+ SwitchView();
+ btnViewAs.Visible = true;
+ _CurrentState = State.videos;
+
+
+ }
+ DisplayVideoInfo(null);
+ UpdateViewState();
}
public override bool OnMessage(GUIMessage message)
{
@@ -499,7 +515,7 @@
SwitchView();
}
OnlineVideoSettings settings = OnlineVideoSettings.getInstance();
- msThumbLocation = settings.msThumbLocation;
+ //msThumbLocation = settings.msThumbLocation;
msFilterArray = settings.msFilterArray;
moSiteList= settings.moSiteList;
//create a favorites site
@@ -514,47 +530,47 @@
loSite.RssList.Add("dynamic",cat);
moSiteList.Add("100",loSite);
- if (!String.IsNullOrEmpty(settings.msDownloadDir))
- {
- try{
- if (System.IO.Directory.Exists(settings.msDownloadDir)==false)
- {
-
- System.IO.Directory.CreateDirectory(msDownloadDir);
-
- }
- }
- catch (Exception e)
- {
- Log.Error("Failed to create download dir");
- Log.Error(e);
- }
- //add a downloaded videos site
- loSite = new SiteSettings();
- loSite.id = "99";
- loSite.name = "Downloaded Videos";
- loSite.enabled = true;
- cat = new RssLink();
- cat.name = "All";
- cat.url = settings.msDownloadDir;
- loSite.RssList.Add(cat.name, cat);
- moSiteList.Add("99", loSite);
- }
- try
- {
- Log.Info("checking existance of thumb dir:" + settings.msThumbLocation);
- if (System.IO.Directory.Exists(settings.msThumbLocation)==false)
- {
- Log.Info("Thumb dir does not exist.");
- System.IO.Directory.CreateDirectory(settings.msThumbLocation);
- Log.Info("thumb dir created");
- }
- }
- catch (Exception e)
- {
- Log.Error("Failed to create thumb dir");
- Log.Error(e);
- }
+ if (!String.IsNullOrEmpty(settings.msDownloadDir))
+ {
+ try{
+ if (System.IO.Directory.Exists(settings.msDownloadDir)==false)
+ {
+
+ System.IO.Directory.CreateDirectory(settings.msDownloadDir);
+
+ }
+ }
+ catch (Exception e)
+ {
+ Log.Error("Failed to create download dir");
+ Log.Error(e);
+ }
+ //add a downloaded videos site
+ loSite = new SiteSettings();
+ loSite.id = "99";
+ loSite.name = "Downloaded Videos";
+ loSite.enabled = true;
+ cat = new RssLink();
+ cat.name = "All";
+ cat.url = settings.msDownloadDir;
+ loSite.RssList.Add(cat.name, cat);
+ moSiteList.Add("99", loSite);
+ }
+ try
+ {
+ //Log.Info("checking existance of thumb dir:" + settings.msThumbLocation);
+ if (System.IO.Directory.Exists(settings.msThumbLocation)==false)
+ {
+ Log.Info("Thumb dir does not exist.");
+ System.IO.Directory.CreateDirectory(settings.msThumbLocation);
+ Log.Info("thumb dir created");
+ }
+ }
+ catch (Exception e)
+ {
+ Log.Error("Failed to create thumb dir");
+ Log.Error(e);
+ }
}
@@ -763,8 +779,8 @@
{
liIdx++;
loVideoInfo.Description = cleanString(loVideoInfo.Description);
- moSelectedVideo.Description = loVideoInfo.Description;
- moSelectedVideo.Other = loVideoInfo.Other;
+ moSelectedVideo.Description = loVideoInfo.Description;
+ moSelectedVideo.Other = loVideoInfo.Other;
loListItem = new GUIListItem(loVideoInfo.Title);
loListItem.Label2 = loVideoInfo.Title2;
loListItem.Path = loVideoInfo.VideoUrl;
@@ -809,9 +825,9 @@
}
if(currentView == View.FilmStrip){
GUIFilmstripControl filmstrip = parent as GUIFilmstripControl;
- if (filmstrip == null)
- return;
- filmstrip.InfoImageFileName = item.ThumbnailImage;
+ if (filmstrip == null)
+ return;
+ filmstrip.InfoImageFileName = item.ThumbnailImage;
}
}
@@ -864,7 +880,7 @@
loClient.Headers.Add("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; .NET CLR 1.0.3705;)");
loClient.DownloadFileCompleted += new AsyncCompletedEventHandler(DownloadFileCompleted);
String lsExtension = System.IO.Path.GetExtension(lsUrl);
- String lsFileName = msDownloadDir+foListItem.Title+lsExtension;
+ String lsFileName = OnlineVideoSettings.getInstance().msDownloadDir+foListItem.Title+"_"+foListItem.Title2+lsExtension;
loClient.DownloadFileAsync(new Uri(lsUrl), lsFileName, foListItem.Title);
}
@@ -923,103 +939,107 @@
case State.home:
GUIPropertyManager.SetProperty("#header.label","OnlineVideos");
GUIPropertyManager.SetProperty("#header.image","");
- GUIControl.HideControl(GetID,btnNext.GetID);
- GUIControl.HideControl(GetID,btnPrevious.GetID);
- GUIControl.HideControl(GetID, 23);
- GUIControl.HideControl(GetID, 24);
- GUIControl.HideControl(GetID, 25);
-// GUIControl.HideControl(GetID, 52);
-// GUIControl.HideControl(GetID, 53);
- GUIControl.HideControl(GetID, 54);
- GUIControl.HideControl(GetID, 55);
- GUIControl.HideControl(GetID, 56);
- GUIControl.HideControl(GetID, 57);
- GUIControl.HideControl(GetID, 58);
- GUIControl.HideControl(GetID, 59);
- DisplayVideoInfo(null);
+ GUIControl.HideControl(GetID,btnNext.GetID);
+ GUIControl.HideControl(GetID,btnPrevious.GetID);
+ GUIControl.HideControl(GetID, 23);
+ GUIControl.HideControl(GetID, 24);
+ GUIControl.HideControl(GetID, 25);
+ // GUIControl.HideControl(GetID, 52);
+ // GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
+ GUIControl.HideControl(GetID, 58);
+ GUIControl.HideControl(GetID, 59);
+ DisplayVideoInfo(null);
+ //GUIControl.FocusControl(GetID,facadeView.GetID);
break;
case State.categories:
GUIPropertyManager.SetProperty("#header.label","Categories");
GUIPropertyManager.SetProperty("#header.image","OnlineVidlogo"+msSelectedSiteId+".jpeg");
- GUIControl.HideControl(GetID,btnNext.GetID);
- GUIControl.HideControl(GetID,btnPrevious.GetID);
- GUIControl.HideControl(GetID, 23);
- GUIControl.HideControl(GetID, 24);
- GUIControl.HideControl(GetID, 25);
-// GUIControl.HideControl(GetID, 52);
-// GUIControl.HideControl(GetID, 53);
- GUIControl.HideControl(GetID, 54);
- GUIControl.HideControl(GetID, 55);
- GUIControl.HideControl(GetID, 56);
- GUIControl.HideControl(GetID, 57);
- GUIControl.HideControl(GetID, 58);
- GUIControl.HideControl(GetID, 59);
+ GUIControl.HideControl(GetID,btnNext.GetID);
+ GUIControl.HideControl(GetID,btnPrevious.GetID);
+ GUIControl.HideControl(GetID, 23);
+ GUIControl.HideControl(GetID, 24);
+ GUIControl.HideControl(GetID, 25);
+ // GUIControl.HideControl(GetID, 52);
+ // GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
+ GUIControl.HideControl(GetID, 58);
+ GUIControl.HideControl(GetID, 59);
DisplayVideoInfo(null);
break;
case State.videos:
GUIPropertyManager.SetProperty("#header.label",msSelectedCategoryName);
GUIPropertyManager.SetProperty("#header.image","OnlineVidlogo"+msSelectedSiteId+".jpeg");
- GUIControl.ShowControl(GetID,btnNext.GetID);
- GUIControl.HideControl(GetID, 23);
- GUIControl.HideControl(GetID, 24);
- GUIControl.HideControl(GetID, 25);
-// GUIControl.HideControl(GetID, 52);
-// GUIControl.HideControl(GetID, 53);
- GUIControl.HideControl(GetID, 54);
- GUIControl.HideControl(GetID, 55);
- GUIControl.HideControl(GetID, 56);
- GUIControl.HideControl(GetID, 57);
- GUIControl.HideControl(GetID, 58);
- GUIControl.HideControl(GetID, 59);
-
- SiteUtilBase loSiteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
- if (loSiteUtil.hasNextPage())
- {
- GUIControl.EnableControl(GetID,btnNext.GetID);
- }
- else
- {
- GUIControl.DisableControl(GetID,btnNext.GetID);
- }
- GUIControl.ShowControl(GetID,btnPrevious.GetID);
- if (loSiteUtil.hasPreviousPage())
- {
- GUIControl.EnableControl(GetID, btnPrevious.GetID);
- }
- else
- {
- GUIControl.DisableControl(GetID,btnPrevious.GetID);
- }
- DisplayVideoInfo(null);
+ GUIControl.ShowControl(GetID,btnNext.GetID);
+ GUIControl.HideControl(GetID, 23);
+ GUIControl.HideControl(GetID, 24);
+ GUIControl.HideControl(GetID, 25);
+ // GUIControl.HideControl(GetID, 52);
+ // GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
+ GUIControl.HideControl(GetID, 58);
+ GUIControl.HideControl(GetID, 59);
+
+ SiteUtilBase loSiteUtil = SiteUtilFactory.getSiteUtil(msSelectedSiteId);
+ if (loSiteUtil.hasNextPage())
+ {
+ GUIControl.EnableControl(GetID,btnNext.GetID);
+ }
+ else
+ {
+ GUIControl.DisableControl(GetID,btnNext.GetID);
+ }
+ GUIControl.ShowControl(GetID,btnPrevious.GetID);
+ if (loSiteUtil.hasPreviousPage())
+ {
+ GUIControl.EnableControl(GetID, btnPrevious.GetID);
+ }
+ else
+ {
+ GUIControl.DisableControl(GetID,btnPrevious.GetID);
+ }
+ DisplayVideoInfo(null);
break;
case State.info:
GUIPropertyManager.SetProperty("#header.label",moSelectedVideo.Title);
GUIPropertyManager.SetProperty("#header.image","OnlineVidlogo"+msSelectedSiteId+".jpeg");
- GUIControl.HideControl(GetID,btnNext.GetID);
- GUIControl.HideControl(GetID,btnPrevious.GetID);
+ GUIControl.HideControl(GetID,btnNext.GetID);
+ GUIControl.HideControl(GetID,btnPrevious.GetID);
- GUIControl.ShowControl(GetID, 23);
- GUIPropertyManager.SetProperty("#movieposter", ImageDownloader.downloadPoster(moSelectedVideo.ImageUrl.Replace("_m", "_l"),moSelectedVideo.Title,OnlineVideoSettings.getInstance().msThumbLocation));
- GUIPropertyManager.SetProperty("#movietitle", moSelectedVideo.Title);
- GUIPropertyManager.SetProperty("#trailerdesc", moSelectedVideo.Description);
- ITMSClient.TrailerInfo info= (ITMSClient.TrailerInfo)moSelectedVideo.Other;
- GUIPropertyManager.SetProperty("#genre", info.Genre);
- GUIPropertyManager.SetProperty("#releasedate", info.Release);
-
- //Log.Info("trailer desc:{0}", moSelectedVideo.Description);
- GUIControl.ShowControl(GetID, 24);
- GUIControl.ShowControl(GetID, 25);
-// GUIControl.ShowControl(GetID, 52);
-// GUIControl.ShowControl(GetID, 53);
- GUIControl.ShowControl(GetID, 54);
- GUIControl.ShowControl(GetID, 55);
- GUIControl.ShowControl(GetID, 56);
- GUIControl.ShowControl(GetID, 57);
- GUIControl.ShowControl(GetID, 58);
- GUIControl.ShowControl(GetID, 59);
+ GUIControl.ShowControl(GetID, 23);
+ GUIPropertyManager.SetProperty("#movieposter", ImageDownloader.downloadPoster(moSelectedVideo.ImageUrl.Replace("_m", "_l"),moSelectedVideo.Title,OnlineVideoSettings.getInstance().msThumbLocation));
+ GUIPropertyManager.SetProperty("#movietitle", moSelectedVideo.Title);
+ GUIPropertyManager.SetProperty("#trailerdesc", moSelectedVideo.Description);
+ ITMSClient.TrailerInfo info= (ITMSClient.TrailerInfo)moSelectedVideo.Other;
+ GUIPropertyManager.SetProperty("#genre", info.Genre);
+ GUIPropertyManager.SetProperty("#releasedate", info.Release);
+ //Log.Info("selected "+moSelectedVideo.Description);
+ //Log.Info("info:"+info.Overview);
+
+
+ //Log.Info("trailer desc:{0}", moSelectedVideo.Description);
+ GUIControl.ShowControl(GetID, 24);
+ GUIControl.ShowControl(GetID, 25);
+ // GUIControl.ShowControl(GetID, 52);
+ // GUIControl.ShowControl(GetID, 53);
+ GUIControl.ShowControl(GetID, 54);
+ GUIControl.ShowControl(GetID, 55);
+ GUIControl.ShowControl(GetID, 56);
+ GUIControl.ShowControl(GetID, 57);
+ GUIControl.ShowControl(GetID, 58);
+ GUIControl.ShowControl(GetID, 59);
-
+
DisplayVideoInfo(null);
break;
}
@@ -1087,11 +1107,11 @@
}
protected void SwitchView()
{
- if (facadeView == null)
- {
- //Log.Info("SwitchView - facadeview is null");
- return;
- }
+ if (facadeView == null)
+ {
+ //Log.Info("SwitchView - facadeview is null");
+ return;
+ }
string strLine = String.Empty;
switch (currentView)
@@ -1140,8 +1160,13 @@
}else{
GUIPropertyManager.SetProperty("#tags", foVideo.Tags);
}
- TimeSpan t = TimeSpan.FromSeconds(Convert.ToDouble(foVideo.Length));
- GUIPropertyManager.SetProperty("#length", t.ToString());
+ if(String.IsNullOrEmpty(foVideo.Length)){
+ GUIPropertyManager.SetProperty("#length", "None");
+ }
+ else{
+ TimeSpan t = TimeSpan.FromSeconds(Convert.ToDouble(foVideo.Length));
+ GUIPropertyManager.SetProperty("#length", t.ToString());
+ }
if(String.IsNullOrEmpty(foVideo.Description)){
GUIPropertyManager.SetProperty("#desc", "None");
}else{
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GameTrailersUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,118 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class GameTrailersUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "11";
- }
-
-
- protected override String getUrl(String fsId)
- {
-
- return "http://trailers.gametrailers.com/gt_vault/"+fsId + ".wmv";
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.description;
- video.ImageUrl = rssItem.exInfoImage;
- video.Title = rssItem.title;
- Match loMatch = Regex.Match(rssItem.exInfoImage,"[\\d]-([^\\.]*)");
- video.VideoUrl = loMatch.Groups[1].Value;
- loVideoList.Add(video);
- }
- return loVideoList;
- }
- /*
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
- //XPathDocument doc = new XPathDocument(fsUrl);
-
- doc.Load(XmlReader.Create(fsUrl));
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
- expr.AddNamespace("exInfo","http://www.gametrailers.com/rssexplained.php");
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- XmlNode node = chileNode.SelectSingleNode("title");
- loRssItem.Title = node.InnerText;
-
- //node = chileNode.SelectSingleNode("link");
- //loRssItem.link = node.InnerText;
-
- node = chileNode.SelectSingleNode("description");
- loRssItem.Description = node.InnerText;
-
- node = chileNode.SelectSingleNode("exInfo:image", expr);
- if (node != null)
- {
- //ac = node.Attributes;
- loRssItem.ImageUrl = node.InnerText;
-
- //Regex loRegex = new Regex(;
- Match loMatch = Regex.Match(loRssItem.ImageUrl,"[\\d]-([^\\.]*)");
- loRssItem.VideoUrl = loMatch.Groups[1].Value;
- }
-
-
- //node = chileNode.SelectSingleNode("link", expr);
- //if (node != null)
- //{
- //ac = node.Attributes;
- // loRssItem.VideoUrl = node.InnerText;
- //}
-
- //Log.Write(loRssItem.ToString());
- //loListItem = new GUIListItem(loRssItem.title);
- //loListItem.Path = loRssItem.videoUrl;
- loRssItems.Add(loRssItem);
-
-
- }
- return loRssItems;
- }
-
- */
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/GenericSiteUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GenericSiteUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GenericSiteUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,92 +0,0 @@
-/*
- * Created by SharpDevelop.
- * User: GZamor1
- * Date: 8/22/2007
- * Time: 4:13 PM
- *
- * To change this template use Tools | Options | Coding | Edit Standard Headers.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Collections;
-using System.Xml;
-using System.Text;
-
-using MediaPortal.GUI.Library;
-using MediaPortal.Configuration;
-
-namespace OnlineVideos
-{
- /// <summary>
- /// Description of GenericSiteUtil.
- /// </summary>
- public class GenericSiteUtil:SiteUtilBase
- {
-
-
-
- public override string getSiteId()
- {
- return "50";
- }
-
- protected override String getUrl(String fsId)
- {
- return fsId;
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- if(!String.IsNullOrEmpty(rssItem.description)){
- video.Description = rssItem.description;
- }else{
- video.Description = rssItem.mediaDescription;
- }
- if(!String.IsNullOrEmpty(rssItem.mediaThumbnail)){
- video.ImageUrl = rssItem.mediaThumbnail;
- }
- else if(!String.IsNullOrEmpty(rssItem.exInfoImage)){
- video.ImageUrl = rssItem.exInfoImage;
- }
- //get the video
- if(!String.IsNullOrEmpty(rssItem.enclosure)&& isPossibleVideo(rssItem.enclosure)){
- video.VideoUrl = rssItem.enclosure;
- video.Length = rssItem.enclosureDuration;
- }
- else if(rssItem.contentList.Count>0){
- foreach(MediaContent content in rssItem.contentList){
- if(isPossibleVideo(content.url)){
- video.VideoUrl = content.url;
- video.Length = content.duration;
- break;
- }
-
- }
-
-
- }
- //if(!String.IsNullOrEmpty()){
-
- //}
- //if(!String.IsNullOrEmpty()){
-
- //}
-
-
- video.Title = rssItem.title;
-
- if(String.IsNullOrEmpty(video.VideoUrl)==false){
-
- loVideoList.Add(video);
- }
- }
- return loVideoList;
- }
-
- }
-}
Deleted: trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs 2007-09-11 13:33:16 UTC (rev 913)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GoogleVideoUtil.cs 2007-09-11 18:30:11 UTC (rev 914)
@@ -1,162 +0,0 @@
-using System;
-using MediaPortal.GUI.Library;
-using System.Text.RegularExpressions;
-using System.Net;
-using System.Text;
-using MediaPortal.Player;
-using System.Collections.Generic;
-//using MediaPortal.Utils.Services;
-using MediaPortal.GUI.View ;
-using MediaPortal.Dialogs;
-using System.Xml;
-using System.Xml.XPath;
-using System.ComponentModel;
-using System.Threading;
-
-
-
-namespace OnlineVideos
-{
- public class GoogleVideoUtil:SiteUtilBase
- {
- public override string getSiteId()
- {
- return "2";
- }
-
- protected override String getUrl(String fsId)
- {
-
- return fsId + "&txe=.flv";
- }
- public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
- {
- List<RssItem> loRssItemList = getRssDataItems(fsUrl);
- List<GUIOnlineVideos.VideoInfo> loVideoList = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo video;
- foreach(RssItem rssItem in loRssItemList){
- video = new GUIOnlineVideos.VideoInfo();
- video.Description = rssItem.mediaDescription;
- video.ImageUrl = rssItem.mediaThumbnail;
- video.Title = rssItem.title;
- String flvUrl = String.Empty;
- String aviUrl = String.Empty;
- String mp4Url = String.Empty;
- String youtubeUrl = String.Empty;
- foreach(MediaContent content in rssItem.contentList){
- if(content.type.Contains("msvideo")){
- aviUrl = content.url;
- Log.Info("avi url:{0}",content.url);
- //break;
- }else if(content.type.Contains("flv")){
- flvUrl = content.url;
- Log.Info("flv url:{0}", content.url);
- video.Length = content.duration;
- }
- else if (content.type.Contains("mp4"))
- {
-
- mp4Url = content.url;
- Log.Info("mp4 url:{0}", content.url);
- }
- else
- {
-
- Log.Info("unknown url:{0}", content.url);
- }
- video.VideoUrl = flvUrl;
- }
- if(String.IsNullOrEmpty(video.VideoUrl)==false){
-
- loVideoList.Add(video);
- }
- }
- return loVideoList;
- }
- /*
- public List<GUIOnlineVideos.VideoInfo> getRssData(String fsUrl)
- {
-
- XmlDocument doc = new XmlDocument();
-
-
- doc.Load(XmlReader.Create(fsUrl));
-
- XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
- expr.AddNamespace("media", "http://search.yahoo.com/mrss");
-
-
- //Create the root XmlNode and generate an XmlNodeList from it.
- XmlNode root = doc.SelectSingleNode("//rss/channel/item", expr);
- XmlNodeList nodeList;
- nodeList = root.SelectNodes("//rss/channel/item");
- //RssItem loRssItem = new RssItem();
- //loRssItem.
- //This loops through each node found in the nodeList and adds the
- //Node data to the DataTable.
- XmlAttributeCollection ac;
- List<GUIOnlineVideos.VideoInfo> loRssItems = new List<GUIOnlineVideos.VideoInfo>();
- GUIOnlineVideos.VideoInfo loRssItem;
- //GUIListItem loListItem;
- foreach (XmlNode chileNode in nodeList)
- {
-
-
- loRssItem = new GUIOnlineVideos.VideoInfo();
-
- for (int i = 0; i < chileNode.ChildNodes.Count; i++)
- {
- XmlNode n = chileNode.ChildNodes[i];
-
- switch (n.Name)
- {
-
- case "title":
- loRssItem.Title = n.InnerText;
- break;
- case "media:group":
-
- for (int j = 0; j < n.ChildNodes.Count; j++)
- {
- XmlNode nin = n.ChildNodes[j];
-
- switch (nin.Name)
- {
- case "media:content":
- if(nin.Attributes["type"].Value == "video/x-flv"){
- loRssItem.VideoUrl = nin.Attributes["url"].Value;
- }
- break;
- case "media:description":
- loRssItem.Description = n.InnerText;
- break;
- case "media:thumbnail":
- loRssItem.ImageUrl = nin.Attributes["url"].Value;
- break;
- }
- }
- break;
- default:
- break;
- }
- }
-
- XmlNode node = chileNode.SelectSingleNode("title");
-
-
-
-
- loRssItems.Add(loRssItem);
-
-
- }
- ...
[truncated message content] |
|
From: <rs...@us...> - 2007-09-11 13:33:19
|
Revision: 913
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=913&view=rev
Author: rsparey
Date: 2007-09-11 06:33:16 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
working on drop down menu's fixed playlist view
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/playlist_sub_nofocus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myHomePlugIns.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/dialogue_shutdown_nofocus_dimmed.png
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/BasicHome.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -3,8 +3,8 @@
<id>35</id>
<defaultcontrol>4</defaultcontrol>
<allowoverlay>yes</allowoverlay>
- <autohidetopbar>no</autohidetopbar>
- <controls>
+<disabletopbar>no</disabletopbar>
+ <autohidetopbar>yes</autohidetopbar> <controls>
<control>
<description>BG</description>
<type>image</type>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/dialogue_shutdown_nofocus_dimmed.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/dialogue_shutdown_nofocus_dimmed.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/playlist_sub_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -3,7 +3,8 @@
<id>0</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <autohidetopbar>no</autohidetopbar>
+ <disabletopbar>no</disabletopbar>
+ <autohidetopbar>yes</autohidetopbar>
<controls>
<import>common.window.xml</import>
<import>common.time.xml</import>
@@ -386,10 +387,10 @@
<description>video window</description>
<type>videowindow</type>
<id>99</id>
- <posX>760</posX>
- <posY>210</posY>
- <width>568</width>
- <height>320</height>
+ <posX>900</posX>
+ <posY>290</posY>
+ <width>400</width>
+ <height>225</height>
<onleft>2</onleft>
<onright>2</onright>
<action>18</action>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myHomePlugIns.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myHomePlugIns.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myHomePlugIns.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -3,7 +3,8 @@
<id>34</id>
<defaultcontrol>50</defaultcontrol>
<allowoverlay>no</allowoverlay>
- <disabletopbar>yes</disabletopbar>
+ <disabletopbar>no</disabletopbar>
+ <autohidetopbar>yes</autohidetopbar>
<controls>
<import>common.window.xml</import>
<import>common.time.xml</import>
@@ -146,251 +147,20 @@
<onright>11</onright>
<onleft>10</onleft>
</control>
- <!-- TOPBAR Buttons -->
- <control>
- <description>Shut Down button</description>
- <type>button</type>
- <animation effect="fade" time="1500">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="zoom" start="000,0" end="100,100" center="1326,39" time="150">focus</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="1326,39" time="300">unfocus</animation>
- <id>10</id>
- <posX>1300</posX>
- <posY>10</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>button_shutdown_focus.png</textureFocus>
- <textureNoFocus>button_shutdown_nofocus.png</textureNoFocus>
- <label>-</label>
- <action>99</action>
- <onleft>13</onleft>
- <onright>50</onright>
- <onup>10</onup>
- <ondown>50</ondown>
- </control>
- <control>
- <description>videowallpaper button</description>
- <type>button</type>
- <animation effect="fade" time="1500">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="1226,39" time="150">focus</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="1226,39" time="300">unfocus</animation>
- <id>11</id>
- <posX>1148</posX>
- <posY>10</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>button_tvdesktop_focus.png</textureFocus>
- <textureNoFocus>button_tvdesktop_nofocus.png</textureNoFocus>
- <label>-</label>
- <action>101</action>
- <onleft>50</onleft>
- <onright>12</onright>
- <onup>11</onup>
- <ondown>50</ondown>
- </control>
- <control>
- <description>basichome button button</description>
- <type>button</type>
- <animation effect="fade" time="1500">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="978,39" time="150">focus</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="978,39" time="300">unfocus</animation>
- <id>12</id>
- <posX>1200</posX>
- <posY>10</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>Basic_focus.png</textureFocus>
- <textureNoFocus>Basic_nofocus.png</textureNoFocus>
- <label>-</label>
- <action>115</action>
- <onleft>11</onleft>
- <onright>13</onright>
- <onup>12</onup>
- <ondown>50</ondown>
- </control>
- <control>
- <description>Exit button</description>
- <type>button</type>
- <animation effect="fade" time="1500">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="1276,39" time="150">focus</animation>
- <animation effect="zoom" start="100,100" end="100,100" center="1276,39" time="300">unfocus</animation>
- <id>13</id>
- <posX>1250</posX>
- <posY>10</posY>
- <width>50</width>
- <height>58</height>
- <textureFocus>button_close_focus.png</textureFocus>
- <textureNoFocus>button_close_nofocus.png</textureNoFocus>
- <label>-</label>
- <action>97</action>
- <onleft>12</onleft>
- <onright>10</onright>
- <onup>13</onup>
- <ondown>50</ondown>
- </control>
- <control>
- <visible>player.hasmedia</visible>
- <description>video window</description>
- <type>videowindow</type>
+ <control>
+ <description>video window</description>
+ <type>videowindow</type>
<id>99</id>
<posX>900</posX>
- <posY>230</posY>
+ <posY>290</posY>
<width>400</width>
<height>225</height>
<onleft>2</onleft>
<onright>2</onright>
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
- <animation effect="fade" time="500">visiblechange</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
</control>
-
- <control>
- <description>right end cap</description>
- <description>image</description>
- <type>image</type>
- <id>1</id>
- <posX>1260</posX>
- <posY>460</posY>
- <width>53</width>
- <height>58</height>
- <texture>endcap_right.png</texture>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
- <control>
- <description>left end cap</description>
- <visible>player.hasmedia</visible>
- <description>image</description>
- <type>image</type>
- <id>1</id>
- <posX>895</posX>
- <posY>460</posY>
- <width>53</width>
- <height>58</height>
- <texture>endcap_left.png</texture>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
-
-
- <control>
- <description>rewind button</description>
- <type>button</type>
- <id>23</id>
- <posX>948</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>rew_enabled.png</textureFocus>
- <textureNoFocus>rew_disabled.png</textureNoFocus>
- <action>78</action>
- <label>-</label>
- <onleft>22</onleft>
- <onright>24</onright>
- <onup>23</onup>
- <ondown>2</ondown>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
- <control>
- <visible>player.hasmedia</visible>
- <description>play button</description>
- <type>button</type>
- <id>24</id>
- <posX>1000</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>play_enabled.png</textureFocus>
- <textureNoFocus>play_disabled.png</textureNoFocus>
- <action>79</action>
- <label>-</label>
- <onleft>23</onleft>
- <onright>25</onright>
- <onup>24</onup>
- <ondown>2</ondown>
- </control>
- <control>
- <description>pause button</description>
- <type>button</type>
- <id>25</id>
- <posX>1052</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>pause_enabled.png</textureFocus>
- <textureNoFocus>pause_disabled.png</textureNoFocus>
- <action>12</action>
- <label>-</label>
- <onleft>24</onleft>
- <onright>27</onright>
- <onup>25</onup>
- <ondown>2</ondown>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
- <control>
- <visible>player.hasmedia</visible>
- <description>stop button</description>
- <type>button</type>
- <id>27</id>
- <posX>1104</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>stop_enabled.png</textureFocus>
- <textureNoFocus>stop_disabled.png</textureNoFocus>
- <action>13</action>
- <label>-</label>
- <onleft>25</onleft>
- <onright>28</onright>
- <onup>27</onup>
- <ondown>2</ondown>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
- <control>
- <visible>player.hasmedia</visible>
- <description>fast forward button</description>
- <type>button</type>
- <id>28</id>
- <posX>1156</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>fastforward_enabled.png</textureFocus>
- <textureNoFocus>fastforward_disabled.png</textureNoFocus>
- <action>77</action>
- <label>-</label>
- <onleft>27</onleft>
- <onright>29</onright>
- <onup>28</onup>
- <ondown>2</ondown>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
- <control>
- <visible>player.hasmedia</visible>
- <description>next button</description>
- <type>button</type>
- <id>29</id>
- <posX>1208</posX>
- <posY>460</posY>
- <width>52</width>
- <height>58</height>
- <textureFocus>skipforward_enabled.png</textureFocus>
- <textureNoFocus>skipforward_disabled.png</textureNoFocus>
- <action>14</action>
- <label>-</label>
- <onleft>28</onleft>
- <onright>30</onright>
- <onup>29</onup>
- <ondown>2</ondown>
- <visible>Control.IsVisible(99)</visible>
- <animation effect="fade" time="500">visiblechange</animation>
- </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicsongs.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -218,7 +218,7 @@
<width>209</width>
<height>36</height>
<onleft>7</onleft>
- <onright>9</onright>
+ <onright>10</onright>
<onup>21</onup>
<ondown>50</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -229,7 +229,7 @@
<control>
<description>My Playlists</description>
<type>button</type>
- <id>9</id>
+ <id>10</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
<posY>155</posY>
@@ -240,7 +240,7 @@
<width>209</width>
<height>36</height>
<onleft>8</onleft>
- <onright>9</onright>
+ <onright>2</onright>
<onup>21</onup>
<ondown>50</ondown>
<textureFocus>tab_down.png</textureFocus>
@@ -380,6 +380,54 @@
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
+ <control>
+ <description> playlist</description>
+
+ <type>button</type>
+ <id>11</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>194</posY>
+ <posX>1057</posX>
+ <hyperlink>500</hyperlink>
+ <label>136</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>9</onleft>
+ <onright>2</onright>
+ <onup>20</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <visible>Control.HasFocus(10)|Control.HasFocus(11)|Control.HasFocus(12)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <description> playlist</description>
+
+ <type>button</type>
+ <id>12</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>230</posY>
+ <posX>1057</posX>
+ <hyperlink>510</hyperlink>
+ <label>100510</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>9</onleft>
+ <onright>2</onright>
+ <onup>20</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <visible>Control.HasFocus(10)|Control.HasFocus(12)|Control.HasFocus(11)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-72" end="0,0" time="250">visiblechange</animation>
+ </control>
</controls>
</window>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -368,7 +368,7 @@
<id>9</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posY>158</posY>
+ <posY>194</posY>
<posX>221</posX>
<label>708</label>
@@ -386,7 +386,7 @@
<textureAscending>arrow_round_up_nofocus.png</textureAscending>
<visible>Control.HasFocus(8)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>Search</description>
@@ -397,7 +397,7 @@
<hyperlink>604</hyperlink>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posY>158</posY>
+ <posY>194</posY>
<posX>430</posX>
<font>font14</font>
<width>209</width>
@@ -411,7 +411,7 @@
<visible>Control.HasFocus(2)|Control.HasFocus(10)|Control.HasFocus(12)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>Scheduled recordings</description>
@@ -423,7 +423,7 @@
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posY>194</posY>
+ <posY>230</posY>
<posX>430</posX>
<font>font14</font>
<width>209</width>
@@ -437,7 +437,7 @@
<visible>Control.HasFocus(2)|Control.HasFocus(12)|Control.HasFocus(10)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-72" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>video window</description>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -376,7 +376,7 @@
<textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
<visible>Control.HasFocus(6)|Control.HasFocus(7)|Control.HasFocus(8)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
@@ -408,7 +408,7 @@
<textureRightFocus>arrow_round_right_focus.png</textureRightFocus>
<visible>Control.HasFocus(7)|Control.HasFocus(8)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
@@ -431,7 +431,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(8)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
<texturebg>tab_down.png</texturebg>
<textureLeft>arrow_round_left_nofocus.png</textureLeft>
<textureLeftFocus>arrow_round_left_focus.png</textureLeftFocus>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -395,7 +395,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(8)|Control.HasFocus(584)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>Eject DVD</description>
@@ -418,7 +418,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(6)|Control.HasFocus(7)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>my playlists</description>
@@ -441,7 +441,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(20)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideoTitle.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -398,7 +398,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(8)|Control.HasFocus(584)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>Eject DVD</description>
@@ -421,7 +421,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(6)|Control.HasFocus(7)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<description>my playlists</description>
@@ -444,7 +444,7 @@
<textureNoFocus>tab_up.png</textureNoFocus>
<visible>Control.HasFocus(20)|Control.HasFocus(9)</visible>
<animation effect="fade" time="250">visiblechange</animation>
- <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation>
</control>
<control>
<type>imagelist</type>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml 2007-09-11 06:09:14 UTC (rev 912)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/references.xml 2007-09-11 13:33:16 UTC (rev 913)
@@ -69,44 +69,8 @@
<animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
<animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
</control>
+
<control>
- <description>playlist item button</description>
- <type>playlistbutton</type>
- <id>5</id>
- <posX>189</posX>
- <posY>133</posY>
- <width>566</width>
- <height>50</height>
- <textXOff>18</textXOff>
- <textYOff>6</textYOff>
- <upBtnWidth>33</upBtnWidth>
- <downBtnWidth>33</downBtnWidth>
- <deleteBtnWidth>37</deleteBtnWidth>
- <upBtnHeight>42</upBtnHeight>
- <downBtnHeight>42</downBtnHeight>
- <deleteBtnHeight>42</deleteBtnHeight>
- <upBtnXOffset>654</upBtnXOffset>
- <downBtnXOffset>703</downBtnXOffset>
- <deleteBtnXOffset>753</deleteBtnXOffset>
- <upBtnYOffset>0</upBtnYOffset>
- <downBtnYOffset>0</downBtnYOffset>
- <deleteBtnYOffset>0</deleteBtnYOffset>
- <textureFocus>playlist_sub_focus.png</textureFocus>
- <textureNoFocus>playlist_sub_nofocus.png</textureNoFocus>
- <textureMoveUp>playlist_item_up_nofocus.png</textureMoveUp>
- <textureMoveUpFocused>playlist_item_up_focus.png</textureMoveUpFocused>
- <textureMoveDown>playlist_item_down_nofocus.png</textureMoveDown>
- <textureMoveDownFocused>playlist_item_down_focus.png</textureMoveDownFocused>
- <textureDelete>playlist_item_delete_nofocus.png</textureDelete>
- <textureDeleteFocused>playlist_item_delete_focus.png</textureDeleteFocused>
- <font>font13</font>
- <textcolor>white</textcolor>
- <colordiffuse>white</colordiffuse>
- <disabledcolor>60ffffff</disabledcolor>
- <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
- <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
- </control>
- <control>
<description>default togglebutton</description>
<type>togglebutton</type>
<id>4</id>
@@ -279,21 +243,19 @@
<description>default playlist item listcontrol</description>
<type>playlistcontrol</type>
<id>10</id>
- <posX>0</posX>
- <posY>200</posY>
- <width>1200</width>
- <height>330</height>
+ <posX>30</posX>
+ <posY>200
+ </posY>
+ <width>1190</width>
+ <height>475</height>
<spinWidth>27</spinWidth>
<spinHeight>27</spinHeight>
<spinPosX>1270</spinPosX>
<spinPosY>480</spinPosY>
<spinColor>ffffffff</spinColor>
- <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>
- <textureFocus>list_sub_focus.png</textureFocus>
- <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+
+
+
<textureHeight>35</textureHeight>
<image>folder_focus.png</image>
<font>font9</font>
@@ -328,8 +290,45 @@
<textureMoveUpFocused>arrow_round_up_focus.png</textureMoveUpFocused>
<textureMoveDown>arrow_round_down_nofocus.png</textureMoveDown>
<textureMoveDownFocused>arrow_round_down_focus.png</textureMoveDownFocused>
+ <textureDelete>dialogue_shutdown_nofocus.png</textureDelete>
+ <textureDeleteFocused>dialogue_shutdown_focus.png</textureDeleteFocused>
+ </control>
+ <control>
+ <description>playlist item button</description>
+ <type>playlistbutton</type>
+ <id>5</id>
+ <posX>189</posX>
+ <posY>133</posY>
+ <width>566</width>
+ <height>50</height>
+ <textXOff>18</textXOff>
+ <textYOff>6</textYOff>
+ <upBtnWidth>33</upBtnWidth>
+ <downBtnWidth>33</downBtnWidth>
+ <deleteBtnWidth>37</deleteBtnWidth>
+ <upBtnHeight>42</upBtnHeight>
+ <downBtnHeight>42</downBtnHeight>
+ <deleteBtnHeight>42</deleteBtnHeight>
+ <upBtnXOffset>654</upBtnXOffset>
+ <downBtnXOffset>703</downBtnXOffset>
+ <deleteBtnXOffset>753</deleteBtnXOffset>
+ <upBtnYOffset>0</upBtnYOffset>
+ <downBtnYOffset>0</downBtnYOffset>
+ <deleteBtnYOffset>0</deleteBtnYOffset>
+ <textureFocus>playlist_sub_focus.png</textureFocus>
+ <textureNoFocus>playlist_sub_nofocus.png</textureNoFocus>
+ <textureMoveUp>playlist_item_up_nofocus.png</textureMoveUp>
+ <textureMoveUpFocused>playlist_item_up_focus.png</textureMoveUpFocused>
+ <textureMoveDown>playlist_item_down_nofocus.png</textureMoveDown>
+ <textureMoveDownFocused>playlist_item_down_focus.png</textureMoveDownFocused>
<textureDelete>playlist_item_delete_nofocus.png</textureDelete>
<textureDeleteFocused>playlist_item_delete_focus.png</textureDeleteFocused>
+ <font>font13</font>
+ <textcolor>white</textcolor>
+ <colordiffuse>white</colordiffuse>
+ <disabledcolor>60ffffff</disabledcolor>
+ <animation effect="zoom" start="100,100" end="110,110" time="100">focus</animation>
+ <animation effect="zoom" start="110,110" end="100,100" time="300">unfocus</animation>
</control>
<control>
<description>default thumbnail panel</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-09-11 06:09:17
|
Revision: 912
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=912&view=rev
Author: and-81
Date: 2007-09-10 23:09:14 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
Modified: trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
===================================================================
--- trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-10 19:28:56 UTC (rev 911)
+++ trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs 2007-09-11 06:09:14 UTC (rev 912)
@@ -43,18 +43,18 @@
Request = 0x0001,
Response = 0x0002,
- Notify = 0x0004,
+ //Notify = 0x0004,
Success = 0x0008,
Failure = 0x0010,
Timeout = 0x0020,
Error = 0x0040,
- DataString = 0x0080,
- DataBytes = 0x0100,
+ //DataString = 0x0080,
+ //DataBytes = 0x0100,
- ForceRespond = 0x0200,
- ForceNotRespond = 0x0400,
+ //ForceRespond = 0x0200,
+ //ForceNotRespond = 0x0400,
}
#endregion Enumerations
@@ -178,7 +178,9 @@
public override string ToString()
{
- string data = ByteArrayToByteString(_data);
+ string data = String.Empty;
+ if (_data != null && _data.Length != 0)
+ data = ByteArrayToByteString(_data);
string messageType = Enum.GetName(typeof(PipeMessageType), _type);
@@ -213,9 +215,17 @@
PipeMessageType type = (PipeMessageType)Enum.Parse(typeof(PipeMessageType), stringItems[2]);
PipeMessageFlags flags = (PipeMessageFlags)Enum.Parse(typeof(PipeMessageFlags), stringItems[3]);
- byte[] data = ByteStringToByteArray(stringItems[4]);
- return new PipeMessage(stringItems[0], stringItems[1], type, flags, data);
+ if (String.IsNullOrEmpty(stringItems[4]))
+ {
+ return new PipeMessage(stringItems[0], stringItems[1], type, flags);
+ }
+ else
+ {
+ byte[] data = ByteStringToByteArray(stringItems[4]);
+
+ return new PipeMessage(stringItems[0], stringItems[1], type, flags, data);
+ }
}
catch
{
@@ -223,7 +233,7 @@
}
}
- public static string ByteArrayToByteString(byte[] data)
+ static string ByteArrayToByteString(byte[] data)
{
if (data == null || data.Length == 0)
throw new ArgumentException("Null or Empty byte array supplied", "data");
@@ -236,7 +246,7 @@
return outputString.ToString();
}
- public static byte[] ByteStringToByteArray(string data)
+ static byte[] ByteStringToByteArray(string data)
{
if (String.IsNullOrEmpty(data))
throw new ArgumentException("Null or Empty data string supplied", "data");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-09-10 19:28:58
|
Revision: 911
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=911&view=rev
Author: northern_sky
Date: 2007-09-10 12:28:56 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
fixed some sort stuff for filteritems
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/ProgramViews.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -194,7 +194,7 @@
{
"Name",
"Title",
- "Filename",
+ "Filepath",
"Rating",
"LaunchCount",
"LastTimeLaunched",
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -331,12 +331,18 @@
btnViewAs.Label = GetViewLayoutAsText();
+ //as for now only title are availble for appitems/filteritem
+ if ((DoesListOnlyContainsItemOfType<FilterItem>()) || (DoesListOnlyContainsItemOfType<ApplicationItem>()))
+ {
+ CurrentSortMethod = ProgramSort.SortMethod.Title;
+ }
+
switch (CurrentSortMethod)
{
case ProgramSort.SortMethod.Title:
sortBy = GUILocalizeStrings.Get(268);
break;
- case ProgramSort.SortMethod.Filename:
+ case ProgramSort.SortMethod.Filepath:
sortBy = GUILocalizeStrings.Get(363);
break;
case ProgramSort.SortMethod.Rating:
@@ -760,7 +766,7 @@
if (DoesListOnlyContainsItemOfType<FileItem>())
{
- dlg.AddLocalizedString(363); // filename
+ dlg.AddLocalizedString(363); // filepath
dlg.AddLocalizedString(367); // rating
dlg.Add("Sort by: Times launched");//"LaunchCount"//whats the mapping to these???
dlg.Add("Sort by: Date launched");
@@ -778,7 +784,7 @@
CurrentSortMethod = ProgramSort.SortMethod.Title;
break;
case 363:
- CurrentSortMethod = ProgramSort.SortMethod.Filename;
+ CurrentSortMethod = ProgramSort.SortMethod.Filepath;
break;
case 367:
CurrentSortMethod = ProgramSort.SortMethod.Rating;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -99,8 +99,6 @@
return Load(GUIGraphicsContext.Skin + @"\myProgramsAltFileInfo.xml");
}
- //TO DO
- //Fix this method//move it
void ImportFileItemInfo(FileItem curFile)
{
int minRelevance = 40;
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramSort.cs 2007-09-10 19:28:56 UTC (rev 911)
@@ -44,7 +44,7 @@
public enum SortMethod
{
Title = 0,
- Filename = 1,
+ Filepath = 1,
Rating = 2,
LaunchCount = 3,
LastTimeLaunched = 4,
@@ -64,17 +64,11 @@
public int Compare(GUIListItem item1, GUIListItem item2)
{
if (item1 == item2) return 0;
- if (item1 == null) return -1;
- if (item2 == null) return -1;
- if (item1.MusicTag == null) return -1;
- if (item2.MusicTag == null) return -1;
- if (item1.MusicTag.GetType().Name == "FilterItem") return -1;//quick fix for not allowing filteritems...
- if (item2.MusicTag.GetType().Name == "FilterItem") return -1;//quick fix for not allowing filteritems...
+ if ((item1 == null) || (item2 == null)) return -1;
+ if ((item1.MusicTag == null) || (item2.MusicTag == null)) return -1;
+ if ((item1.Label == "..") || (item2.Label == "..")) return -1; // if the .. item has no musicTag then, it is already catched at the beginning of this method
- if (item1.Label == "..") return -1; // if the .. item has no musicTag then, it is already catched at the beginning of this method
- if (item2.Label == "..") return -1;
-
//applicationitem sort only allows by title for now
if ((item1.MusicTag is ApplicationItem) && (item2.MusicTag is ApplicationItem))
@@ -94,15 +88,26 @@
}
}
+ //filteritem sort only allows by title for now
+ else if ((item1.MusicTag is FilterItem) && (item2.MusicTag is FilterItem))
+ {
+ FilterItem Item1 = item1.MusicTag as FilterItem;
+ FilterItem Item2 = item2.MusicTag as FilterItem;
+ switch (currentSortMethod)
+ {
+ case SortMethod.Title:
+ if (sortAscending)
+ return String.Compare(Item1.Title, Item2.Title, true);
+ else
+ return String.Compare(Item2.Title, Item1.Title, true);
+ default:
+ return -1;
+ }
+ }
- string strSize1 = "";
- string strSize2 = "";
- if (item1.FileInfo != null) strSize1 = MediaPortal.Util.Utils.GetSize(item1.FileInfo.Length);
- if (item2.FileInfo != null) strSize2 = MediaPortal.Util.Utils.GetSize(item2.FileInfo.Length);
-
//fileitem sort
- if ((item1.MusicTag is FileItem) && (item2.MusicTag is FileItem))
+ else if ((item1.MusicTag is FileItem) && (item2.MusicTag is FileItem))
{
FileItem fileItem1 = item1.MusicTag as FileItem;
FileItem fileItem2 = item2.MusicTag as FileItem;
@@ -117,7 +122,7 @@
else
return String.Compare(fileItem2.Title, fileItem1.Title, true);
- case SortMethod.Filename:
+ case SortMethod.Filepath:
if (sortAscending)
return String.Compare(fileItem1.filePath, fileItem2.filePath, true);
else
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-10 16:07:01 UTC (rev 910)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-10 19:28:56 UTC (rev 911)
@@ -37,12 +37,9 @@
-Change graphics for fileinfobackground (it says mymovies...)
--Add sort for filteritems too.
-
-
BUGS:
-- Just add em....
+- goes here..
FEATURES:
Add some more specific emulator support..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-09-10 16:07:08
|
Revision: 910
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=910&view=rev
Author: and-81
Date: 2007-09-10 09:07:01 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
trunk/plugins/IR Server Suite/Applications/IR File Tool/Program.cs
trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Program.cs
trunk/plugins/IR Server Suite/Applications/IR Server/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/SageSetup/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/Applications/Translator/Program.cs
trunk/plugins/IR Server Suite/Applications/Translator/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Translator/Translator.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/GetKeyCodeForm.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray Launcher.csproj
trunk/plugins/IR Server Suite/Applications/Tray Launcher/Tray.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Program.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/MainForm.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj
trunk/plugins/IR Server Suite/IPC/AppModule.InterProcessComm/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IPC/AppModule.NamedPipes/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeAccess.cs
trunk/plugins/IR Server Suite/IPC/Named Pipes/PipeMessage.cs
trunk/plugins/IR Server Suite/IPC/Named Pipes/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/IR Server Plugin Interface.csproj
trunk/plugins/IR Server Suite/IR Server Plugins/IR Server Plugin Interface/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRMan Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/IRTrans Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/Windows Message Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/X10 Transceiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Plugins/XBCDRC Receiver/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/IR Server Suite.sln
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2BlasterPlugin.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/LearnIR.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Forms/MacroEditor.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/Properties/AssemblyInfo.cs
trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3BlasterPlugin.cs
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-09-10 16:07:01 UTC (rev 910)
@@ -47,7 +47,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>
</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.Designer.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -38,7 +38,6 @@
this.buttonShutdownServer = new System.Windows.Forms.Button();
this.listBoxStatus = new System.Windows.Forms.ListBox();
this.buttonCrash = new System.Windows.Forms.Button();
- this.buttonListConnected = new System.Windows.Forms.Button();
this.buttonPing = new System.Windows.Forms.Button();
this.groupBoxGenerateMessage = new System.Windows.Forms.GroupBox();
this.textBoxCustom = new System.Windows.Forms.TextBox();
@@ -69,7 +68,7 @@
this.buttonBlast.Location = new System.Drawing.Point(8, 48);
this.buttonBlast.Name = "buttonBlast";
this.buttonBlast.Size = new System.Drawing.Size(64, 24);
- this.buttonBlast.TabIndex = 2;
+ this.buttonBlast.TabIndex = 1;
this.buttonBlast.Text = "Blast IR";
this.toolTips.SetToolTip(this.buttonBlast, "Blast learned IR code");
this.buttonBlast.UseVisualStyleBackColor = true;
@@ -123,10 +122,10 @@
// buttonShutdownServer
//
this.buttonShutdownServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonShutdownServer.Location = new System.Drawing.Point(296, 16);
+ this.buttonShutdownServer.Location = new System.Drawing.Point(296, 48);
this.buttonShutdownServer.Name = "buttonShutdownServer";
this.buttonShutdownServer.Size = new System.Drawing.Size(64, 24);
- this.buttonShutdownServer.TabIndex = 5;
+ this.buttonShutdownServer.TabIndex = 4;
this.buttonShutdownServer.Text = "Shutdown";
this.toolTips.SetToolTip(this.buttonShutdownServer, "Shutdown server");
this.buttonShutdownServer.UseVisualStyleBackColor = true;
@@ -150,34 +149,22 @@
// buttonCrash
//
this.buttonCrash.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonCrash.Location = new System.Drawing.Point(368, 16);
+ this.buttonCrash.Location = new System.Drawing.Point(368, 48);
this.buttonCrash.Name = "buttonCrash";
this.buttonCrash.Size = new System.Drawing.Size(64, 24);
- this.buttonCrash.TabIndex = 6;
+ this.buttonCrash.TabIndex = 5;
this.buttonCrash.Text = "Crash";
this.toolTips.SetToolTip(this.buttonCrash, "Crash this program");
this.buttonCrash.UseVisualStyleBackColor = true;
this.buttonCrash.Click += new System.EventHandler(this.buttonCrash_Click);
//
- // buttonListConnected
- //
- this.buttonListConnected.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonListConnected.Location = new System.Drawing.Point(368, 48);
- this.buttonListConnected.Name = "buttonListConnected";
- this.buttonListConnected.Size = new System.Drawing.Size(64, 24);
- this.buttonListConnected.TabIndex = 8;
- this.buttonListConnected.Text = "# clients";
- this.toolTips.SetToolTip(this.buttonListConnected, "Get client count from server");
- this.buttonListConnected.UseVisualStyleBackColor = true;
- this.buttonListConnected.Click += new System.EventHandler(this.buttonListConnected_Click);
- //
// buttonPing
//
this.buttonPing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.buttonPing.Location = new System.Drawing.Point(296, 48);
+ this.buttonPing.Location = new System.Drawing.Point(368, 16);
this.buttonPing.Name = "buttonPing";
this.buttonPing.Size = new System.Drawing.Size(64, 24);
- this.buttonPing.TabIndex = 7;
+ this.buttonPing.TabIndex = 3;
this.buttonPing.Text = "Ping";
this.toolTips.SetToolTip(this.buttonPing, "Ping the server");
this.buttonPing.UseVisualStyleBackColor = true;
@@ -334,7 +321,6 @@
this.groupBoxCommands.Controls.Add(this.buttonBlast);
this.groupBoxCommands.Controls.Add(this.buttonLearnIR);
this.groupBoxCommands.Controls.Add(this.buttonShutdownServer);
- this.groupBoxCommands.Controls.Add(this.buttonListConnected);
this.groupBoxCommands.Controls.Add(this.buttonPing);
this.groupBoxCommands.Location = new System.Drawing.Point(8, 80);
this.groupBoxCommands.Name = "groupBoxCommands";
@@ -350,7 +336,7 @@
this.comboBoxPort.Location = new System.Drawing.Point(80, 50);
this.comboBoxPort.Name = "comboBoxPort";
this.comboBoxPort.Size = new System.Drawing.Size(80, 21);
- this.comboBoxPort.TabIndex = 3;
+ this.comboBoxPort.TabIndex = 2;
this.toolTips.SetToolTip(this.comboBoxPort, "Port for blasting IR");
//
// buttonIRBlastAutoTest
@@ -417,7 +403,6 @@
private System.Windows.Forms.Button buttonShutdownServer;
private System.Windows.Forms.ListBox listBoxStatus;
private System.Windows.Forms.Button buttonCrash;
- private System.Windows.Forms.Button buttonListConnected;
private System.Windows.Forms.Button buttonPing;
private System.Windows.Forms.GroupBox groupBoxGenerateMessage;
private System.Windows.Forms.TextBox textBoxCustom;
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/MainForm.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -163,91 +163,57 @@
{
PipeMessage received = PipeMessage.FromString(message);
- this.Invoke(_AddStatusLine, new Object[] { String.Format("Received Message: \"{0}\"", received.Name) });
+ this.Invoke(_AddStatusLine, new Object[] { String.Format("Received Message: \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type)) });
try
{
- switch (received.Name)
+ switch (received.Type)
{
- case "Blast Success":
- case "Blast Failure":
- case "Keyboard Event":
- case "Mouse Event":
+ case PipeMessageType.RegisterClient:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ {
+ _irServerInfo = IRServerInfo.FromBytes(received.DataAsBytes);
+ comboBoxPort.Items.Clear();
+ comboBoxPort.Items.AddRange(_irServerInfo.Ports);
+ comboBoxPort.SelectedIndex = 0;
+ }
+ else if ((received.Flags & PipeMessageFlags.Failure) == PipeMessageFlags.Failure)
+ {
+ if (PipeAccess.ServerRunning)
+ PipeAccess.StopServer();
+ }
return;
- case "Clients":
- {
- string clients = String.Format("There are {0} client(s) attached to the server", BitConverter.ToInt32(received.Data, 0));
- this.Invoke(_AddStatusLine, new Object[] { clients });
+ case PipeMessageType.RemoteEvent:
+ RemoteHandlerCallback(received.DataAsString);
return;
- }
- case "Register Success":
- {
- _irServerInfo = IRServerInfo.FromBytes(received.Data);
+ case PipeMessageType.LearnIR:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ {
+ byte[] dataBytes = received.DataAsBytes;
- comboBoxPort.Items.Clear();
- comboBoxPort.Items.AddRange(_irServerInfo.Ports);
- comboBoxPort.SelectedIndex = 0;
- return;
- }
+ FileStream file = new FileStream(_learnIRFilename, FileMode.Create);
+ file.Write(dataBytes, 0, dataBytes.Length);
+ file.Close();
+ }
- case "Register Failure":
- {
- if (PipeAccess.ServerRunning)
- PipeAccess.StopServer();
- return;
- }
-
- case "Remote Event":
- {
- string keyCode = Encoding.ASCII.GetString(received.Data);
- RemoteHandlerCallback(keyCode);
- return;
- }
-
- case "Learn Success":
- {
- FileStream file = new FileStream(_learnIRFilename, FileMode.Create, FileAccess.Write, FileShare.None);
- file.Write(received.Data, 0, received.Data.Length);
- file.Flush();
- file.Close();
-
_learnIRFilename = null;
- return;
- }
+ break;
- case "Learn Failure":
- {
- _learnIRFilename = null;
- return;
- }
-
-
- case "Server Shutdown":
- {
+ case PipeMessageType.ServerShutdown:
if (PipeAccess.ServerRunning)
PipeAccess.StopServer();
return;
- }
- case "Echo":
- {
- _echoID = BitConverter.ToInt32(received.Data, 0);
- break;
- }
-
- case "Error":
- {
- this.Invoke(_AddStatusLine, new Object[] { Encoding.ASCII.GetString(received.Data) });
+ case PipeMessageType.Echo:
+ _echoID = BitConverter.ToInt32(received.DataAsBytes, 0);
return;
- }
- default:
- {
- this.Invoke(_AddStatusLine, new Object[] { "Unknown message received: " + received.Name });
+ case PipeMessageType.Error:
+ _learnIRFilename = null;
+ this.Invoke(_AddStatusLine, new Object[] { received.DataAsString });
return;
- }
}
}
catch (Exception ex)
@@ -292,8 +258,8 @@
}
while (retry);
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Register", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
return true;
}
@@ -307,8 +273,8 @@
_learnIRFilename = fileName;
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Learn", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.LearnIR, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
AddStatusLine("Learning");
}
@@ -337,8 +303,8 @@
file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request, outData);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
{
@@ -392,8 +358,8 @@
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Unregister", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
{
@@ -460,8 +426,8 @@
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Shutdown", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ServerShutdown, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
{
@@ -472,26 +438,6 @@
{
throw new System.InvalidOperationException("User initiated exception thrown");
}
- private void buttonListConnected_Click(object sender, EventArgs e)
- {
- AddStatusLine("List Clients");
-
- if (!PipeAccess.ServerRunning)
- {
- AddStatusLine(" - Not connected");
- return;
- }
-
- try
- {
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "List", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
- }
- catch (Exception ex)
- {
- AddStatusLine(ex.Message);
- }
- }
private void buttonPing_Click(object sender, EventArgs e)
{
AddStatusLine("Ping Server");
@@ -504,8 +450,8 @@
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Ping", BitConverter.GetBytes(24));
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.Ping, PipeMessageFlags.Request, BitConverter.GetBytes(24));
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
{
@@ -522,8 +468,10 @@
if (PipeMessage.FromString(textBoxCustom.Text) == null)
AddStatusLine("Warning: The specified custom message is not a valid message structure");
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, textBoxCustom.Text);
+ PipeMessage customMessage = PipeMessage.FromString(textBoxCustom.Text);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, customMessage);
+
AddStatusLine("Custom message sent");
}
catch (Exception ex)
@@ -565,8 +513,8 @@
BitConverter.GetBytes(keyCode).CopyTo(data, 0);
BitConverter.GetBytes(0).CopyTo(data, 4);
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Forward Remote Event", data);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, data);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverAddress, message);
}
catch (Exception ex)
{
Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/Debug Client/Properties/AssemblyInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -37,3 +37,4 @@
[assembly: AssemblyFileVersion("1.0.3.4")]
[assembly: CLSCompliant(true)]
+[assembly: GuidAttribute("8eeb5fcb-322c-45ee-80a9-3d30cc08a48c")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-09-10 16:07:01 UTC (rev 910)
@@ -49,7 +49,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>
</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Program.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -249,8 +249,8 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Unregister", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
}
catch { }
@@ -305,8 +305,8 @@
{
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Register", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
return true;
}
catch (AppModule.NamedPipes.NamedPipeIOException)
@@ -388,8 +388,8 @@
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Ping", BitConverter.GetBytes(pingID));
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.Ping, PipeMessageFlags.Request, BitConverter.GetBytes(pingID));
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
catch
{
@@ -441,64 +441,45 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", received.Name);
+ IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
try
{
- switch (received.Name)
+ switch (received.Type)
{
- case "Remote Event":
- case "Keyboard Event":
- case "Mouse Event":
+ case PipeMessageType.BlastIR:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ Info("Blast Success");
+ else if ((received.Flags & PipeMessageFlags.Failure) == PipeMessageFlags.Failure)
+ Warn("Blast Failed!");
break;
- case "Blast Success":
- Info("Blast Success");
- break;
-
- case "Blast Failure":
- Warn("Blast Failed!");
- break;
-
- case "Register Success":
+ case PipeMessageType.RegisterClient:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
{
Info("Registered to IR Server");
_registered = true;
- //_irServerInfo = TransceiverInfo.FromBytes(received.Data);
- break;
+ //_irServerInfo = TransceiverInfo.FromString(received.Data);
}
-
- case "Register Failure":
+ else if ((received.Flags & PipeMessageFlags.Failure) == PipeMessageFlags.Failure)
{
- Warn("IR Server refused to register");
_registered = false;
- break;
+ Warn("IR Server refused to register");
}
+ break;
- case "Server Shutdown":
- {
- Warn("IR Server Shutdown - Blasting disabled until IR Server returns");
- _registered = false;
- break;
- }
+ case PipeMessageType.ServerShutdown:
+ _registered = false;
+ Warn("IR Server Shutdown - Blasting disabled until IR Server returns");
+ break;
- case "Echo":
- {
- _echoID = BitConverter.ToInt32(received.Data, 0);
- break;
- }
+ case PipeMessageType.Echo:
+ _echoID = BitConverter.ToInt32(received.DataAsBytes, 0);
+ break;
- case "Error":
- {
- Warn(Encoding.ASCII.GetString(received.Data));
- break;
- }
-
- default:
- {
- Warn("Unknown message received from server: " + received.Name);
- break;
- }
+ case PipeMessageType.Error:
+ Warn(received.DataAsString);
+ break;
}
}
catch (Exception ex)
@@ -519,8 +500,8 @@
file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request, outData);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
#region Log Commands
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast/Properties/AssemblyInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -36,4 +36,5 @@
[assembly: AssemblyVersion("1.0.3.4")]
[assembly: AssemblyFileVersion("1.0.3.4")]
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: GuidAttribute("5eeca936-da49-4952-ab3b-9f11ec57e4aa")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-09-10 16:07:01 UTC (rev 910)
@@ -49,7 +49,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>
</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Program.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -211,8 +211,8 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Unregister", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
}
catch { }
@@ -267,8 +267,8 @@
{
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Register", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
return true;
}
catch (AppModule.NamedPipes.NamedPipeIOException)
@@ -350,8 +350,8 @@
try
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Ping", BitConverter.GetBytes(pingID));
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.Ping, PipeMessageFlags.Request, BitConverter.GetBytes(pingID));
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
catch
{
@@ -403,64 +403,45 @@
{
PipeMessage received = PipeMessage.FromString(message);
- IrssLog.Debug("Received Message \"{0}\"", received.Name);
+ IrssLog.Debug("Received Message \"{0}\"", Enum.GetName(typeof(PipeMessageType), received.Type));
try
{
- switch (received.Name)
+ switch (received.Type)
{
- case "Remote Event":
- case "Keyboard Event":
- case "Mouse Event":
+ case PipeMessageType.BlastIR:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
+ IrssLog.Info("Blast Success");
+ else if ((received.Flags & PipeMessageFlags.Failure) == PipeMessageFlags.Failure)
+ IrssLog.Warn("Blast Failed!");
break;
- case "Blast Success":
- IrssLog.Info("Blast Success");
- break;
-
- case "Blast Failure":
- IrssLog.Warn("Blast Failed!");
- break;
-
- case "Register Success":
+ case PipeMessageType.RegisterClient:
+ if ((received.Flags & PipeMessageFlags.Success) == PipeMessageFlags.Success)
{
IrssLog.Info("Registered to IR Server");
_registered = true;
- //_irServerInfo = TransceiverInfo.FromBytes(received.Data);
- break;
+ //_irServerInfo = TransceiverInfo.FromString(received.Data);
}
-
- case "Register Failure":
+ else if ((received.Flags & PipeMessageFlags.Failure) == PipeMessageFlags.Failure)
{
- IrssLog.Warn("IR Server refused to register");
_registered = false;
- break;
+ IrssLog.Warn("IR Server refused to register");
}
+ break;
- case "Server Shutdown":
- {
- IrssLog.Warn("IR Server Shutdown - Blasting disabled until IR Server returns");
- _registered = false;
- break;
- }
+ case PipeMessageType.ServerShutdown:
+ _registered = false;
+ IrssLog.Warn("IR Server Shutdown - Blasting disabled until IR Server returns");
+ break;
- case "Echo":
- {
- _echoID = BitConverter.ToInt32(received.Data, 0);
- break;
- }
+ case PipeMessageType.Echo:
+ _echoID = BitConverter.ToInt32(received.DataAsBytes, 0);
+ break;
- case "Error":
- {
- IrssLog.Warn(Encoding.ASCII.GetString(received.Data));
- break;
- }
-
- default:
- {
- IrssLog.Warn("Unknown message received from server: " + received.Name);
- break;
- }
+ case PipeMessageType.Error:
+ IrssLog.Warn(received.DataAsString);
+ break;
}
}
catch (Exception ex)
@@ -481,8 +462,8 @@
file.Read(outData, 4 + port.Length, (int)file.Length);
file.Close();
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Blast", outData);
- PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.BlastIR, PipeMessageFlags.Request, outData);
+ PipeAccess.SendMessage(Common.ServerPipeName, _serverHost, message);
}
}
Modified: trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/Properties/AssemblyInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -36,4 +36,5 @@
[assembly: AssemblyVersion("1.0.3.4")]
[assembly: AssemblyFileVersion("1.0.3.4")]
-[assembly: CLSCompliant(true)]
\ No newline at end of file
+[assembly: CLSCompliant(true)]
+[assembly: GuidAttribute("81eb136b-cc74-4eed-976d-f96ebccd1ce4")]
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -1,4 +1,4 @@
-namespace IR_File_Tool
+namespace IrFileTool
{
partial class FormMain
{
@@ -28,9 +28,17 @@
/// </summary>
private void InitializeComponent()
{
- this.components = new System.ComponentModel.Container();
+ this.SuspendLayout();
+ //
+ // FormMain
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.Text = "Form1";
+ this.ClientSize = new System.Drawing.Size(284, 264);
+ this.Name = "FormMain";
+ this.Text = "IR File Tool";
+ this.ResumeLayout(false);
+
}
#endregion
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -6,7 +6,7 @@
using System.Text;
using System.Windows.Forms;
-namespace IR_File_Tool
+namespace IrFileTool
{
public partial class FormMain : Form
{
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2007-09-10 16:07:01 UTC (rev 910)
@@ -7,8 +7,11 @@
<ProjectGuid>{B5E711A2-E6D0-4BEA-B66B-7A8B0BCA6A4D}</ProjectGuid>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>IR_File_Tool</RootNamespace>
+ <RootNamespace>IRFileTool</RootNamespace>
<AssemblyName>IR File Tool</AssemblyName>
+ <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -37,11 +40,14 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\x86\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <DefineConstants>
+ </DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <UseVSHostingProcess>false</UseVSHostingProcess>
+ <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@@ -61,6 +67,12 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="FormMain.resx">
+ <SubType>Designer</SubType>
+ <DependentUpon>FormMain.cs</DependentUpon>
+ </EmbeddedResource>
+ </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/IR Server Suite/Applications/IR File Tool/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Program.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Program.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -2,10 +2,12 @@
using System.Collections.Generic;
using System.Windows.Forms;
-namespace IR_File_Tool
+namespace IrFileTool
{
+
static class Program
{
+
/// <summary>
/// The main entry point for the application.
/// </summary>
@@ -16,5 +18,7 @@
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new FormMain());
}
+
}
-}
\ No newline at end of file
+
+}
Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -8,9 +8,9 @@
[assembly: AssemblyTitle("IR File Tool")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("and-81")]
[assembly: AssemblyProduct("IR File Tool")]
-[assembly: AssemblyCopyright("Copyright © 2007")]
+[assembly: AssemblyCopyright("Aaron Dinnage")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/Config.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -144,8 +144,9 @@
{
checkBoxRunAtBoot.Checked = SystemRegistry.GetAutoRun("IR Server");
}
- catch
+ catch (Exception ex)
{
+ IrssLog.Error(ex.ToString());
}
ArrayList networkPCs = IrssUtils.Win32.GetNetworkComputers();
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-09-10 16:07:01 UTC (rev 910)
@@ -71,7 +71,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DebugType>
</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
+ <PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs
===================================================================
--- trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-10 14:16:47 UTC (rev 909)
+++ trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs 2007-09-10 16:07:01 UTC (rev 910)
@@ -116,21 +116,33 @@
if (String.IsNullOrEmpty(_pluginNameReceive) && String.IsNullOrEmpty(_pluginNameTransmit))
{
- IrssLog.Warn("No transmit/receive plugin loaded");
+ IrssLog.Warn("No transmit or receive plugin loaded");
}
else
{
- if (!String.IsNullOrEmpty(_pluginNameReceive))
- _pluginReceive = Program.GetPlugin(_pluginNameReceive);
- else
+ if (String.IsNullOrEmpty(_pluginNameReceive))
+ {
IrssLog.Warn("No receiver plugin loaded");
+ }
+ else
+ {
+ _pluginReceive = Program.GetPlugin(_pluginNameReceive);
+ }
if (_pluginNameTransmit.Equals(_pluginNameReceive, StringComparison.InvariantCultureIgnoreCase))
+ {
_pluginTransmit = _pluginReceive;
- else if (!String.IsNullOrEmpty(_pluginNameTransmit))
- _pluginTransmit = Program.GetPlugin(_pluginNameTransmit);
- else
+ IrssLog.Info("Using the same plugin for transmit and receive");
+ }
+ else if (String.IsNullOrEmpty(_pluginNameTransmit))
+ {
IrssLog.Warn("No transmit plugin loaded");
+ }
+ else
+ {
+ _pluginTransmit = Program.GetPlugin(_pluginNameTransmit);
+ }
+
}
StartMessageQueue();
@@ -185,6 +197,7 @@
IrssLog.Error(ex.ToString());
}
}
+
if (!_pluginNameTransmit.Equals(_pluginNameReceive, StringComparison.InvariantCultureIgnoreCase))
{
if (_pluginTransmit != null)
@@ -244,7 +257,7 @@
if (_mode == IRServerMode.ServerMode)
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Server Shutdown", null);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown, PipeMessageFlags.Request);
SendToAll(message);
}
@@ -418,8 +431,8 @@
}
while (retry);
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Register", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
catch (Exception ex)
{
@@ -437,8 +450,8 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Unregister", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterClient, PipeMessageFlags.Request);
+ PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
}
catch { }
@@ -485,8 +498,8 @@
}
while (retry);
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Register Repeater", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.RegisterRepeater);
+ PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
catch (Exception ex)
{
@@ -504,8 +517,8 @@
{
_registered = false;
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Unregister Repeater", null);
- PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message.ToString());
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.UnregisterRepeater);
+ PipeAccess.SendMessage(Common.ServerPipeName, _hostComputer, message);
}
}
catch { }
@@ -528,14 +541,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Remote Event", bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.None, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Forward Remote Event", bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardRemoteEvent, PipeMessageFlags.None, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -560,14 +573,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Keyboard Event", bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.None, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Forward Keyboard Event", bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardKeyboardEvent, PipeMessageFlags.None, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -593,14 +606,14 @@
{
case IRServerMode.ServerMode:
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Mouse Event", bytes);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.None, bytes);
SendToAll(message);
break;
}
case IRServerMode.RelayMode:
{
- PipeMessage message = new PipeMessage(_localPipeName, Environment.MachineName, "Forward Mouse Event", bytes);
+ PipeMessage message = new PipeMessage(Environment.MachineName, _localPipeName, PipeMessageType.ForwardMouseEvent, PipeMessageFlags.None, bytes);
SendTo(Common.ServerPipeName, _hostComputer, message);
break;
}
@@ -623,10 +636,11 @@
if (_pluginReceive != null)
_pluginReceive.Resume();
+
if (_pluginTransmit != null && _pluginTransmit != _pluginReceive)
_pluginTransmit.Resume();
- // TODO: Inform clients
+ // TODO: Inform clients ?
break;
}
@@ -636,17 +650,16 @@
if (_pluginReceive != null)
_pluginReceive.Suspend();
+
if (_pluginTransmit != null && _pluginTransmit != _pluginReceive)
_pluginTransmit.Suspend();
- // TODO: Inform clients
- /*
+ // Inform clients ...
if (_mode == IRServerMode.ServerMode)
{
- PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Server Shutdown", null);
+ PipeMessage message = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.ServerShutdown);
SendToAll(message);
}
- */
break;
}
}
@@ -654,7 +667,7 @@
void SendToAll(PipeMessage message)
{
- IrssLog.Debug("SendToAll({0})", message.ToString());
+ IrssLog.Debug("SendToAll({0})", message);
List<Client> unregister = new List<Client>();
@@ -664,7 +677,7 @@
{
try
{
- PipeAccess.SendMessage(client.Pipe, client.Server, message.ToString());
+ PipeAccess.SendMessage(client.Pipe, client.Server, message);
}
catch (Exception ex)
{
@@ -686,7 +699,7 @@
}
void SendToAllExcept(string exceptPipe, string exceptServer, PipeMessage message)
{
- IrssLog.Debug("SendToAllExcept({0}, {1}, {2})", exceptPipe, exceptServer, message.ToString());
+ IrssLog.Debug("SendToAllExcept({0}, {1}, {2})", exceptPipe, exceptServer, message);
List<Client> unregister = new List<Client>();
@@ -699,7 +712,7 @@
if (client.Pipe == exceptPipe && client.Server == exceptServer)
continue;
- PipeAccess.SendMessage(client.Pipe, client.Server, message.ToString());
+ PipeAccess.SendMessage(client.Pipe, client.Server, message);
}
catch (Exception ex)
{
@@ -721,11 +734,11 @@
}
void SendTo(string pipe, string server, PipeMessage message)
{
- IrssLog.Debug("SendTo({0}, {1}, {2})", pipe, server, message.ToString());
+ IrssLog.Debug("SendTo({0}, {1}, {2})", pipe, server, message);
try
{
- PipeAccess.SendMessage(pipe, server, message.ToString());
+ PipeAccess.SendMessage(pipe, server, message);
}
catch (Exception ex)
{
@@ -737,7 +750,7 @@
}
void SendToRepeaters(PipeMessage message)
{
- IrssLog.Debug("SendToRepeaters({0})", message.ToString());
+ IrssLog.Debug("SendToRepeaters({0})", message);
List<Client> unregister = new List<Client>();
@@ -747,7 +760,7 @@
{
try
{
- PipeAccess.SendMessage(client.Pipe, client.Server, message.ToString());
+ PipeAccess.SendMessage(client.Pipe, client.Server, message);
}
catch (Exception ex)
{
@@ -968,203 +981,189 @@
try
{
- switch (received.Name)
+ switch (received.Type)
{
- case "Remote Event":
- case "Keyboard Event":
- case "Mouse Event":
- break;
-
- case "Register Success":
+ case PipeMessageType.ForwardRemoteEvent:
+ {
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.RemoteEvent, PipeMessageFlags.None, received.DataAsBytes);
+ if (_mode == IRServerMode.RelayMode)
{
- IrssLog.Info("Registered with host server");
- _registered = true;
- break;
+ forward.Type = received.Type;
+ SendTo(Common.ServerPipeName, _hostComputer, forward);
}
-
- case "Register Failure":
+ else
{
- IrssLog.Warn("Host server refused registration");
- _registered = false;
- break;
+ SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
+ break;
+ }
- case "Forward Remote Event":
+ case PipeMessageType.ForwardKeyboardEvent:
+ {
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.KeyboardEvent, PipeMessageFlags.None, received.DataAsBytes);
+ if (_mode == IRServerMode.RelayMode)
{
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Remote Event", received.Data);
- if (_mode == IRServerMode.RelayMode)
- {
- forward.Name = received.Name;
- SendTo(Common.ServerPipeName, _hostComputer, forward);
- }
- else
- {
- SendToAllExcept(received.FromPipe, received.FromServer, forward);
- }
- break;
+ forward.Type = received.Type;
+ SendTo(Common.ServerPipeName, _hostComputer, forward);
}
-
- case "Forward Keyboard Event":
+ else
{
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Keyboard Event", received.Data);
- if (_mode == IRServerMode.RelayMode)
- {
- forward.Name = received.Name;
- SendTo(Common.ServerPipeName, _hostComputer, forward);
- }
- else
- {
- SendToAllExcept(received.FromPipe, received.FromServer, forward);
- }
- break;
+ SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
+ break;
+ }
- case "Forward Mouse Event":
+ case PipeMessageType.ForwardMouseEvent:
+ {
+ PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.MouseEvent, PipeMessageFlags.None, received.DataAsBytes);
+ if (_mode == IRServerMode.RelayMode)
{
- PipeMessage forward = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Mouse Event", received.Data);
- if (_mode == IRServerMode.RelayMode)
- {
- forward.Name = received.Name;
- SendTo(Common.ServerPipeName, _hostComputer, forward);
- }
- else
- {
- SendToAllExcept(received.FromPipe, received.FromServer, forward);
- }
- break;
+ forward.Type = received.Type;
+ SendTo(Common.ServerPipeName, _hostComputer, forward);
}
-
- case "List":
+ else
{
- if (_mode != IRServerMode.RelayMode)
- {
- PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, "Clients", BitConverter.GetBytes(_registeredClients.Count));
- SendTo(received.FromPipe, received.FromServer, response);
- }
- break;
+ SendToAllExcept(received.FromPipe, received.FromServer, forward);
}
+ break;
+ }
- case "Blast":
- {
- if (_mode == IRServerMode.RelayMode)
- {
- PipeMessage reply = new PipeMessage(Common.ServerPipeName, Environment.MachineName, received.Name + " Failure", null);
- SendTo(received.FromPipe, received.FromServer, reply);
- break;
- }
+ case PipeMessageType.BlastIR:
+ {
+ PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.BlastIR, PipeMessageFlags.Response);
+ if (_mode == IRServerMode.RelayMode)
+ {
+ response.Flags |= PipeMessageFlags.Failure;
+ }
+ else
+ {
if (_registeredRepeaters.Count > 0)
SendToRepeaters(received);
- PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, received.Name + " Failure", null);
+ if (BlastIR(received.DataAsBytes))
+ response.Flags |= PipeMessageFlags.Success;
+ else
+ response.Flags |= PipeMessageFlags.Failure;
+ }
- if (BlastIR(received.Data))
- response.Name = received.Name + " Success";
+ SendTo(received.FromPipe, received.FromServer, response);
+ break;
+ }
- SendTo(received.FromPipe, received.FromServer, response);
- break;
- }
+ case PipeMessageType.LearnIR:
+ {
+ PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, PipeMessageType.LearnIR, PipeMessageFlags.Response);
- case "Learn":
+ if (_mode == IRServerMode.RelayMode)
{
- if (_mode == IRServerMode.RelayMode)
- {
- PipeMessage reply = new PipeMessage(Common.ServerPipeName, Environment.MachineName, received.Name + " Failure", null);
- SendTo(received.FromPipe, received.FromServer, reply);
- break;
- }
-
- // Prepare response ...
- PipeMessage response = new PipeMessage(Common.ServerPipeName, Environment.MachineName, received.Name + " Failure", null);
-
+ response.Flags |= PipeMessageFlags.Failure;
+ }
+ else
+ {
byte[] bytes = LearnIR();
- if (bytes != null)
- {
- response.Name = received.Name + " Success";
- response.Data = bytes;
- }
-
- SendTo(received.FromPipe, received.FromServer, response);
- ...
[truncated message content] |
|
From: <rs...@us...> - 2007-09-10 14:16:50
|
Revision: 909
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=909&view=rev
Author: rsparey
Date: 2007-09-10 07:16:47 -0700 (Mon, 10 Sep 2007)
Log Message:
-----------
Working on play list screen (not yet finished)
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
Added Paths:
-----------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Black Aurora.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Blue Aurora.png
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Black Aurora.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Black Aurora.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Blue Aurora.png
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Development Skin/Foofaraw/Foofaraw Backgrounds/Blue Aurora.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -98,5 +98,18 @@
<animation effect="fade" time="250">WindowOpen</animation>
<id>5</id>
</control>
+ <control>
+ <description>video preview window</description>
+ <type>videowindow</type>
+ <id>1</id>
+ <posX>20</posX>
+ <posY>600</posY>
+ <width>180</width>
+ <height>101</height>
+ <action>18</action>
+ <textureFocus>tv_green_border.png</textureFocus>
+ <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicgenres.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -105,7 +105,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>200</posX>
+ <posX>250</posX>
<posY>600</posY>
<width>1000</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mymusicplaylist.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -56,109 +56,238 @@
<animation effect="fade" time="500" start="50">WindowClose</animation>
</control>
- <control>
- <type>group</type>
- <description>group element</description>
- <animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
- <animation effect="slide" time="250" start="0,-300">WindowOpen</animation>
- <animation effect="slide" time="500" end="800,0">WindowClose</animation>
- <layout>StackLayout(2)</layout>
- <posX>113</posX>
- <posY>129</posY>
- <control>
- <description>View-As button</description>
- <type>button</type>
- <id>2</id>
- <label>100</label>
- <onleft>2</onleft>
- <onright>50</onright>
- <onup>17</onup>
- <ondown>20</ondown>
- </control>
- <control>
- <description>Shuffle button</description>
- <type>button</type>
- <id>20</id>
- <label>191</label>
- <onleft>20</onleft>
- <onright>50</onright>
- <onup>2</onup>
- <ondown>21</ondown>
- <onup>2</onup>
- </control>
- <control>
- <description>Save button</description>
- <type>button</type>
- <id>21</id>
- <label>190</label>
- <onleft>21</onleft>
- <onright>50</onright>
- <onup>20</onup>
- <ondown>22</ondown>
- </control>
- <control>
- <description>Clear button</description>
- <type>button</type>
- <id>22</id>
- <label>192</label>
- <onleft>22</onleft>
- <onright>50</onright>
- <onup>21</onup>
- <ondown>28</ondown>
- </control>
- <!-- <control>
- <description>Play button</description>
+
+
+
+ <control>
+ <type>image</type>
+ <decription>mid_strip</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>186</posY>
+ <width>1342</width>
+ <height>365</height>
+ <texture>mid_strip.png</texture>
+
+ </control>
+ <control>
+ <type>image</type>
+ <decription>bottom_strip</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>547</posY>
+ <width>1342</width>
+ <height>18</height>
+ <texture>bottom_strip.png</texture>
+
+ </control>
+ <control>
+ <type>image</type>
+ <decription>top-strip</decription>
+ <id>1</id>
+ <posX>12</posX>
+ <posY>155</posY>
+ <width>1342</width>
+ <height>36</height>
+ <texture>top-strip.png</texture>
+
+ </control>
+<control>
+ <description>Selected item Label</description>
+ <type>fadelabel</type>
+ <id>1</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posX>250</posX>
+ <posY>600</posY>
+ <width>1000</width>
+ <label>#selecteditem</label>
+ <font>wipeout</font>
+ <align>Left</align>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <description>View-As button</description>
<type>button</type>
- <id>23</id>
- <label>208</label>
- <onleft>23</onleft>
- <onright>50</onright>
- <onup>22</onup>
+ <id>2</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>155</posY>
+ <posX>12</posX>
+ <label>100</label>
+ <font>font14</font>
+ <onleft>26</onleft>
+ <onright>20</onright>
+ <onup>21</onup>
+ <ondown>50</ondown>
+ <width>209</width>
+ <height>36</height>
+ <textureFocus>tab_left_corner_down.png</textureFocus>
+ <textureNoFocus>tab_left_corner_up.png</textureNoFocus>
+ </control>
+
+
+ <control>
+ <description>Shuffle button</description>
+ <type>button</type>
+ <id>20</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>155</posY>
+ <posX>221</posX>
+ <label>191</label>
+ <font>font14</font>
+ <onleft>2</onleft>
+ <onright>21</onright>
+ <onup>21</onup>
+ <ondown>50</ondown>
+ <width>209</width>
+ <height>36</height>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ </control>
+ <control>
+ <description>Save button</description>
+ <type>button</type>
+ <id>21</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>155</posY>
+ <posX>430</posX>
+ <label>190</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>20</onleft>
+ <onright>27</onright>
+ <onup>21</onup>
+ <ondown>22</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textcolor>white</textcolor>
+ </control>
+
+ <control>
+ <description>Scobble on/off</description>
+
+ <type>togglebutton</type>
+ <id>27</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>639</posX>
+ <label>33000</label>
+
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>21</onleft>
+ <onright>26</onright>
+ <onup>8</onup>
<ondown>28</ondown>
- </control> -->
- <control>
- <description>scrobble mode button</description>
- <type>button</type>
- <id>28</id>
- <label>33001</label>
- <onleft>28</onleft>
- <onright>50</onright>
- <onup>22</onup>
- <ondown>29</ondown>
- </control>
- <control>
- <description>scrobble user button</description>
- <type>button</type>
- <id>29</id>
- <label>Scrobbler: </label>
- <onleft>29</onleft>
- <onright>50</onright>
- <onup>28</onup>
- <ondown>27</ondown>
- </control>
- <control>
- <description>last.fm button</description>
- <type>togglebutton</type>
- <id>27</id>
- <label>33000</label>
- <onleft>24</onleft>
- <onright>50</onright>
- <onup>29</onup>
- <ondown>26</ondown>
- </control>
- <control>
- <description>Now Playing button</description>
- <type>button</type>
- <id>26</id>
- <label>4540</label>
- <onup>27</onup>
- <ondown>99</ondown>
- <onleft>26</onleft>
- <onright>50</onright>
- <hyperlink>510</hyperlink>
- </control>
- </control>
+ <textureFocus>tab_toggleon_focus.png</textureFocus>
+ <textureNoFocus>tab_toggleon_nofocus.png</textureNoFocus>
+ <AltTextureFocus>tab_toggleoff_focus.png</AltTextureFocus>
+ <AltTextureNoFocus>tab_toggleoff_nofocus.png</AltTextureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+
+ </control>
+ <control>
+ <description>Now playing button</description>
+ <type>button</type>
+ <id>26</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>848</posX>
+ <label>4540</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>27</onleft>
+ <onright>2</onright>
+ <onup>21</onup>
+ <ondown>22</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textcolor>white</textcolor>
+ <hyperlink>510</hyperlink>
+ </control>
+
<import>common.facade.playlist.xml</import>
+
+
+ <control>
+ <description>Save button</description>
+ <type>button</type>
+ <id>22</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>430</posX>
+ <label>192</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>20</onleft>
+ <onright>28</onright>
+ <onup>21</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textcolor>white</textcolor>
+ <visible>Control.HasFocus(21)|Control.HasFocus(22)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <description>Scrobble mode</description>
+ <type>button</type>
+ <id>28</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>639</posX>
+ <label>33001</label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>21</onleft>
+ <onright>26</onright>
+ <onup>27</onup>
+ <ondown>29</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textcolor>white</textcolor>
+ <visible>Control.HasFocus(27)|Control.HasFocus(28)|Control.HasFocus(29)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
+
+ <control>
+ <description>Scrobble user</description>
+ <type>button</type>
+ <id>29</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>194</posY>
+ <posX>639</posX>
+ <label>Scrobbler: </label>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>21</onleft>
+ <onright>26</onright>
+ <onup>28</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+ <textcolor>white</textcolor>
+ <visible>Control.HasFocus(27)|Control.HasFocus(29)|Control.HasFocus(28)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mypics.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -100,7 +100,7 @@
<id>1</id>
<animation effect="fade" time="400">WindowClose</animation>
<animation effect="fade" time="400">WindowOpen</animation>
- <posX>200</posX>
+ <posX>250</posX>
<posY>600</posY>
<width>1000</width>
<label>#selecteditem</label>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -452,7 +452,7 @@
<action>18</action>
<textureFocus>tv_green_border.png</textureFocus>
<animation effect="fade" time="250">WindowOpen</animation>
- <animation effect="fade" time="500">WindowClose</animation>
+ <animation effect="fade" time="100">WindowClose</animation>
</control>
</controls>
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-09-09 09:59:29 UTC (rev 908)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myvideo.xml 2007-09-10 14:16:47 UTC (rev 909)
@@ -107,10 +107,9 @@
<width>1000</width>
<label>#selecteditem</label>
<font>wipeout</font>
- <align>center</align>
+ <align>Left</align>
<textcolor>ffffffff</textcolor>
</control>
-
<control>
@@ -159,7 +158,7 @@
<textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused>
<offsetSortButtonX>180</offsetSortButtonX>
<offsetSortButtonY>8</offsetSortButtonY>
- <textcolor>black</textcolor>
+ <textcolor>white</textcolor>
</control>
<control>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-09-09 09:59:33
|
Revision: 908
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=908&view=rev
Author: northern_sky
Date: 2007-09-09 02:59:29 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
added basic support for allgame lookup from gui
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
trunk/plugins/myGUIProgramsAlt/README.txt
Added Paths:
-----------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd
Added: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd (rev 0)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ClassDiagram1.cd 2007-09-09 09:59:29 UTC (rev 908)
@@ -0,0 +1,314 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+ <Font Name="Segoe UI" Size="9" />
+ <Class Name="GUIProgramsAlt.Database.DatabaseHandler" Collapsed="true">
+ <Position X="18" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Database\DatabaseHandler.cs</FileName>
+ <HashCode>AKIYAABCAAEaMAEwAAAAAAAAAFlAAAEACEACAABEoAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsFilesImportProgress" Collapsed="true">
+ <Position X="3" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppFilesImportProgress.cs</FileName>
+ <HashCode>gQAAAAAQAKAQCAAAAACAAQACgAAAAAAAQABAAIAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsFilesView" Collapsed="true">
+ <Position X="16.25" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppFilesView.cs</FileName>
+ <HashCode>oAANBAJFSCBB8ECgSJCCQIRigVMQACQBQmSUgUQRCNE=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsBase" Collapsed="true">
+ <Position X="5.25" Y="2" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppSettingsBase.cs</FileName>
+ <HashCode>AhoIgAAAADQAAJAgCUCFQCgSQiHAAUIgAICACAAQABg=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsDirCache" Collapsed="true">
+ <Position X="5.25" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppSettingsDirCache.cs</FileName>
+ <HashCode>AAAAQAAAACAAEIAgACCAAAICQAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsGamebase" Collapsed="true">
+ <Position X="7.5" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppSettingsGamebase.cs</FileName>
+ <HashCode>AAAAAAAAACAAAIAoACCAAEACAAAAAAAAAQAAAAAIAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsGrouper" Collapsed="true">
+ <Position X="9.75" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppSettingsGrouper.cs</FileName>
+ <HashCode>AAAAAAAAACABAIAgAACAAAACAAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.AppSettingsMame" Collapsed="true">
+ <Position X="0.75" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\AppSettingsMame.cs</FileName>
+ <HashCode>AAAAgAAAACAAAIAgQCCABEACAAAAAAgAASABAAAIBAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.FileDetailsForm" Collapsed="true">
+ <Position X="19.75" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\FileDetailsForm.cs</FileName>
+ <HashCode>AABAAcAxCaFiEIcCKKGBwAACIgERBiAABQCABAABAAQ=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.FileInfoScraperForm" Collapsed="true">
+ <Position X="21.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\FileInfoScraperForm.cs</FileName>
+ <HashCode>qQYYAAAAGSSQcJRDDMOAACcSD8AC1SgCkEChMIC7xEk=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.FileSettingsBox" Collapsed="true">
+ <Position X="18" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\FileSettingsBox.cs</FileName>
+ <HashCode>AEAAAAAAECIAAAAAAACAAAASAAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.ProgramViews" Collapsed="true">
+ <Position X="14.5" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\ProgramViews.cs</FileName>
+ <HashCode>AIAAAQAAADBABhQgAECEAAACAAAgEBAIAAACgQIAAWQ=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.SettingsBase" Collapsed="true">
+ <Position X="6.25" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\SettingsBase.cs</FileName>
+ <HashCode>AAAAAAAAACAAAIAgACCAAAACAAAQAAEAAgAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.SettingsRoot" Collapsed="true">
+ <Position X="12" Y="2" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\SettingsRoot.cs</FileName>
+ <HashCode>AAAAACAAACAAAIAhIACDAAACAACAQAQAAAAAAACgCAg=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Design.SetupForm" Collapsed="true">
+ <Position X="18" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Design\SetupForm.cs</FileName>
+ <HashCode>xqnowBGYG3JKfJwlBOCIEETiVZM6QmVoVEie0NAzAXM=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.GUIProgramsAlt" Collapsed="true" BaseTypeListCollapsed="true">
+ <Position X="21.5" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>GUIProgramsAlt.cs</FileName>
+ <HashCode>IPJEILBSQgAlAIR4ggEgCBMAAQBFb0FBKFGCZhAAZSg=</HashCode>
+ </TypeIdentifier>
+ <Lollipop Position="0.2" Collapsed="true" />
+ </Class>
+ <Class Name="GUIProgramsAlt.GUIProgramsAltFileInfo" Collapsed="true" BaseTypeListCollapsed="true">
+ <Position X="14.5" Y="2.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>GUIProgramsAltFileInfo.cs</FileName>
+ <HashCode>AEQIAQEBggFRANBACAgRCAgMBUAIAEBBgACLYAYEBAA=</HashCode>
+ </TypeIdentifier>
+ <Lollipop Position="0.2" Collapsed="true" />
+ </Class>
+ <Class Name="GUIProgramsAlt.ProgramSort" Collapsed="true" BaseTypeListCollapsed="true">
+ <Position X="18" Y="2.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramSort.cs</FileName>
+ <HashCode>AAAACAAAAAAEAAAAAAAAAAAAAAAAAAAAAABAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ <Lollipop Position="0.2" Collapsed="true" />
+ </Class>
+ <Class Name="GUIProgramsAlt.ProgramUtils" Collapsed="true">
+ <Position X="19.75" Y="2.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AABQIAAAhAAgQAAIAAAAg6AAGAAgAQABAAAWAAgCjCA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.ProgramViewHandler" Collapsed="true">
+ <Position X="21.5" Y="2.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramViewHandler.cs</FileName>
+ <HashCode>AgAAAAACgRAAAgAAAAgVBCAAgAjFEAIARAAAAAIgAGA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.AllGameScraper" Collapsed="true">
+ <Position X="14.5" Y="0.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\AllGameScraper.cs</FileName>
+ <HashCode>AhzAAAGgAAITAAAAAAAAAAAAAABQAAAAgIAAEQAAABA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.DirectoryImport" Collapsed="true">
+ <Position X="0.5" Y="8.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\DirectoryImport.cs</FileName>
+ <HashCode>AAAAAAAAAAAAAAABAgAgAAAAAAAAAAAAAAAAAAEAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.FileReadEventArgs" Collapsed="true">
+ <Position X="16.25" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\FileReadEventArgs.cs</FileName>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.GamebaseImport" Collapsed="true">
+ <Position X="2.75" Y="8.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\GamebaseImport.cs</FileName>
+ <HashCode>ABAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAEAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.ImportBase" Collapsed="true">
+ <Position X="2.75" Y="7.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\ImportBase.cs</FileName>
+ <HashCode>AAAAAQBAAAAAAAgAAAAAgAAAAAAAAAEAAAAAAAEAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Imports.MameImport" Collapsed="true">
+ <Position X="5" Y="8.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Imports\MameImport.cs</FileName>
+ <HashCode>qACAgAEAGAAAEAABAAAEAAgCgAASABAAGwAQBIEAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ApplicationItem" Collapsed="true">
+ <Position X="3.75" Y="4.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItem.cs</FileName>
+ <HashCode>hD6AAsRiQzNHIuPwpIiN4gIAmZcqBAkYqGVmCZkEpYA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ApplicationItemDirectoryCache" Collapsed="true">
+ <Position X="7.25" Y="5.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItemDirectoryCache.cs</FileName>
+ <HashCode>AAAAAAAAAABAAAAAIAAAIAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ItemFactory" Collapsed="true">
+ <Position X="16.25" Y="2.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItemFactory.cs</FileName>
+ <HashCode>AAAAAAACAAAAAEAgAAQAIAAAAQAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ApplicationItemGameBase" Collapsed="true">
+ <Position X="0.5" Y="5.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItemGameBase.cs</FileName>
+ <HashCode>AAAAAAAAAABAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ApplicationItemGrouper" Collapsed="true">
+ <Position X="2.75" Y="5.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItemGrouper.cs</FileName>
+ <HashCode>AAAAAAAAAAACAAAAAAAAAAAAAAAABAAAAGAAAAAABAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.ApplicationItemMame" Collapsed="true">
+ <Position X="5" Y="5.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\ApplicationItemMame.cs</FileName>
+ <HashCode>AAAAAAAIAABAAAAAIAAAAAAIgAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.FileItem" Collapsed="true">
+ <Position X="8.25" Y="7.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\FileItem.cs</FileName>
+ <HashCode>hAwEAcRuRAEAZkAAACYIQAIGCQPCAEECjgBAAo9AQAI=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.FileItemInfo" Collapsed="true">
+ <Position X="14.5" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\FileItemInfo.cs</FileName>
+ <HashCode>AggEAAAqRAEBIsAAJAYICQIGCQEGAAEALAAAAAkAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.FilelinkItem" Collapsed="true">
+ <Position X="8.25" Y="8.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\FilelinkItem.cs</FileName>
+ <HashCode>AAQAAEAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAEQAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Items.FilterItem" Collapsed="true">
+ <Position X="19.75" Y="1.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>Items\FilterItem.cs</FileName>
+ <HashCode>AAAAAAAAQAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Class Name="GUIProgramsAlt.Properties.Resources" Collapsed="true">
+ <Position X="16.25" Y="3.5" Width="1.5" />
+ <TypeIdentifier>
+ <HashCode>AAAAAAAAAAAAAAAAAAABEEAAQQAAAAIAAAAAAAAgAIA=</HashCode>
+ </TypeIdentifier>
+ </Class>
+ <Enum Name="GUIProgramsAlt.Layout" Collapsed="true">
+ <Position X="19.75" Y="4.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAAAAAQAAAACAAAAAAAAAAAAAAAAAAEAAAAAAAAAI=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.ItemType" Collapsed="true">
+ <Position X="18" Y="4.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAQAAAABAAAAAQCAAEABAAAAAAAAABAAAgAAAABAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.ScraperType" Collapsed="true">
+ <Position X="16.25" Y="5.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.ScraperSaveType" Collapsed="true">
+ <Position X="14.5" Y="5.5" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAAAAAAAAAIAAAAAAAAAAAAAAAABAAAAAAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.ProgramInfoAction" Collapsed="true">
+ <Position X="21.5" Y="4.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAgAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.ImportOption" Collapsed="true">
+ <Position X="16.25" Y="4.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAMAAAAAAAAAAAAAAAAAAAAAAAAgAAAACAAAAAAAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+ <Enum Name="GUIProgramsAlt.FileSettingOption" Collapsed="true">
+ <Position X="14.5" Y="4.75" Width="1.5" />
+ <TypeIdentifier>
+ <FileName>ProgramUtils.cs</FileName>
+ <HashCode>AAAAAAAAAgAAAAAAAACAAAAAAAAAAAAAAAAQAAIAAAA=</HashCode>
+ </TypeIdentifier>
+ </Enum>
+</ClassDiagram>
\ No newline at end of file
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-08 16:12:18 UTC (rev 907)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-09-09 09:59:29 UTC (rev 908)
@@ -63,9 +63,10 @@
#region Variables
bool currentSortAsc = true;
+
ProgramViewHandler viewHandler = ProgramViewHandler.Instance;
List<ApplicationItem> globalApplicationList;// dbHandlerInstance.ApplicationItemList;
- DirectoryHistory itemHistory = new DirectoryHistory();
+
int slideSpeed = 3000; // speed in milliseconds between two slides
long slideTime = 0;
static string _thumbnailPath = string.Empty;
@@ -158,7 +159,6 @@
return facadeView.SelectedListItemIndex;
}
-
bool ApplicationItemSubItemsAllowed()
{
if (currentApplicationItem == null)
@@ -176,8 +176,6 @@
return (currentApplicationItem != null); // all globalApplicationList can have files except the root
}
- #endregion
-
string GetViewLayoutAsText()
{
string result;
@@ -203,6 +201,8 @@
return result;
}
+ #endregion Properties / Helper Routines
+
public void SwitchToNextViewLayout()
{
switch (CurrentLayout)
@@ -591,89 +591,10 @@
- //TO DO
- //Fix this method//move it
- void ImportFileItemInfo(FileItem curFile)
- {
- int minRelevance = 30;
- bool bSuccess = false;
- ScraperSaveType saveType = ScraperSaveType.DataAndImages;
- GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
- GUIDialogProgress dlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_PROGRESS);
- dlgProgress.ShowWaitCursor = false;
- dlgProgress.ShowProgressBar(false);
- dlgProgress.SetHeading("Lookup Gameinfo");
- dlgProgress.SetLine(1, curFile.Title);
- dlgProgress.SetLine(2, curFile.Platform);
- dlgProgress.SetLine(3, "");
- dlgProgress.StartModal(GetID);
- // dlgProgress.SetPercentage(60);
- dlgProgress.Progress();
- bSuccess = curFile.FindFileInfo(ScraperType.ALLGAME);
- if ((bSuccess && curFile.FileInfoList.Count > 0) && ((FileItemInfo)(curFile.FileInfoList[0])).RelevanceNorm >= minRelevance)
- {
- GUIDialogSelect pDlg = (GUIDialogSelect)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_SELECT);
- if (null != pDlg)
- {
- pDlg.Reset();
- pDlg.SetHeading("Select Title");
- foreach (FileItemInfo item in curFile.FileInfoList)
- {
- if (item.RelevanceNorm >= minRelevance)
- {
- pDlg.Add(String.Format("{0} ({1})", item.Title, item.Platform));
- }
- }
- pDlg.DoModal(GetID);
- // and wait till user selects one
- int iSelectedGame = pDlg.SelectedLabel;
- if (iSelectedGame < 0) return;
- dlgProgress.StartModal(GetID);
- dlgProgress.Progress();
- dlgProgress.ShowProgressBar(false);
- curFile.FileInfoFavourite = (FileItemInfo)curFile.FileInfoList[iSelectedGame];
- curFile.FindFileInfoDetail(currentApplicationItem, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType);
- if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
- {
- // dlgProgress.SetPercentage(60);
- dlgProgress.Progress();
- curFile.SaveFromFileInfoFavourite(false);
- }
- // dlgProgress.SetPercentage(100);
- dlgProgress.Progress();
- dlgProgress.Close();
- dlgProgress = null;
- }
- ShowInfoWindow();
- }
- else
- {
- string strMsg = "";
- if (!bSuccess)
- {
- strMsg = "Connection failed";
- Log.Info("myPrograms: RefreshData failed");
- }
- else
- {
- strMsg = String.Format("No match for '{0}'", curFile.Title);
- Log.Info("myPrograms: No data found for '{0}'", curFile.Title);
- }
- if (null != dlgOk)
- {
- dlgOk.SetHeading(187);
- dlgOk.SetLine(1, strMsg);
- dlgOk.SetLine(2, String.Empty);
- dlgOk.DoModal(GetID);
- }
- }
- }
-
-
void SetItemThumb(GUIListItem item, GUIControl parent)
{
ThumbnailPath = "";
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-09-08 16:12:18 UTC (rev 907)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.csproj 2007-09-09 09:59:29 UTC (rev 908)
@@ -237,6 +237,9 @@
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <None Include="ClassDiagram1.cd" />
+ </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/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-08 16:12:18 UTC (rev 907)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAltFileInfo.cs 2007-09-09 09:59:29 UTC (rev 908)
@@ -85,7 +85,7 @@
}
string folderForThumbs = string.Empty;
string[] coverArtUrls = new string[1];
- string imdbCoverArtUrl = String.Empty;
+ string amgCoverArtUrl = String.Empty;
Thread imageSearchThread = null;
@@ -99,7 +99,87 @@
return Load(GUIGraphicsContext.Skin + @"\myProgramsAltFileInfo.xml");
}
+ //TO DO
+ //Fix this method//move it
+ void ImportFileItemInfo(FileItem curFile)
+ {
+ int minRelevance = 40;
+ bool bSuccess = false;
+ ScraperSaveType saveType = ScraperSaveType.DataAndImages;
+ GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_OK);
+ GUIDialogProgress dlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_PROGRESS);
+ dlgProgress.ShowWaitCursor = false;
+ dlgProgress.ShowProgressBar(false);
+ dlgProgress.SetHeading("Lookup Gameinfo");
+ dlgProgress.SetLine(1, curFile.Title);
+ dlgProgress.SetLine(2, curFile.Platform);
+ dlgProgress.SetLine(3, "");
+ dlgProgress.StartModal(GetID);
+ // dlgProgress.SetPercentage(60);
+ dlgProgress.Progress();
+ bSuccess = curFile.FindFileInfo(ScraperType.ALLGAME);
+ if ((bSuccess && curFile.FileInfoList.Count > 0) && ((FileItemInfo)(curFile.FileInfoList[0])).RelevanceNorm >= minRelevance)
+ {
+ GUIDialogSelect pDlg = (GUIDialogSelect)GUIWindowManager.GetWindow((int)Window.WINDOW_DIALOG_SELECT);
+ if (null != pDlg)
+ {
+ pDlg.Reset();
+ pDlg.SetHeading("Select Title");
+ foreach (FileItemInfo item in curFile.FileInfoList)
+ {
+ if (item.RelevanceNorm >= minRelevance)
+ {
+ pDlg.Add(String.Format("{0} ({1})", item.Title, item.Platform));
+ }
+ }
+ pDlg.DoModal(GetID);
+ // and wait till user selects one
+ int iSelectedGame = pDlg.SelectedLabel;
+ if (iSelectedGame < 0) return;
+
+ dlgProgress.StartModal(GetID);
+ dlgProgress.Progress();
+ dlgProgress.ShowProgressBar(false);
+ curFile.FileInfoFavourite = (FileItemInfo)curFile.FileInfoList[iSelectedGame];
+
+ curFile.FindFileInfoDetail(currentApplicationItem, curFile.FileInfoFavourite, ScraperType.ALLGAME, saveType);
+ if ((saveType == ScraperSaveType.DataAndImages) || (saveType == ScraperSaveType.Data))
+ {
+ // dlgProgress.SetPercentage(60);
+ dlgProgress.Progress();
+ curFile.SaveFromFileInfoFavourite(false);
+ }
+ // dlgProgress.SetPercentage(100);
+ dlgProgress.Progress();
+ dlgProgress.Close();
+ dlgProgress = null;
+ }
+ //ShowInfoWindow();
+ }
+ else
+ {
+ string strMsg = "";
+ if (!bSuccess)
+ {
+ strMsg = "Connection failed";
+ Log.Info("myPrograms: RefreshData failed");
+ }
+ else
+ {
+ strMsg = String.Format("No match for '{0}'", curFile.Title);
+ Log.Info("myPrograms: No data found for '{0}'", curFile.Title);
+ }
+ if (null != dlgOk)
+ {
+ dlgOk.SetHeading(187);
+ dlgOk.SetLine(1, strMsg);
+ dlgOk.SetLine(2, String.Empty);
+ dlgOk.DoModal(GetID);
+ }
+ }
+ }
+
protected override void OnPageLoad()
{
base.OnPageLoad();
@@ -110,9 +190,9 @@
return;
}
// Default picture
- imdbCoverArtUrl = currentFileItem.Imagefile;
+ amgCoverArtUrl = currentFileItem.Imagefile;
coverArtUrls = new string[1];
- coverArtUrls[0] = imdbCoverArtUrl;
+ coverArtUrls[0] = amgCoverArtUrl;
ResetSpinControl();
@@ -137,7 +217,8 @@
base.OnClicked(controlId, control, actionType);
if (control == btnRefresh)
{
-
+ ImportFileItemInfo(this.CurrentFileItem);
+ Update();
return;
}
@@ -248,33 +329,25 @@
{
if (currentFileItem == null) return;
// Search for more pictures
- FileItem movie = currentFileItem;
- IMPawardsSearch impSearch = new IMPawardsSearch();
- impSearch.Search(movie.Title);
+ FileItem fileItem = currentFileItem;
+
AmazonImageSearch amazonSearch = new AmazonImageSearch();
- amazonSearch.Search(movie.Title);
+ amazonSearch.Search(fileItem.Title);
int thumb = 0;
- if (movie.Imagefile != string.Empty)
+ if (fileItem.Imagefile != string.Empty)
thumb = 1;
- int pictureCount = amazonSearch.Count + impSearch.Count + thumb;
+ int pictureCount = amazonSearch.Count + thumb;
if (pictureCount == 0)
return;
int pictureIndex = 0;
coverArtUrls = new string[pictureCount];
- if (movie.Imagefile != string.Empty)
- coverArtUrls[pictureIndex++] = movie.Imagefile;
+ if (fileItem.Imagefile != string.Empty)
+ coverArtUrls[pictureIndex++] = fileItem.Imagefile;
- if ((impSearch.Count > 0) && (impSearch[0] != string.Empty))
- {
- for (int i = 0; i < impSearch.Count; ++i)
- {
- coverArtUrls[pictureIndex++] = impSearch[i];
- }
- }
if (amazonSearch.Count > 0)
{
@@ -389,7 +462,7 @@
public bool OnDetailsStarting(IMDBFetcher fetcher)
{
GUIDialogProgress pDlgProgress = (GUIDialogProgress)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_PROGRESS);
- // show dialog that we're downloading the movie info
+ // show dialog that we're downloading the fileItem info
pDlgProgress.Reset();
pDlgProgress.SetHeading(198);
pDlgProgress.SetLine(1, fetcher.MovieName);
@@ -461,9 +534,9 @@
public bool OnSelectMovie(IMDBFetcher fetcher, out int selectedMovie)
{
GUIDialogSelect pDlgSelect = (GUIDialogSelect)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_SELECT);
- // more then 1 movie found
+ // more then 1 fileItem found
// ask user to select 1
- pDlgSelect.SetHeading(196);//select movie
+ pDlgSelect.SetHeading(196);//select fileItem
pDlgSelect.Reset();
for (int i = 0; i < fetcher.Count; ++i)
{
@@ -533,6 +606,7 @@
{
Render(timePassed);
}
+
#endregion
}
}
Modified: trunk/plugins/myGUIProgramsAlt/README.txt
===================================================================
--- trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-08 16:12:18 UTC (rev 907)
+++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-09-09 09:59:29 UTC (rev 908)
@@ -39,14 +39,10 @@
-Add sort for filteritems too.
--Fix brokenprogressdialogs in gui reimport
--Allow the amg best match update from fileinfo window for fileitem
-
-
BUGS:
-- Just add em...
+- Just add em....
FEATURES:
Add some more specific emulator support..
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-09-08 16:12:19
|
Revision: 907
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=907&view=rev
Author: zebons
Date: 2007-09-08 09:12:18 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Added Paths:
-----------
trunk/plugins/MyFilms/BaseMesFilms.cs
trunk/plugins/MyFilms/Configuration.cs
Added: trunk/plugins/MyFilms/BaseMesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/BaseMesFilms.cs (rev 0)
+++ trunk/plugins/MyFilms/BaseMesFilms.cs 2007-09-08 16:12:18 UTC (rev 907)
@@ -0,0 +1,137 @@
+using System;
+using System.Data;
+using System.Collections.Generic;
+using System.Text;
+
+
+namespace MesFilms
+{
+ public class BaseMesFilms
+ {
+ private static AntMovieCatalog data;
+ private static Dictionary<string, string> dataPath;
+ private static DataRow[] movies;
+
+ #region ctor
+ static BaseMesFilms()
+ {
+ }
+ #endregion
+
+ #region m\xE9thodes statique spriv\xE9es
+ private static void initData()
+ {
+ data = new AntMovieCatalog();
+ try
+ {
+ data.ReadXml(MesFilms.conf.StrFileXml);
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ }
+ #endregion
+
+ #region accesseurs
+ public static DataRow[] FilmsSelected
+ {
+ get { return movies; }
+ }
+
+ #endregion
+
+ #region m\xE9thodes statique publiques
+ //public void LectureDonn\xE9es(string StrSelect, string StrSort, string StrSortSens)
+ //{
+ // //if (data != null)
+ // // movies = data.Tables["Movie"].Select(MesFilms.conf.StrDfltSelect + MesFilms.conf.StrSelect, StrSort + StrSortSens);
+ // //return movies;
+ //}
+
+ public static DataRow[] LectureDonn\xE9es(string StrDfltSelect, string StrSelect, string StrSort, string StrSortSens)
+ {
+ if (data == null)
+ {
+ initData();
+ }
+ return movies = data.Tables["Movie"].Select(StrDfltSelect + StrSelect, StrSort + StrSortSens);
+ }
+
+ public static DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens)
+ {
+ if (data == null)
+ {
+ initData();
+ }
+ return movies = data.Tables["Movie"].Select(StrFilmSelect, StrSort + StrSortSens);
+ }
+
+ public static DataRow[] LoadDirectory(string StrDfltSelect, string StrSelect, string StrSort, string StrSortSens)
+ {
+ if (data == null)
+ {
+ initData();
+ }
+ return movies = data.Tables["Movie"].Select(StrDfltSelect + StrSelect, StrSort + StrSortSens);
+ }
+ public static void LoadFilm(string StrFileXml)
+ {
+ if (!System.IO.File.Exists(StrFileXml))
+ throw new Exception(string.Format("Le fichier {0} n'existe pas.", StrFileXml));
+
+ data = new AntMovieCatalog();
+ try
+ {
+ data.ReadXml(StrFileXml);
+ }
+ catch (Exception e)
+ {
+ throw new Exception("Erreur lecture file xml");
+ }
+
+ }
+
+ public static void SaveMesFilms()
+ {
+ if (data != null)
+ {
+ try
+ {
+ System.Xml.XmlTextWriter MyXmlTextWriter = new System.Xml.XmlTextWriter
+ (MesFilms.conf.StrFileXml, System.Text.Encoding.Default);
+ MyXmlTextWriter.WriteStartDocument();
+ data.WriteXml(MyXmlTextWriter, XmlWriteMode.IgnoreSchema);
+ MyXmlTextWriter.Close();
+ }
+ catch
+ {
+ MediaPortal.Dialogs.GUIDialogOK dlgOk = (MediaPortal.Dialogs.GUIDialogOK)MediaPortal.GUI.Library.GUIWindowManager.GetWindow((int)MediaPortal.GUI.Library.GUIWindow.Window.WINDOW_DIALOG_OK);
+ dlgOk.SetHeading("Error");//my videos
+ dlgOk.SetLine(1, "Error during updating the XML database !");
+ dlgOk.SetLine(2, "Maybe Directory full or no write access.");
+ dlgOk.DoModal(MesFilms.ID_MesFilmsDetail);
+ }
+ //data.WriteXml("");
+ }
+ }
+
+ public static void CancelMesFilms()
+ {
+ if (data != null)
+ {
+ //data.WriteXml("");
+ }
+ }
+
+ public static void Lirefilm(string nomfilm)
+ {
+ if (dataPath.ContainsKey(""))
+ {
+
+ }
+ }
+
+ #endregion
+ }
+}
Added: trunk/plugins/MyFilms/Configuration.cs
===================================================================
--- trunk/plugins/MyFilms/Configuration.cs (rev 0)
+++ trunk/plugins/MyFilms/Configuration.cs 2007-09-08 16:12:18 UTC (rev 907)
@@ -0,0 +1,544 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using MediaPortal.Configuration;
+
+
+
+namespace MesFilms
+{
+ public class Configuration
+ {
+ public Configuration(string CurrentConfig, bool create_temp)
+ {
+ //-----------------------------------------------------------------------------------------------
+ // Load Config Parameters in MyFilms.xml file (section CurrentConfig)
+ //-----------------------------------------------------------------------------------------------
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ xmlwriter.SetValue("MyFilms", "Current_Config", CurrentConfig);
+ }
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ StrStorage = xmlreader.GetValueAsString(CurrentConfig, "AntStorage", "");
+ StrDirStor = xmlreader.GetValueAsString(CurrentConfig, "PathStorage", "");
+ StrIdentItem = xmlreader.GetValueAsString(CurrentConfig, "AntIdentItem", "");
+ StrTitle1 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle1", "");
+ StrTitle2 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle2", "");
+ StrTSort1 = xmlreader.GetValueAsString(CurrentConfig, "AntTSort", "");
+ StrSort1 = xmlreader.GetValueAsString(CurrentConfig, "AntSort", "");
+ StrViewItem1 = xmlreader.GetValueAsString(CurrentConfig, "AntViewItem1", "");
+ StrViewText1 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText1", "");
+ StrViewItem2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewItem2", "");
+ StrViewText2 = xmlreader.GetValueAsString(CurrentConfig, "AntViewText2", "");
+ StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalog", "");
+ StrFileType = xmlreader.GetValueAsString(CurrentConfig, "CatalogType", "0");
+ StrPathImg = xmlreader.GetValueAsString(CurrentConfig, "AntPicture", "");
+ StrLayOut = xmlreader.GetValueAsInt(CurrentConfig, "LayOut", 0);
+ StrLayOut = xmlreader.GetValueAsInt(CurrentConfig, "WLayOut", StrLayOut);
+ Strlabel1 = xmlreader.GetValueAsString(CurrentConfig, "AntLabel1", "");
+ Strlabel2 = xmlreader.GetValueAsString(CurrentConfig, "AntLabel2", "");
+ Stritem1 = xmlreader.GetValueAsString(CurrentConfig, "AntItem1", "");
+ Stritem2 = xmlreader.GetValueAsString(CurrentConfig, "AntItem2", "");
+ Stritem3 = xmlreader.GetValueAsString(CurrentConfig, "AntItem3", "");
+ StrIdentLabel = xmlreader.GetValueAsString(CurrentConfig, "AntIdentLabel", "");
+ switch (StrFileType)
+ {
+ case "0":
+ break;
+ case "1":
+ if (create_temp)
+ {
+ string WStrPathImg;
+ if (StrPathImg.Substring(StrPathImg.Length - 1) == "\\")
+ WStrPathImg = StrPathImg.Substring(0, StrPathImg.LastIndexOf(@"\"));
+ else
+ WStrPathImg = StrPathImg;
+ string destFile = WStrPathImg + "\\" + StrFileXml.Substring(StrFileXml.LastIndexOf(@"\") + 1, StrFileXml.Length - StrFileXml.LastIndexOf(@"\") - 5) + "_tmp.xml";
+ if ((System.IO.File.Exists(destFile) && (System.IO.File.GetLastWriteTime(destFile) > System.IO.File.GetLastWriteTime(StrFileXml))))
+ {
+ StrFileXml = destFile;
+ break;
+ }
+ bool SortTitle = false;
+ if (xmlreader.GetValueAsString(CurrentConfig, "SortTitle", "False") == "True")
+ SortTitle = true;
+ string TagField = xmlreader.GetValueAsString(CurrentConfig, "DVDPTagField", "");
+ CatalogConverter cv = new CatalogConverter(TagField);
+ StrFileXml = cv.ConvertProfiler(StrFileXml, StrPathImg, SortTitle, TagField);
+ }
+ else
+ StrFileXml = xmlreader.GetValueAsString(CurrentConfig, "AntCatalogTemp", "");
+ break;
+
+ }
+ StrSelect = xmlreader.GetValueAsString(CurrentConfig, "StrSelect", "");
+ StrActors = xmlreader.GetValueAsString(CurrentConfig, "StrActors", "");
+ StrTitleSelect = xmlreader.GetValueAsString(CurrentConfig, "StrTitleSelect", "");
+ StrFilmSelect = xmlreader.GetValueAsString(CurrentConfig, "StrFilmSelect", "");
+ StrDfltSelect = xmlreader.GetValueAsString(CurrentConfig, "StrDfltSelect", "");
+ StrSort = xmlreader.GetValueAsString(CurrentConfig, "StrSort", "");
+ CurrentSortMethod = xmlreader.GetValueAsString(CurrentConfig, "CurrentSortMethod", "");
+ StrSortSens = xmlreader.GetValueAsString(CurrentConfig, "StrSortSens", "");
+ StrTxtSelect = xmlreader.GetValueAsString(CurrentConfig, "Selection", "");
+ StrIndex = xmlreader.GetValueAsInt(CurrentConfig, "IndexItem", -1);
+ StrTIndex = xmlreader.GetValueAsString(CurrentConfig, "TitleItem", "");
+ Boolselect = xmlreader.GetValueAsBool(CurrentConfig, "conf.Boolselect", false);
+ boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "conf.Boolreturn", false);
+ WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", "");
+ wselectedlabel = xmlreader.GetValueAsString(CurrentConfig, "WSelectedLabel", "");
+ Wstar = xmlreader.GetValueAsString(CurrentConfig, "Wstar", "");
+ LastID = xmlreader.GetValueAsInt(CurrentConfig, "LastID", -1);
+ StrViewDfltItem = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltItem", "");
+ StrViewDfltText = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltText", "");
+ TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", ".");
+
+ }
+ if (StrSelect == "")
+ StrSelect = StrTitle1.ToString() + " not like ''";
+ if (StrSort1.Length == 0)
+ StrSort1 = "(none)";
+ if (StrSort == "")
+ StrSort = StrTitle1;
+ if (StrSortSens == "")
+ StrSortSens = " ASC";
+
+ }
+// static values
+ private static string currentConfig = string.Empty;
+ public static string CurrentConfig
+ {
+ get { return currentConfig; }
+ set { currentConfig = value; }
+ }
+ private static int nbConfig = int.MinValue;
+ public static int NbConfig
+ {
+ get { return nbConfig; }
+ set { nbConfig = value; }
+ }
+ private static int currentMovie = int.MinValue;
+ public static int CurrentMovie
+ {
+ get { return currentMovie; }
+ set { currentMovie = value; }
+ }
+
+ // bool variables
+ private bool boolselect = false;
+ public bool Boolselect
+ {
+ get { return boolselect; }
+ set { boolselect = value; }
+ }
+ private bool boolreturn = false;
+ public bool Boolreturn
+ {
+ get { return boolreturn; }
+ set { boolreturn = value; }
+ }
+ private bool boolstorage = false;
+ public bool Boolstorage
+ {
+ get { return boolstorage; }
+ set { boolstorage = value; }
+ }
+
+ // string variables
+ private string strSelect = string.Empty;
+ public string StrSelect
+ {
+ get { return strSelect; }
+ set { strSelect = value; }
+ }
+ private string strDirStor = string.Empty;
+ public string StrDirStor
+ {
+ get { return strDirStor; }
+ set { strDirStor = value; }
+ }
+
+ private string strIdentLabel = string.Empty;
+ public string StrIdentLabel
+ {
+ get { return strIdentLabel; }
+ set { strIdentLabel = value; }
+ }
+ private string strlabel1 = string.Empty;
+ public string Strlabel1
+ {
+ get { return strlabel1; }
+ set { strlabel1 = value; }
+ }
+ private string strlabel2 = string.Empty;
+ public string Strlabel2
+ {
+ get { return strlabel2; }
+ set { strlabel2 = value; }
+ }
+ private string stritem1 = string.Empty;
+ public string Stritem1
+ {
+ get { return stritem1; }
+ set { stritem1 = value; }
+ }
+ private string stritem2 = string.Empty;
+ public string Stritem2
+ {
+ get { return stritem2; }
+ set { stritem2 = value; }
+ }
+ private string stritem3 = string.Empty;
+ public string Stritem3
+ {
+ get { return stritem3; }
+ set { stritem3 = value; }
+ }
+
+ private string strDfltSelect = string.Empty;
+ public string StrDfltSelect
+ {
+ get { return strDfltSelect; }
+ set { strDfltSelect = value; }
+ }
+ private string strTitle1 = string.Empty;
+ public string StrTitle1
+ {
+ get { return strTitle1; }
+ set { strTitle1 = value; }
+ }
+ private string strTitle2 = string.Empty;
+ public string StrTitle2
+ {
+ get { return strTitle2; }
+ set { strTitle2 = value; }
+ }
+ private string strTitleSelect = string.Empty;
+ public string StrTitleSelect
+ {
+ get { return strTitleSelect; }
+ set { strTitleSelect = value; }
+ }
+ private string strFilmSelect = string.Empty;
+ public string StrFilmSelect
+ {
+ get { return strFilmSelect; }
+ set { strFilmSelect = value; }
+ }
+ private string strSort = string.Empty;
+ public string StrSort
+ {
+ get { return strSort; }
+ set { strSort = value; }
+ }
+ private string strActors = string.Empty;
+ public string StrActors
+ {
+ get { return strActors; }
+ set { strActors = value; }
+ }
+ private string strTxtSelect = string.Empty;
+ public string StrTxtSelect
+ {
+ get { return strTxtSelect; }
+ set { strTxtSelect = value; }
+ }
+ private string strStorage = string.Empty;
+ public string StrStorage
+ {
+ get { return strStorage; }
+ set { strStorage = value; }
+ }
+ private string strIdentItem = string.Empty;
+ public string StrIdentItem
+ {
+ get { return strIdentItem; }
+ set { strIdentItem = value; }
+ }
+ private string strSort1 = string.Empty;
+ public string StrSort1
+ {
+ get { return strSort1; }
+ set { strSort1 = value; }
+ }
+ private string strTSort1 = string.Empty;
+ public string StrTSort1
+ {
+ get { return strTSort1; }
+ set { strTSort1 = value; }
+ }
+ private string strViewItem1 = string.Empty;
+ public string StrViewItem1
+ {
+ get { return strViewItem1; }
+ set { strViewItem1 = value; }
+ }
+ private string strViewText1 = string.Empty;
+ public string StrViewText1
+ {
+ get { return strViewText1; }
+ set { strViewText1 = value; }
+ }
+ private string strViewItem2 = string.Empty;
+ public string StrViewItem2
+ {
+ get { return strViewItem2; }
+ set { strViewItem2 = value; }
+ }
+ private string strViewText2 = string.Empty;
+ public string StrViewText2
+ {
+ get { return strViewText2; }
+ set { strViewText2 = value; }
+ }
+ private string strViewDfltItem = string.Empty;
+ public string StrViewDfltItem
+ {
+ get { return strViewDfltItem; }
+ set { strViewDfltItem = value; }
+ }
+ private string strViewDfltText = string.Empty;
+ public string StrViewDfltText
+ {
+ get { return strViewDfltText; }
+ set { strViewDfltText = value; }
+ }
+ private string strFileXml = string.Empty;
+ public string StrFileXml
+ {
+ get { return strFileXml; }
+ set { strFileXml = value; }
+ }
+ private string strFileType = string.Empty;
+ public string StrFileType
+ {
+ get { return strFileType; }
+ set { strFileType = value; }
+ }
+ private string strPathImg = string.Empty;
+ public string StrPathImg
+ {
+ get { return strPathImg; }
+ set { strPathImg = value; }
+ }
+ private string strSortSens = string.Empty;
+ public string StrSortSens
+ {
+ get { return strSortSens; }
+ set { strSortSens = value; }
+ }
+ private string wStrSort = string.Empty;
+ public string WStrSort
+ {
+ get { return wStrSort; }
+ set { wStrSort = value; }
+ }
+ private string wStrSelect = string.Empty;
+ public string WStrSelect
+ {
+ get { return wStrSelect; }
+ set { wStrSelect = value; }
+ }
+ private string wStrSortSens = string.Empty;
+ public string WStrSortSens
+ {
+ get { return wStrSortSens; }
+ set { wStrSortSens = value; }
+ }
+ private string wselectedlabel = string.Empty;
+ public string Wselectedlabel
+ {
+ get { return wselectedlabel; }
+ set { wselectedlabel = value; }
+ }
+ private string currentSortMethod = string.Empty;
+ public string CurrentSortMethod
+ {
+ get { return currentSortMethod; }
+ set { currentSortMethod = value; }
+ }
+ private string strTIndex = string.Empty;
+ public string StrTIndex
+ {
+ get { return strTIndex; }
+ set { strTIndex = value; }
+ }
+ private string fileImage = string.Empty;
+ public string FileImage
+ {
+ get { return fileImage; }
+ set { fileImage = value; }
+ }
+ private string strPluginName = string.Empty;
+ public string StrPluginName
+ {
+ get { return strPluginName; }
+ set { strPluginName = value; }
+ }
+ private string titleDelim = string.Empty;
+ public string TitleDelim
+ {
+ get { return titleDelim; }
+ set { titleDelim = value; }
+ }
+ private string wstar = string.Empty;
+ public string Wstar
+ {
+ get { return wstar; }
+ set { wstar = value; }
+ }
+ private int strLayOut = int.MinValue;
+ public int StrLayOut
+ {
+ get { return strLayOut; }
+ set { strLayOut = value; }
+ }
+ private int lastID = int.MinValue;
+ public int LastID
+ {
+ get { return lastID; }
+ set { lastID = value; }
+ }
+ private decimal w_rating = decimal.Zero;
+ public decimal W_rating
+ {
+ get { return w_rating; }
+ set { w_rating = value; }
+ }
+ private int strIndex = int.MinValue;
+ public int StrIndex
+ {
+ get { return strIndex; }
+ set { strIndex = value; }
+ }
+
+ public static void SaveConfiguration(string currentConfig, int selectedItem, string selectedItemLabel)
+ {
+ using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ xmlwriter.SetValue("MyFilms", "Current_Config", currentConfig);
+ xmlwriter.SetValue(currentConfig, "StrSelect", MesFilms.conf.StrSelect.ToString());
+ xmlwriter.SetValue(currentConfig, "StrActors", MesFilms.conf.StrActors.ToString());
+ xmlwriter.SetValue(currentConfig, "StrTitleSelect", MesFilms.conf.StrTitleSelect.ToString());
+ xmlwriter.SetValue(currentConfig, "StrFilmSelect", MesFilms.conf.StrFilmSelect.ToString());
+ xmlwriter.SetValue(currentConfig, "StrDfltSelect", MesFilms.conf.StrDfltSelect.ToString());
+ xmlwriter.SetValue(currentConfig, "StrSort", MesFilms.conf.StrSort.ToString());
+ xmlwriter.SetValue(currentConfig, "CurrentSortMethod", MesFilms.conf.CurrentSortMethod.ToString());
+ xmlwriter.SetValue(currentConfig, "StrSortSens", MesFilms.conf.StrSortSens.ToString());
+ xmlwriter.SetValue(currentConfig, "Selection", MesFilms.conf.StrTxtSelect);
+ xmlwriter.SetValue(currentConfig, "IndexItem", (selectedItem > -1) ? ((MesFilms.conf.Boolselect) ? selectedItem.ToString() : selectedItem.ToString()) : "-1"); //may need to check if there is no item selected and so save -1
+ xmlwriter.SetValue(currentConfig, "TitleItem", (selectedItem > -1) ? ((MesFilms.conf.Boolselect) ? selectedItem.ToString() : selectedItemLabel.ToString()) : ""); //may need to check if there is no item selected and so save ""
+ xmlwriter.SetValueAsBool(currentConfig, "conf.Boolselect", MesFilms.conf.Boolselect);
+ xmlwriter.SetValueAsBool(currentConfig, "boolreturn", MesFilms.conf.Boolreturn);
+ xmlwriter.SetValue(currentConfig, "WSelectedLabel", MesFilms.conf.Wselectedlabel);
+ xmlwriter.SetValue(currentConfig, "WStrSort", MesFilms.conf.WStrSort);
+ xmlwriter.SetValue(currentConfig, "Wstar", MesFilms.conf.Wstar);
+ xmlwriter.SetValue(currentConfig, "WLayOut", MesFilms.conf.StrLayOut);
+ xmlwriter.SetValue(currentConfig, "LastID", MesFilms.conf.LastID);
+ switch (MesFilms.conf.StrFileType)
+ {
+ case "0":
+ break;
+ case "1":
+ xmlwriter.SetValue(currentConfig, "AntCatalogTemp", MesFilms.conf.StrFileXml.ToString());
+ break;
+ }
+ }
+ }
+ //--------------------------------------------------------------------------------------------
+ // Control Acces to asked configuration
+ //--------------------------------------------------------------------------------------------
+ public static string Control_Access_Config(string configname, int GetID)
+ {
+ if (configname.Length == 0)
+ return "";
+ string Dwp;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ Dwp = xmlreader.GetValueAsString(configname, "Dwp", "");
+ }
+
+ if (Dwp.Length == 0)
+ return configname;
+ MediaPortal.Dialogs.VirtualKeyboard keyboard = (MediaPortal.Dialogs.VirtualKeyboard)MediaPortal.GUI.Library.GUIWindowManager.GetWindow((int)MediaPortal.GUI.Library.GUIWindow.Window.WINDOW_VIRTUAL_KEYBOARD);
+ if (null == keyboard) return "";
+ keyboard.Reset();
+ keyboard.Text = "";
+ keyboard.Password = true;
+ keyboard.DoModal(GetID);
+ if ((keyboard.IsConfirmed) && (keyboard.Text.Length > 0))
+ {
+ Crypto crypto = new Crypto();
+ if (crypto.Decrypter(Dwp) == keyboard.Text)
+ return configname;
+ }
+ return "";
+ }
+ //--------------------------------------------------------------------------------------------
+ // Choice Configuration
+ //--------------------------------------------------------------------------------------------
+ public static string Choice_Config(int GetID)
+ {
+ MediaPortal.Dialogs.GUIDialogMenu dlg = (MediaPortal.Dialogs.GUIDialogMenu)MediaPortal.GUI.Library.GUIWindowManager.GetWindow((int)MediaPortal.GUI.Library.GUIWindow.Window.WINDOW_DIALOG_MENU);
+ if (dlg == null)
+ {
+
+ MesFilms.conf.StrFileXml = "";
+ return "";
+ }
+ dlg.Reset();
+ dlg.SetHeading(924); // menu
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ int MesFilms_nb_config = xmlreader.GetValueAsInt("MyFilms", "NbConfig", -1);
+ for (int i = 0; i < (int)MesFilms_nb_config; i++)
+ dlg.Add(xmlreader.GetValueAsString("MyFilms", "ConfigName" + i, ""));
+ }
+ dlg.DoModal(GetID);
+ if (dlg.SelectedLabel == -1)
+ {
+ MesFilms.conf.StrFileXml = "";
+ return "";
+ }
+ if (dlg.SelectedLabelText.Length > 0)
+ return dlg.SelectedLabelText;
+ return "";
+ }
+ //--------------------------------------------------------------------------------------------
+ // Return Current Configuration
+ //--------------------------------------------------------------------------------------------
+ public static void Current_Config()
+ {
+ CurrentConfig = null;
+ using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ {
+ NbConfig = xmlreader.GetValueAsInt("MyFilms", "NbConfig", 0);
+ if (NbConfig == 0)
+ {
+ MediaPortal.Dialogs.GUIDialogOK dlgOk = (MediaPortal.Dialogs.GUIDialogOK)MediaPortal.GUI.Library.GUIWindowManager.GetWindow((int)MediaPortal.GUI.Library.GUIWindow.Window.WINDOW_DIALOG_OK);
+ dlgOk.SetHeading(3);//my videos
+ dlgOk.SetLine(1, "No Configuration defined");
+ dlgOk.SetLine(2, "Please enter setup first");
+ dlgOk.DoModal(MesFilms.ID_MesFilms);
+ MediaPortal.GUI.Library.GUIWindowManager.ShowPreviousWindow();
+ }
+ bool boolchoice = true;
+ if (CurrentConfig == null)
+ CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
+ if (!(xmlreader.GetValueAsBool("MyFilms", "Menu_Config", false)))
+ CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Default_Config", "");
+ else
+ CurrentConfig = "";
+ if (CurrentConfig == "")
+ {
+ boolchoice = false;
+ CurrentConfig = Configuration.Choice_Config(MesFilms.ID_MesFilms); // "" => user esc's dialog on plugin startup so exit plugin unchanged
+ }
+ CurrentConfig = Configuration.Control_Access_Config(CurrentConfig, MesFilms.ID_MesFilms);
+ if ((CurrentConfig == "") && (NbConfig > 1) && (boolchoice)) //error password ? so if many config => choice config menu
+ CurrentConfig = Configuration.Choice_Config(MesFilms.ID_MesFilms);
+ }
+ }
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ze...@us...> - 2007-09-08 16:11:33
|
Revision: 906
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=906&view=rev
Author: zebons
Date: 2007-09-08 09:11:27 -0700 (Sat, 08 Sep 2007)
Log Message:
-----------
Rewrite c# code more modulable
Modified Paths:
--------------
trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
trunk/plugins/MyFilms/AntMovieCatalog.xsd
trunk/plugins/MyFilms/MesFilms.cs
trunk/plugins/MyFilms/MesFilms.csproj
trunk/plugins/MyFilms/MesFilmsDetail.cs
trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs
trunk/plugins/MyFilms/MesFilmsSetup.cs
Modified: trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-09-07 23:59:25 UTC (rev 905)
+++ trunk/plugins/MyFilms/AntMovieCatalog.Designer.cs 2007-09-08 16:11:27 UTC (rev 906)
@@ -1167,8 +1167,7 @@
System.DateTime DateAdded,
string Size,
string Disks,
- string Picture,
- ContentsRow parentContentsRowByContents_Movie) {
+ string Picture) {
MovieRow rowMovieRow = ((MovieRow)(this.NewRow()));
rowMovieRow.ItemArray = new object[] {
Number,
@@ -1204,7 +1203,7 @@
Size,
Disks,
Picture,
- parentContentsRowByContents_Movie[0]};
+ null};
this.Rows.Add(rowMovieRow);
return rowMovieRow;
}
@@ -1367,6 +1366,8 @@
this.columnSize.Namespace = "";
this.columnDisks.Namespace = "";
this.columnPicture.Namespace = "";
+ this.columnContents_Id.AutoIncrement = true;
+ this.columnContents_Id.AllowDBNull = false;
this.columnContents_Id.Namespace = "";
}
@@ -2106,12 +2107,7 @@
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
public int Contents_Id {
get {
- try {
- return ((int)(this[this.tableMovie.Contents_IdColumn]));
- }
- catch (System.InvalidCastException e) {
- throw new System.Data.StrongTypingException("La valeur pour la colonne \'Contents_Id\' dans la table \'Movie\' est DBNull.", e);
- }
+ return ((int)(this[this.tableMovie.Contents_IdColumn]));
}
set {
this[this.tableMovie.Contents_IdColumn] = value;
@@ -2457,16 +2453,6 @@
public void SetPictureNull() {
this[this.tableMovie.PictureColumn] = System.Convert.DBNull;
}
-
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- public bool IsContents_IdNull() {
- return this.IsNull(this.tableMovie.Contents_IdColumn);
- }
-
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- public void SetContents_IdNull() {
- this[this.tableMovie.Contents_IdColumn] = System.Convert.DBNull;
- }
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "2.0.0.0")]
Modified: trunk/plugins/MyFilms/AntMovieCatalog.xsd
===================================================================
--- trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-09-07 23:59:25 UTC (rev 905)
+++ trunk/plugins/MyFilms/AntMovieCatalog.xsd 2007-09-08 16:11:27 UTC (rev 906)
@@ -18,58 +18,58 @@
<xs:element name="Catalog" msprop:Generator_UserTableName="Catalog" msprop:Generator_RowDeletedName="CatalogRowDeleted" msprop:Generator_RowChangedName="CatalogRowChanged" msprop:Generator_RowClassName="CatalogRow" msprop:Generator_RowChangingName="CatalogRowChanging" msprop:Generator_RowEvArgName="CatalogRowChangeEvent" msprop:Generator_RowEvHandlerName="CatalogRowChangeEventHandler" msprop:Generator_TableClassName="CatalogDataTable" msprop:Generator_TableVarName="tableCatalog" msprop:Generator_RowDeletingName="CatalogRowDeleting" msprop:Generator_TablePropName="Catalog">
<xs:complexType>
<xs:sequence>
- <xs:element name="Properties" msprop:Generator_UserColumnName="Properties" msprop:Generator_ColumnPropNameInRow="Properties" msprop:Generator_ColumnVarNameInTable="columnProperties" msprop:Generator_ColumnPropNameInTable="PropertiesColumn" type="xs:string" minOccurs="0" msdata:Ordinal="1" />
+ <xs:element name="Properties" msprop:Generator_UserColumnName="Properties" msprop:Generator_ColumnVarNameInTable="columnProperties" msprop:Generator_ColumnPropNameInRow="Properties" msprop:Generator_ColumnPropNameInTable="PropertiesColumn" type="xs:string" minOccurs="0" msdata:Ordinal="1" />
<xs:element name="Contents" msprop:Generator_UserTableName="Contents" msprop:Generator_RowDeletedName="ContentsRowDeleted" msprop:Generator_RowChangedName="ContentsRowChanged" msprop:Generator_RowClassName="ContentsRow" msprop:Generator_RowChangingName="ContentsRowChanging" msprop:Generator_RowEvArgName="ContentsRowChangeEvent" msprop:Generator_RowEvHandlerName="ContentsRowChangeEventHandler" msprop:Generator_TableClassName="ContentsDataTable" msprop:Generator_TableVarName="tableContents" msprop:Generator_RowDeletingName="ContentsRowDeleting" msprop:Generator_TablePropName="Contents" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<xs:element name="Movie" msprop:Generator_UserTableName="Movie" msprop:Generator_RowDeletedName="MovieRowDeleted" msprop:Generator_RowChangedName="MovieRowChanged" msprop:Generator_RowClassName="MovieRow" msprop:Generator_RowChangingName="MovieRowChanging" msprop:Generator_RowEvArgName="MovieRowChangeEvent" msprop:Generator_RowEvHandlerName="MovieRowChangeEventHandler" msprop:Generator_TableClassName="MovieDataTable" msprop:Generator_TableVarName="tableMovie" msprop:Generator_RowDeletingName="MovieRowDeleting" msprop:Generator_TablePropName="Movie" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
- <xs:element name="DateAdded" msdata:ReadOnly="true" msdata:Expression="Convert(Date,'System.DateTime')" msprop:Generator_UserColumnName="DateAdded" msprop:Generator_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnVarNameInTable="columnDateAdded" msprop:Generator_ColumnPropNameInTable="DateAddedColumn" type="xs:dateTime" minOccurs="0" msdata:Ordinal="29" />
+ <xs:element name="DateAdded" msdata:ReadOnly="true" msdata:Expression="Convert(Date,'System.DateTime')" msprop:Generator_UserColumnName="DateAdded" msprop:Generator_ColumnVarNameInTable="columnDateAdded" msprop:Generator_ColumnPropNameInRow="DateAdded" msprop:Generator_ColumnPropNameInTable="DateAddedColumn" type="xs:dateTime" minOccurs="0" msdata:Ordinal="29" />
</xs:sequence>
- <xs:attribute name="Number" msprop:Generator_UserColumnName="Number" msprop:Generator_ColumnPropNameInRow="Number" msprop:Generator_ColumnVarNameInTable="columnNumber" msprop:Generator_ColumnPropNameInTable="NumberColumn" type="xs:int" />
- <xs:attribute name="Checked" msprop:Generator_UserColumnName="Checked" msprop:Generator_ColumnPropNameInRow="Checked" msprop:Generator_ColumnVarNameInTable="columnChecked" msprop:Generator_ColumnPropNameInTable="CheckedColumn" type="xs:string" />
- <xs:attribute name="MediaLabel" msprop:Generator_UserColumnName="MediaLabel" msprop:Generator_ColumnVarNameInTable="columnMediaLabel" msprop:Generator_ColumnPropNameInRow="MediaLabel" msprop:Generator_ColumnPropNameInTable="MediaLabelColumn" type="xs:string" />
- <xs:attribute name="MediaType" msprop:Generator_UserColumnName="MediaType" msprop:Generator_ColumnPropNameInRow="MediaType" msprop:Generator_ColumnVarNameInTable="columnMediaType" msprop:Generator_ColumnPropNameInTable="MediaTypeColumn" type="xs:string" />
- <xs:attribute name="Source" msprop:Generator_UserColumnName="Source" msprop:Generator_ColumnVarNameInTable="columnSource" msprop:Generator_ColumnPropNameInRow="Source" msprop:Generator_ColumnPropNameInTable="SourceColumn" type="xs:string" />
- <xs:attribute name="Date" msprop:Generator_UserColumnName="Date" msprop:Generator_ColumnPropNameInRow="Date" msprop:Generator_ColumnVarNameInTable="columnDate" msprop:Generator_ColumnPropNameInTable="DateColumn" type="xs:string" />
- <xs:attribute name="Borrower" msprop:Generator_UserColumnName="Borrower" msprop:Generator_ColumnPropNameInRow="Borrower" msprop:Generator_ColumnVarNameInTable="columnBorrower" msprop:Generator_ColumnPropNameInTable="BorrowerColumn" type="xs:string" />
- <xs:attribute name="Rating" msprop:Generator_UserColumnName="Rating" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnVarNameInTable="columnRating" msprop:Generator_ColumnPropNameInTable="RatingColumn" type="xs:decimal" />
- <xs:attribute name="OriginalTitle" msprop:Generator_UserColumnName="OriginalTitle" msprop:Generator_ColumnPropNameInRow="OriginalTitle" msprop:Generator_ColumnVarNameInTable="columnOriginalTitle" msprop:Generator_ColumnPropNameInTable="OriginalTitleColumn" type="xs:string" />
- <xs:attribute name="TranslatedTitle" msprop:Generator_UserColumnName="TranslatedTitle" msprop:Generator_ColumnPropNameInRow="TranslatedTitle" msprop:Generator_ColumnVarNameInTable="columnTranslatedTitle" msprop:Generator_ColumnPropNameInTable="TranslatedTitleColumn" type="xs:string" />
- <xs:attribute name="FormattedTitle" msprop:Generator_UserColumnName="FormattedTitle" msprop:Generator_ColumnPropNameInRow="FormattedTitle" msprop:Generator_ColumnVarNameInTable="columnFormattedTitle" msprop:Generator_ColumnPropNameInTable="FormattedTitleColumn" type="xs:string" />
- <xs:attribute name="Director" msprop:Generator_UserColumnName="Director" msprop:Generator_ColumnPropNameInRow="Director" msprop:Generator_ColumnVarNameInTable="columnDirector" msprop:Generator_ColumnPropNameInTable="DirectorColumn" type="xs:string" />
- <xs:attribute name="Producer" msprop:Generator_UserColumnName="Producer" msprop:Generator_ColumnPropNameInRow="Producer" msprop:Generator_ColumnVarNameInTable="columnProducer" msprop:Generator_ColumnPropNameInTable="ProducerColumn" type="xs:string" />
- <xs:attribute name="Country" msprop:Generator_UserColumnName="Country" msprop:Generator_ColumnPropNameInRow="Country" msprop:Generator_ColumnVarNameInTable="columnCountry" msprop:Generator_ColumnPropNameInTable="CountryColumn" type="xs:string" />
- <xs:attribute name="Category" msprop:Generator_UserColumnName="Category" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_ColumnPropNameInTable="CategoryColumn" type="xs:string" />
- <xs:attribute name="Year" msprop:Generator_UserColumnName="Year" msprop:Generator_ColumnPropNameInRow="Year" msprop:Generator_ColumnVarNameInTable="columnYear" msprop:Generator_ColumnPropNameInTable="YearColumn" type="xs:string" />
- <xs:attribute name="Length" msprop:Generator_UserColumnName="Length" msprop:Generator_ColumnPropNameInRow="Length" msprop:Generator_ColumnVarNameInTable="columnLength" msprop:Generator_ColumnPropNameInTable="LengthColumn" type="xs:string" />
- <xs:attribute name="Actors" msprop:Generator_UserColumnName="Actors" msprop:Generator_ColumnPropNameInRow="Actors" msprop:Generator_ColumnVarNameInTable="columnActors" msprop:Generator_ColumnPropNameInTable="ActorsColumn" type="xs:string" />
- <xs:attribute name="URL" msprop:Generator_UserColumnName="URL" msprop:Generator_ColumnVarNameInTable="columnURL" msprop:Generator_ColumnPropNameInRow="URL" msprop:Generator_ColumnPropNameInTable="URLColumn" type="xs:string" />
- <xs:attribute name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" type="xs:string" />
- <xs:attribute name="Comments" msprop:Generator_UserColumnName="Comments" msprop:Generator_ColumnPropNameInRow="Comments" msprop:Generator_ColumnVarNameInTable="columnComments" msprop:Generator_ColumnPropNameInTable="CommentsColumn" type="xs:string" />
- <xs:attribute name="VideoFormat" msprop:Generator_UserColumnName="VideoFormat" msprop:Generator_ColumnPropNameInRow="VideoFormat" msprop:Generator_ColumnVarNameInTable="columnVideoFormat" msprop:Generator_ColumnPropNameInTable="VideoFormatColumn" type="xs:string" />
- <xs:attribute name="VideoBitrate" msprop:Generator_UserColumnName="VideoBitrate" msprop:Generator_ColumnPropNameInRow="VideoBitrate" msprop:Generator_ColumnVarNameInTable="columnVideoBitrate" msprop:Generator_ColumnPropNameInTable="VideoBitrateColumn" type="xs:string" />
- <xs:attribute name="AudioFormat" msprop:Generator_UserColumnName="AudioFormat" msprop:Generator_ColumnPropNameInRow="AudioFormat" msprop:Generator_ColumnVarNameInTable="columnAudioFormat" msprop:Generator_ColumnPropNameInTable="AudioFormatColumn" type="xs:string" />
- <xs:attribute name="AudioBitrate" msprop:Generator_UserColumnName="AudioBitrate" msprop:Generator_ColumnPropNameInRow="AudioBitrate" msprop:Generator_ColumnVarNameInTable="columnAudioBitrate" msprop:Generator_ColumnPropNameInTable="AudioBitrateColumn" type="xs:string" />
- <xs:attribute name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:string" />
- <xs:attribute name="Framerate" msprop:Generator_UserColumnName="Framerate" msprop:Generator_ColumnPropNameInRow="Framerate" msprop:Generator_ColumnVarNameInTable="columnFramerate" msprop:Generator_ColumnPropNameInTable="FramerateColumn" type="xs:string" />
- <xs:attribute name="Languages" msprop:Generator_UserColumnName="Languages" msprop:Generator_ColumnVarNameInTable="columnLanguages" msprop:Generator_ColumnPropNameInRow="Languages" msprop:Generator_ColumnPropNameInTable="LanguagesColumn" type="xs:string" />
- <xs:attribute name="Subtitles" msprop:Generator_UserColumnName="Subtitles" msprop:Generator_ColumnVarNameInTable="columnSubtitles" msprop:Generator_ColumnPropNameInRow="Subtitles" msprop:Generator_ColumnPropNameInTable="SubtitlesColumn" type="xs:string" />
- <xs:attribute name="Size" msprop:Generator_UserColumnName="Size" msprop:Generator_ColumnPropNameInRow="Size" msprop:Generator_ColumnVarNameInTable="columnSize" msprop:Generator_ColumnPropNameInTable="SizeColumn" type="xs:string" />
- <xs:attribute name="Disks" msprop:Generator_UserColumnName="Disks" msprop:Generator_ColumnPropNameInRow="Disks" msprop:Generator_ColumnVarNameInTable="columnDisks" msprop:Generator_ColumnPropNameInTable="DisksColumn" type="xs:string" />
- <xs:attribute name="Picture" msprop:Generator_UserColumnName="Picture" msprop:Generator_ColumnPropNameInRow="Picture" msprop:Generator_ColumnVarNameInTable="columnPicture" msprop:Generator_ColumnPropNameInTable="PictureColumn" type="xs:string" />
- <xs:attribute name="Contents_Id" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Number" msprop:Generator_UserColumnName="Number" msprop:Generator_ColumnVarNameInTable="columnNumber" msprop:Generator_ColumnPropNameInRow="Number" msprop:Generator_ColumnPropNameInTable="NumberColumn" type="xs:int" />
+ <xs:attribute name="Checked" msprop:Generator_UserColumnName="Checked" msprop:Generator_ColumnVarNameInTable="columnChecked" msprop:Generator_ColumnPropNameInRow="Checked" msprop:Generator_ColumnPropNameInTable="CheckedColumn" type="xs:string" />
+ <xs:attribute name="MediaLabel" msprop:Generator_UserColumnName="MediaLabel" msprop:Generator_ColumnPropNameInRow="MediaLabel" msprop:Generator_ColumnVarNameInTable="columnMediaLabel" msprop:Generator_ColumnPropNameInTable="MediaLabelColumn" type="xs:string" />
+ <xs:attribute name="MediaType" msprop:Generator_UserColumnName="MediaType" msprop:Generator_ColumnVarNameInTable="columnMediaType" msprop:Generator_ColumnPropNameInRow="MediaType" msprop:Generator_ColumnPropNameInTable="MediaTypeColumn" type="xs:string" />
+ <xs:attribute name="Source" msprop:Generator_UserColumnName="Source" msprop:Generator_ColumnPropNameInRow="Source" msprop:Generator_ColumnVarNameInTable="columnSource" msprop:Generator_ColumnPropNameInTable="SourceColumn" type="xs:string" />
+ <xs:attribute name="Date" msprop:Generator_UserColumnName="Date" msprop:Generator_ColumnVarNameInTable="columnDate" msprop:Generator_ColumnPropNameInRow="Date" msprop:Generator_ColumnPropNameInTable="DateColumn" type="xs:string" />
+ <xs:attribute name="Borrower" msprop:Generator_UserColumnName="Borrower" msprop:Generator_ColumnVarNameInTable="columnBorrower" msprop:Generator_ColumnPropNameInRow="Borrower" msprop:Generator_ColumnPropNameInTable="BorrowerColumn" type="xs:string" />
+ <xs:attribute name="Rating" msprop:Generator_UserColumnName="Rating" msprop:Generator_ColumnVarNameInTable="columnRating" msprop:Generator_ColumnPropNameInRow="Rating" msprop:Generator_ColumnPropNameInTable="RatingColumn" type="xs:decimal" />
+ <xs:attribute name="OriginalTitle" msprop:Generator_UserColumnName="OriginalTitle" msprop:Generator_ColumnVarNameInTable="columnOriginalTitle" msprop:Generator_ColumnPropNameInRow="OriginalTitle" msprop:Generator_ColumnPropNameInTable="OriginalTitleColumn" type="xs:string" />
+ <xs:attribute name="TranslatedTitle" msprop:Generator_UserColumnName="TranslatedTitle" msprop:Generator_ColumnVarNameInTable="columnTranslatedTitle" msprop:Generator_ColumnPropNameInRow="TranslatedTitle" msprop:Generator_ColumnPropNameInTable="TranslatedTitleColumn" type="xs:string" />
+ <xs:attribute name="FormattedTitle" msprop:Generator_UserColumnName="FormattedTitle" msprop:Generator_ColumnVarNameInTable="columnFormattedTitle" msprop:Generator_ColumnPropNameInRow="FormattedTitle" msprop:Generator_ColumnPropNameInTable="FormattedTitleColumn" type="xs:string" />
+ <xs:attribute name="Director" msprop:Generator_UserColumnName="Director" msprop:Generator_ColumnVarNameInTable="columnDirector" msprop:Generator_ColumnPropNameInRow="Director" msprop:Generator_ColumnPropNameInTable="DirectorColumn" type="xs:string" />
+ <xs:attribute name="Producer" msprop:Generator_UserColumnName="Producer" msprop:Generator_ColumnVarNameInTable="columnProducer" msprop:Generator_ColumnPropNameInRow="Producer" msprop:Generator_ColumnPropNameInTable="ProducerColumn" type="xs:string" />
+ <xs:attribute name="Country" msprop:Generator_UserColumnName="Country" msprop:Generator_ColumnVarNameInTable="columnCountry" msprop:Generator_ColumnPropNameInRow="Country" msprop:Generator_ColumnPropNameInTable="CountryColumn" type="xs:string" />
+ <xs:attribute name="Category" msprop:Generator_UserColumnName="Category" msprop:Generator_ColumnVarNameInTable="columnCategory" msprop:Generator_ColumnPropNameInRow="Category" msprop:Generator_ColumnPropNameInTable="CategoryColumn" type="xs:string" />
+ <xs:attribute name="Year" msprop:Generator_UserColumnName="Year" msprop:Generator_ColumnVarNameInTable="columnYear" msprop:Generator_ColumnPropNameInRow="Year" msprop:Generator_ColumnPropNameInTable="YearColumn" type="xs:string" />
+ <xs:attribute name="Length" msprop:Generator_UserColumnName="Length" msprop:Generator_ColumnVarNameInTable="columnLength" msprop:Generator_ColumnPropNameInRow="Length" msprop:Generator_ColumnPropNameInTable="LengthColumn" type="xs:string" />
+ <xs:attribute name="Actors" msprop:Generator_UserColumnName="Actors" msprop:Generator_ColumnVarNameInTable="columnActors" msprop:Generator_ColumnPropNameInRow="Actors" msprop:Generator_ColumnPropNameInTable="ActorsColumn" type="xs:string" />
+ <xs:attribute name="URL" msprop:Generator_UserColumnName="URL" msprop:Generator_ColumnPropNameInRow="URL" msprop:Generator_ColumnVarNameInTable="columnURL" msprop:Generator_ColumnPropNameInTable="URLColumn" type="xs:string" />
+ <xs:attribute name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" type="xs:string" />
+ <xs:attribute name="Comments" msprop:Generator_UserColumnName="Comments" msprop:Generator_ColumnVarNameInTable="columnComments" msprop:Generator_ColumnPropNameInRow="Comments" msprop:Generator_ColumnPropNameInTable="CommentsColumn" type="xs:string" />
+ <xs:attribute name="VideoFormat" msprop:Generator_UserColumnName="VideoFormat" msprop:Generator_ColumnVarNameInTable="columnVideoFormat" msprop:Generator_ColumnPropNameInRow="VideoFormat" msprop:Generator_ColumnPropNameInTable="VideoFormatColumn" type="xs:string" />
+ <xs:attribute name="VideoBitrate" msprop:Generator_UserColumnName="VideoBitrate" msprop:Generator_ColumnVarNameInTable="columnVideoBitrate" msprop:Generator_ColumnPropNameInRow="VideoBitrate" msprop:Generator_ColumnPropNameInTable="VideoBitrateColumn" type="xs:string" />
+ <xs:attribute name="AudioFormat" msprop:Generator_UserColumnName="AudioFormat" msprop:Generator_ColumnVarNameInTable="columnAudioFormat" msprop:Generator_ColumnPropNameInRow="AudioFormat" msprop:Generator_ColumnPropNameInTable="AudioFormatColumn" type="xs:string" />
+ <xs:attribute name="AudioBitrate" msprop:Generator_UserColumnName="AudioBitrate" msprop:Generator_ColumnVarNameInTable="columnAudioBitrate" msprop:Generator_ColumnPropNameInRow="AudioBitrate" msprop:Generator_ColumnPropNameInTable="AudioBitrateColumn" type="xs:string" />
+ <xs:attribute name="Resolution" msprop:Generator_UserColumnName="Resolution" msprop:Generator_ColumnVarNameInTable="columnResolution" msprop:Generator_ColumnPropNameInRow="Resolution" msprop:Generator_ColumnPropNameInTable="ResolutionColumn" type="xs:string" />
+ <xs:attribute name="Framerate" msprop:Generator_UserColumnName="Framerate" msprop:Generator_ColumnVarNameInTable="columnFramerate" msprop:Generator_ColumnPropNameInRow="Framerate" msprop:Generator_ColumnPropNameInTable="FramerateColumn" type="xs:string" />
+ <xs:attribute name="Languages" msprop:Generator_UserColumnName="Languages" msprop:Generator_ColumnPropNameInRow="Languages" msprop:Generator_ColumnVarNameInTable="columnLanguages" msprop:Generator_ColumnPropNameInTable="LanguagesColumn" type="xs:string" />
+ <xs:attribute name="Subtitles" msprop:Generator_UserColumnName="Subtitles" msprop:Generator_ColumnPropNameInRow="Subtitles" msprop:Generator_ColumnVarNameInTable="columnSubtitles" msprop:Generator_ColumnPropNameInTable="SubtitlesColumn" type="xs:string" />
+ <xs:attribute name="Size" msprop:Generator_UserColumnName="Size" msprop:Generator_ColumnVarNameInTable="columnSize" msprop:Generator_ColumnPropNameInRow="Size" msprop:Generator_ColumnPropNameInTable="SizeColumn" type="xs:string" />
+ <xs:attribute name="Disks" msprop:Generator_UserColumnName="Disks" msprop:Generator_ColumnVarNameInTable="columnDisks" msprop:Generator_ColumnPropNameInRow="Disks" msprop:Generator_ColumnPropNameInTable="DisksColumn" type="xs:string" />
+ <xs:attribute name="Picture" msprop:Generator_UserColumnName="Picture" msprop:Generator_ColumnVarNameInTable="columnPicture" msprop:Generator_ColumnPropNameInRow="Picture" msprop:Generator_ColumnPropNameInTable="PictureColumn" type="xs:string" />
+ <xs:attribute name="Contents_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="Contents_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
- <xs:attribute name="Catalog_Id" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Contents_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Contents_Id" msprop:Generator_ColumnVarNameInTable="columnContents_Id" msprop:Generator_ColumnPropNameInRow="Contents_Id" msprop:Generator_ColumnPropNameInTable="Contents_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
+ <xs:attribute name="Catalog_Id" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:sequence>
- <xs:attribute name="AntMovieCatalog_Id" msprop:Generator_UserColumnName="AntMovieCatalog_Id" msprop:Generator_ColumnPropNameInRow="AntMovieCatalog_Id" msprop:Generator_ColumnVarNameInTable="columnAntMovieCatalog_Id" msprop:Generator_ColumnPropNameInTable="AntMovieCatalog_IdColumn" type="xs:int" use="prohibited" />
- <xs:attribute name="Catalog_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
+ <xs:attribute name="AntMovieCatalog_Id" msprop:Generator_UserColumnName="AntMovieCatalog_Id" msprop:Generator_ColumnVarNameInTable="columnAntMovieCatalog_Id" msprop:Generator_ColumnPropNameInRow="AntMovieCatalog_Id" msprop:Generator_ColumnPropNameInTable="AntMovieCatalog_IdColumn" type="xs:int" use="prohibited" />
+ <xs:attribute name="Catalog_Id" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="Catalog_Id" msprop:Generator_ColumnVarNameInTable="columnCatalog_Id" msprop:Generator_ColumnPropNameInRow="Catalog_Id" msprop:Generator_ColumnPropNameInTable="Catalog_IdColumn" type="xs:int" msdata:AllowDBNull="false" use="prohibited" />
</xs:complexType>
</xs:element>
</xs:choice>
Modified: trunk/plugins/MyFilms/MesFilms.cs
===================================================================
--- trunk/plugins/MyFilms/MesFilms.cs 2007-09-07 23:59:25 UTC (rev 905)
+++ trunk/plugins/MyFilms/MesFilms.cs 2007-09-08 16:11:27 UTC (rev 906)
@@ -50,9 +50,13 @@
/// </summary>
public class MesFilms : GUIWindow, ISetupForm
{
+
+ private BaseMesFilms films;
+
#region Descriptif zones Ecran
- const int ID_MesFilmsDetail = 7987;
+ public const int ID_MesFilms = 7986;
+ public const int ID_MesFilmsDetail = 7987;
enum Controls : int
{
@@ -62,12 +66,16 @@
CTRL_BtnSearchA = 5,
CTRL_BtnLayout = 6,
CTRL_TxtSelect = 12,
- CTRL_BtnStop = 319,
- CTRL_BtnPause = 315,
- CTRL_BtnBack = 312,
- CTRL_BtnSuiv = 322,
- CTRL_BtnRewind = 313,
- CTRL_BtnForward = 323,
+ CTRL_LblList = 20,
+ CTRL_LblIcons = 21,
+ CTRL_LblBigIcons = 22,
+ CTRL_LblFilmStrip = 23,
+ //CTRL_BtnStop = 319,
+ //CTRL_BtnPause = 315,
+ //CTRL_BtnBack = 312,
+ //CTRL_BtnSuiv = 322,
+ //CTRL_BtnRewind = 313,
+ //CTRL_BtnForward = 323,
CTRL_List = 1026,
CTRL_Image = 1020,
CTRL_Image2 = 1021,
@@ -75,21 +83,21 @@
CTRL_TxtGenre = 1024,
CTRL_Texte = 1025,
CTRL_Title = 1027,
- CTRL_ImgGrStar1 = 1051,
- CTRL_ImgGrStar2 = 1052,
- CTRL_ImgGrStar3 = 1053,
- CTRL_ImgGrStar4 = 1054,
- CTRL_ImgGrStar5 = 1055,
- CTRL_ImgHStar1 = 1056,
- CTRL_ImgHStar2 = 1057,
- CTRL_ImgHStar3 = 1058,
- CTRL_ImgHStar4 = 1059,
- CTRL_ImgHStar5 = 1060,
- CTRL_ImgStar1 = 1061,
- CTRL_ImgStar2 = 1062,
- CTRL_ImgStar3 = 1063,
- CTRL_ImgStar4 = 1064,
- CTRL_ImgStar5 = 1065,
+ //CTRL_ImgGrStar1 = 1051,
+ //CTRL_ImgGrStar2 = 1052,
+ //CTRL_ImgGrStar3 = 1053,
+ //CTRL_ImgGrStar4 = 1054,
+ //CTRL_ImgGrStar5 = 1055,
+ //CTRL_ImgHStar1 = 1056,
+ //CTRL_ImgHStar2 = 1057,
+ //CTRL_ImgHStar3 = 1058,
+ //CTRL_ImgHStar4 = 1059,
+ //CTRL_ImgHStar5 = 1060,
+ //CTRL_ImgStar1 = 1061,
+ //CTRL_ImgStar2 = 1062,
+ //CTRL_ImgStar3 = 1063,
+ //CTRL_ImgStar4 = 1064,
+ //CTRL_ImgStar5 = 1065,
CTRL_NbObjects = 2073
}
[SkinControlAttribute((int)Controls.CTRL_TxtSelect)]
@@ -113,52 +121,10 @@
[SkinControlAttribute((int)Controls.CTRL_Image2)]
protected GUIImage ImgLstFilm2 = null;
public int Layout = 0;
-
- int Ctrl_DspImage;
- int Ctrl_DspImage2;
- bool boolselect = false;
- string StrSelect = null;
- string StrTitleSelect = null;
- string StrFilmSelect = "";
- string StrSort = null;
- string StrActors = "";
- string StrTxtSelect = "";
- string StrStorage = null;
- string StrIdentItem = null;
- string StrSort1 = null;
- string StrTSort1 = null;
- string StrTitle1 = null;
- string StrViewItem1 = null;
- string StrViewText1 = null;
- string StrViewItem2 = null;
- string StrViewText2 = null;
- string StrViewDfltItem = null;
- string StrViewDfltText = null;
- string StrFileXml = null;
- string StrFileType = null;
- string StrPathImg = null;
- string StrSortSens = null;
- int StrLayOut = 0;
- public string WStrSort = "";
- public string WStrSelect = null;
- public string WStrSortSens = null;
- public bool boolreturn = false;
- public bool boolstorage = false;
- string wselectedlabel = "";
- string StrDfltSelect = null;
- string CurrentSortMethod = null;
- decimal w_rating = 0;
- int l_index = 0;
- string l_title = "";
- string FileImage = "9999";
- AntMovieCatalog mydivx =new AntMovieCatalog();
- private string StrPluginName = "Films";
- private string CurrentConfig;
- private int NbConfig;
- string TitleDelim = null;
- string Wstar;
- private int LastID = 0;
+ public static Configuration conf;
+ private string currentConfig;
+ private string strPluginName;
#endregion
#region events
@@ -223,7 +189,7 @@
}
public bool GetHome(out string strButtonText, out string strButtonImage, out string strButtonImageFocus, out string strPictureImage)
{
- string wPluginName = StrPluginName;
+ string wPluginName = strPluginName;
using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
{
wPluginName = xmlreader.GetValueAsString("MyFilms", "PluginName", "My Films");
@@ -241,14 +207,7 @@
}
public override int GetID
{
- get
- {
- return 7986;
- }
- set
- {
- base.GetID = value;
- }
+ get {return ID_MesFilms;}
}
public override bool Init()
@@ -266,21 +225,21 @@
{
if (actionType.wID == Action.ActionType.ACTION_PARENT_DIR)
if (GetPrevFilmList()) return;
-
-
- if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolselect))
+
+
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (conf.Boolselect))
{
Change_LayOut(Layout);
if (GetPrevFilmList()) return;
}
- if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (boolreturn))
+ if ((actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) && (conf.Boolreturn))
{
- boolreturn = false;
- Change_view(WStrSort);
+ conf.Boolreturn = false;
+ Change_view(conf.WStrSort);
return;
}
if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU)
- if (GetPrevFilmList())
+ if (GetPrevFilmList())
return;
base.OnAction(actionType);
}
@@ -299,65 +258,27 @@
//---------------------------------------------------------------------------------------
base.OnMessage(messageType);
- g_Player.PlayBackStopped += new MediaPortal.Player.g_Player.StoppedHandler(OnPlayBackStopped);
- g_Player.PlayBackEnded += new MediaPortal.Player.g_Player.EndedHandler(OnPlayBackEnded);
- if (g_Player.Playing)
- affich_overlay();
- else
- supprim_overlay();
- using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings(Config.GetFile(Config.Dir.Config, "MyFilms.xml")))
+ if (PreviousWindowId != ID_MesFilmsDetail)
{
- if (PreviousWindowId == ID_MesFilmsDetail)
- {
- CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
- Load_Config(CurrentConfig ,false);
- Fin_Charge_Init(false);
- }
- else
- {
- NbConfig = xmlreader.GetValueAsInt("MyFilms", "NbConfig", 0);
- if (NbConfig == 0)
- {
- GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK);
- dlgOk.SetHeading(3);//my videos
- dlgOk.SetLine(1, "No Configuration defined");
- dlgOk.SetLine(2, "Please enter setup first");
- dlgOk.DoModal(GetID);
- GUIWindowManager.ShowPreviousWindow();
- }
- bool boolchoice = true;
- if (CurrentConfig == "")
- CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Current_Config", "");
-
- if (!(xmlreader.GetValueAsBool("MyFilms", "Menu_Config", false)))
- CurrentConfig = xmlreader.GetValueAsString("MyFilms", "Default_Config", "");
- else
- CurrentConfig = "";
- if (CurrentConfig == "")
- {
- boolchoice = false;
- CurrentConfig = Choice_Config(); // "" => user esc's dialog on plugin startup so exit plugin unchanged
- }
- CurrentConfig = Control_Access_Config(CurrentConfig);
- if ((CurrentConfig == "") && (NbConfig > 1) && (boolchoice)) //error password ? so if many config => choice config menu
- CurrentConfig = Choice_Config();
- if (CurrentConfig == "") //continuing here with CurrentConfig = "" will cause exception in GuiWindowManager.cs so exit plugin
- GUIWindowManager.ShowPreviousWindow();
- else
- {
- if (CurrentConfig.Length == 0)
- GUIWindowManager.ShowPreviousWindow();
- Load_Config(CurrentConfig, true);
- Fin_Charge_Init(false);
- }
- }
+ Configuration.Current_Config();
+ Load_Config(Configuration.CurrentConfig, true);
}
+
+ if (Configuration.CurrentConfig.Length == 0)
+ GUIWindowManager.ShowPreviousWindow();
+
+ Fin_Charge_Init(false);
return true;
case GUIMessage.MessageType.GUI_MSG_WINDOW_DEINIT: //called when exiting plugin either by prev menu or pressing home button
- if (CurrentConfig != "") save_config_values();
- mydivx.Clear();
- mydivx.Dispose();
+ if (Configuration.CurrentConfig != "")
+ conf.StrLayOut = Layout;
+ if (facadeView.SelectedListItemIndex == -1)
+ Configuration.SaveConfiguration(Configuration.CurrentConfig, -1, "");
+ else
+ Configuration.SaveConfiguration(Configuration.CurrentConfig, facadeView.SelectedListItem.ItemId, facadeView.SelectedListItem.Label);
+ //mydivx.Clear();
+ //mydivx.Dispose();
facadeView.Clear();
facadeView.FreeResources();
return true; // fall through to call base class?
@@ -366,7 +287,7 @@
//---------------------------------------------------------------------------------------
// Display Informations about List Item
//---------------------------------------------------------------------------------------
- if ((iControl == (int)Controls.CTRL_List) && !(boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
+ if ((iControl == (int)Controls.CTRL_List) && !(conf.Boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
{
if (facadeView.SelectedListItemIndex > -1)
{
@@ -381,49 +302,51 @@
}
else
{
- masquage_Lstdetail();
+ GUIControl.ShowControl(GetID, 34);
+ affichage_rating(0);
}
}
base.OnMessage(messageType);
return true;
- case GUIMessage.MessageType.GUI_MSG_SETFOCUS:
- //---------------------------------------------------------------------------------------
- // Hide Informations about List Item
- //---------------------------------------------------------------------------------------
- if ((iControl == 0) && (dControl == (int)Controls.CTRL_List))
- {
- base.OnMessage(messageType);
- return true;
- }
- if ((dControl == (int)Controls.CTRL_List) && !(boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
- {
- if (facadeView.SelectedListItemIndex > -1)
- {
- affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
- }
- }
- else
- if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
- {
- affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
- }
- else
- {
- masquage_Lstdetail();
- }
- base.OnMessage(messageType);
- return true;
+ //case GUIMessage.MessageType.GUI_MSG_SETFOCUS:
+ // //---------------------------------------------------------------------------------------
+ // // Hide Informations about List Item
+ // //---------------------------------------------------------------------------------------
+ // if ((iControl == 0) && (dControl == (int)Controls.CTRL_List))
+ // {
+ // base.OnMessage(messageType);
+ // return true;
+ // }
+ // if ((dControl == (int)Controls.CTRL_List) && !(conf.Boolselect || (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder))) //xxxx
+ // {
+ // if (facadeView.SelectedListItemIndex > -1)
+ // {
+ // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label);
+ // }
+ // }
+ // else
+ // if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder)
+ // {
+ // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label);
+ // }
+ // else
+ // {
+ // GUIControl.ShowControl(GetID, 34);
+ //affichage_rating(0);
+ // }
+ // base.OnMessage(messageType);
+ // return true;
case GUIMessage.MessageType.GUI_MSG_CLICKED:
//---------------------------------------------------------------------------------------
// Mouse/Keyboard Clicked
//---------------------------------------------------------------------------------------
- if ((iControl == (int)Controls.CTRL_BtnSrtBy) && (boolselect))
+ if ((iControl == (int)Controls.CTRL_BtnSrtBy) && (conf.Boolselect))
// No change sort method and no searchs during select
return true;
- if ((iControl == (int)Controls.CTRL_BtnSearchT) || (iControl == (int)Controls.CTRL_BtnSearchA) && (boolselect))
- boolselect = false;
+ if ((iControl == (int)Controls.CTRL_BtnSearchT) || (iControl == (int)Controls.CTRL_BtnSearchA) && (conf.Boolselect))
+ conf.Boolselect = false;
if (iControl == (int)Controls.CTRL_BtnSearchT)
// Search by Title
{
@@ -436,9 +359,9 @@
{
if (control_searchText(keyboard.Text))
{
- StrSelect = StrTitle1.ToString() + " like '*" + keyboard.Text + "*'";
- StrTxtSelect = "Selection " + GUILocalizeStrings.Get(369) + " [*" + keyboard.Text + @"*]";
- StrTitleSelect = "";
+ conf.StrSelect = conf.StrTitle1.ToString() + " like '*" + keyboard.Text + "*'";
+ conf.StrTxtSelect = "Selection " + GUILocalizeStrings.Get(369) + " [*" + keyboard.Text + @"*]";
+ conf.StrTitleSelect = "";
GetFilmList();
}
else
@@ -459,12 +382,12 @@
if (control_searchText(keyboard.Text))
{
Change_LayOut(0);
- WStrSort = "ACTORS";
- wselectedlabel = "";
- WStrSortSens = " ASC";
+ conf.WStrSort = "ACTORS";
+ conf.Wselectedlabel = "";
+ conf.WStrSortSens = " ASC";
BtnSrtBy.IsAscending = true;
- StrActors = keyboard.Text;
- getSelectFromDivx("Actors like '*" + keyboard.Text + "*'", WStrSort, WStrSortSens, keyboard.Text, true, "");
+ conf.StrActors = keyboard.Text;
+ getSelectFromDivx("Actors like '*" + keyboard.Text + "*'", conf.WStrSort, conf.WStrSortSens, keyboard.Text, true, "");
}
else
return false;
@@ -474,51 +397,51 @@
if (iControl == (int)Controls.CTRL_BtnSrtBy)
// Change Sort Method
{
- l_index = 0;
- switch (StrSort)
+ conf.StrIndex = 0;
+ switch (conf.StrSort)
{
case "TranslatedTitle":
case "OriginalTitle":
case "FormattedTitle":
- CurrentSortMethod = GUILocalizeStrings.Get(366);
- StrSort = "YEAR";
- StrSortSens = " DESC";
+ conf.CurrentSortMethod = GUILocalizeStrings.Get(366);
+ conf.StrSort = "YEAR";
+ conf.StrSortSens = " DESC";
break;
case "YEAR":
- CurrentSortMethod = GUILocalizeStrings.Get(621);
- StrSort = "DateAdded";
- StrSortSens = " DESC";
+ conf.CurrentSortMethod = GUILocalizeStrings.Get(621);
+ conf.StrSort = "DateAdded";
+ conf.StrSortSens = " DESC";
break;
case "DateAdded":
- CurrentSortMethod = GUILocalizeStrings.Get(367);
- StrSort = "RATING";
- StrSortSens = " DESC";
+ conf.CurrentSortMethod = GUILocalizeStrings.Get(367);
+ conf.StrSort = "RATING";
+ conf.StrSortSens = " DESC";
break;
case "RATING":
- if (StrSort1 != "(none)")
+ if (conf.StrSort1 != "(none)")
{
- CurrentSortMethod = StrTSort1;
- StrSort = StrSort1;
- StrSortSens = " ASC";
+ conf.CurrentSortMethod = conf.StrTSort1;
+ conf.StrSort = conf.StrSort1;
+ conf.StrSortSens = " ASC";
}
else
{
- CurrentSortMethod = GUILocalizeStrings.Get(103);
- StrSort = StrTitle1;
- StrSortSens = " ASC";
+ conf.CurrentSortMethod = GUILocalizeStrings.Get(103);
+ conf.StrSort = conf.StrTitle1;
+ conf.StrSortSens = " ASC";
}
break;
default:
- CurrentSortMethod = GUILocalizeStrings.Get(103);
- StrSort = StrTitle1;
- StrSortSens = " ASC";
+ conf.CurrentSortMethod = GUILocalizeStrings.Get(103);
+ conf.StrSort = conf.StrTitle1;
+ conf.StrSortSens = " ASC";
break;
}
- BtnSrtBy.Label = CurrentSortMethod;
- if (!boolselect)
+ BtnSrtBy.Label = conf.CurrentSortMethod;
+ if (!conf.Boolselect)
GetFilmList();
else
- getSelectFromDivx(StrTitle1.ToString() + " not like ''", StrSort, StrSortSens, "*", true, "");
+ getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", conf.StrSort, conf.StrSortSens, "*", true, "");
return true;
}
if (iControl == (int)Controls.CTRL_BtnViewAs)
@@ -527,60 +450,41 @@
Selection_type_Video();
return base.OnMessage(messageType);
}
- if ((iControl == (int)Controls.CTRL_BtnLayout) && !boolselect)
+ if ((iControl == (int)Controls.CTRL_BtnLayout) && !conf.Boolselect)
// Change Layout View
{
- if (Layout == 1)
- {
- GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417));
- facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
- Layout = 2;
- }
- else if (Layout == 2)
- {
- GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101));
- facadeView.View = GUIFacadeControl.ViewMode.List;
- // Layout = 3;
- //}
- //else if (Layout == 3)
- //{
- // GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(733));
- // facadeView.View = GUIFacadeControl.ViewMode.Filmstrip;
+ if (Layout == 3)
Layout = 0;
- }
else
- {
- GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(100));
- facadeView.View = GUIFacadeControl.ViewMode.SmallIcons;
- Layout = 1;
- }
+ Layout = Layout + 1;
+ Change_LayOut(Layout);
GetFilmList();
return base.OnMessage(messageType);
}
-
+
if (iControl == (int)Controls.CTRL_List)
{
if (facadeView.SelectedListItemIndex > -1)
{
- if (!facadeView.SelectedListItem.IsFolder && !boolselect)
+ if (!facadeView.SelectedListItem.IsFolder && !conf.Boolselect)
// New Window for detailed selected item information
{
- //l_index = facadeView.SelectedListItemIndex;
- //save_config_values();
- mydivx.Clear();
+ conf.StrIndex = facadeView.SelectedListItemIndex;
GUIWindowManager.ActivateWindow(ID_MesFilmsDetail);
}
else
// View List as selected
{
- wselectedlabel = facadeView.SelectedListItem.Label;
+ conf.Wselectedlabel = facadeView.SelectedListItem.Label;
Change_LayOut(Layout);
- if (!facadeView.SelectedListItem.IsFolder)
- boolreturn = true;
+ if (facadeView.SelectedListItem.IsFolder)
+ conf.Boolreturn = false;
+ else
+ conf.Boolreturn = true;
do
{
- if (StrTitleSelect != "") StrTitleSelect += TitleDelim;
- StrTitleSelect += wselectedlabel;
+ if (conf.StrTitleSelect != "") conf.StrTitleSelect += conf.TitleDelim;
+ conf.StrTitleSelect += conf.Wselectedlabel;
} while (GetFilmList() == false); //keep calling while single folders found
}
}
@@ -595,49 +499,49 @@
/// <summary>Jumps to prev folder in FilmList by modifying Selects and calling GetFilmList</summary>
/// <returns>If returns false means cannot jump back any further, so caller must exit plugin to main menu.</returns>
bool GetPrevFilmList()
- {
+ {
string SelItem;
- if (StrTitleSelect == "")
+ if (conf.StrTitleSelect == "")
{
- if (NewString.Left(StrTxtSelect, 9) == "Selection" || (StrTxtSelect == "" && boolselect)) //original code block refactored
+ if (NewString.Left(conf.StrTxtSelect, 9) == "Selection" || (conf.StrTxtSelect == "" && conf.Boolselect)) //original code block refactored
{//jump back to main full list
- boolselect = false;
- StrSelect = StrTxtSelect = "";
- l_index = 0;
+ conf.Boolselect = false;
+ conf.StrSelect = conf.StrTxtSelect = "";
+ conf.StrIndex = 0;
GetFilmList();
return true;
}
- if (StrTxtSelect == "")
+ if (conf.StrTxtSelect == "")
{
return false;
}
else
{ // Jump back to prev view_display (categorised by year, genre etc)
- if (WStrSort == "ACTORS")
+ if (conf.WStrSort == "ACTORS")
{
- StrSelect = "Actors like '*" + StrActors + "*'";
- StrTxtSelect = "Selection";
- getSelectFromDivx("Actors like '*" + StrActors + "*'", WStrSort, WStrSortSens, StrActors, true, "");
+ conf.StrSelect = "Actors like '*" + conf.StrActors + "*'";
+ conf.StrTxtSelect = "Selection";
+ getSelectFromDivx("Actors like '*" + conf.StrActors + "*'", conf.WStrSort, conf.WStrSortSens, conf.StrActors, true, "");
}
else
{
- SelItem = NewString.StripChars(@"[]", StrTxtSelect);
- if (WStrSort == "DateAdded")
- getSelectFromDivx(StrTitle1.ToString() + " not like ''", "Date", " DESC", "*", true, SelItem);
+ SelItem = NewString.StripChars(@"[]", conf.StrTxtSelect);
+ if (conf.WStrSort == "DateAdded")
+ getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", "Date", " DESC", "*", true, SelItem);
else
- getSelectFromDivx(StrTitle1.ToString() + " not like ''", WStrSort, WStrSortSens, "*", true, SelItem);
- StrSelect = "";
+ getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", conf.WStrSort, conf.WStrSortSens, "*", true, SelItem);
+ conf.StrSelect = "";
}
}
}
else
{
- SelItem = NewString.NPosRight(TitleDelim, StrTitleSelect, -1, false, false); // get last substring
- if (NewString.PosCount(TitleDelim, StrTitleSelect, false) > 0)
- StrTitleSelect = NewString.NPosLeft(TitleDelim, StrTitleSelect, -1, false, false); //jump back a delim
+ SelItem = NewString.NPosRight(conf.TitleDelim, conf.StrTitleSelect, -1, false, false); // get last substring
+ if (NewString.PosCount(conf.TitleDelim, conf.StrTitleSelect, false) > 0)
+ conf.StrTitleSelect = NewString.NPosLeft(conf.TitleDelim, conf.StrTitleSelect, -1, false, false); //jump back a delim
else
- StrTitleSelect = "";
+ conf.StrTitleSelect = "";
if (GetFilmList(SelItem) == false) // if single folder then call this func to jump back again
return GetPrevFilmList();
}
@@ -646,38 +550,38 @@
/// <summary>Sets StrFilmSelect up based on StrSelect, StrTitleSelect etc... </summary>
void SetFilmSelect()
- {
- string s="";
+ {
+ string s = ...
[truncated message content] |
|
From: <gre...@us...> - 2007-09-07 23:59:28
|
Revision: 905
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=905&view=rev
Author: gregmac45
Date: 2007-09-07 16:59:25 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Added LiveVideo, break, and rocketboom support
Added more info on the trailer page
Modified Paths:
--------------
trunk/plugins/OnlineVideos/OnlineVideoSites.xml
trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
trunk/plugins/OnlineVideos/Source/OnlineVideos.sln
Modified: trunk/plugins/OnlineVideos/OnlineVideoSites.xml
===================================================================
--- trunk/plugins/OnlineVideos/OnlineVideoSites.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/OnlineVideoSites.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<settings>
+<settings>
<sites>
<site>
<name>YouTube</name>
<id>1</id>
- <user></user>
- <password></password>
+ <user>
+ </user>
+ <password>
+ </password>
<confirm>no</confirm>
<enabled>yes</enabled>
<rss name="Top Rated"><![CDATA[http://youtube.com/rss/global/top_rated.rss]]></rss>
@@ -24,8 +26,10 @@
<site>
<name>Google Video</name>
<id>2</id>
- <user></user>
- <password></password>
+ <user>
+ </user>
+ <password>
+ </password>
<confirm>no</confirm>
<enabled>yes</enabled>
<rss name="Popular"><![CDATA[http://video.google.com/videofeed?type=popular&num=100&output=rss]]></rss>
@@ -229,10 +233,6 @@
<enabled>yes</enabled>
<rss name="All Trailers"><![CDATA[%]]></rss>
<rss name="New Trailers"><![CDATA[http://www.apple.com/moviesxml/h/view1_all.xml]]></rss>
- <rss name="Weekend Box Office"><![CDATA[http://www.apple.com/moviesxml/h/boxoffice_include.xml]]></rss>
- <rss name="Opening This Week"><![CDATA[http://www.apple.com/moviesxml/h/openings_include.xml]]></rss>
- <rss name="Exclusives"><![CDATA[http://www.apple.com/moviesxml/h/view1a_include.xml]]></rss>
- <rss name="Featured HD"><![CDATA[http://www.apple.com/moviesxml/h/view3a_include.xml]]></rss>
<rss name="Action and Adventure"><![CDATA[http://movies.apple.com/moviesxml/g/action_and_adventure_1.xml]]></rss>
<rss name="Comedy"><![CDATA[http://movies.apple.com/moviesxml/g/comedy_1.xml]]></rss>
<rss name="Documentary"><![CDATA[http://movies.apple.com/moviesxml/g/documentary_1.xml]]></rss>
@@ -269,6 +269,13 @@
<rss name="Search"><![CDATA[%{0}]]></rss>
</site>
<site>
+ <name>RocketBoom</name>
+ <id>17</id>
+ <enabled>yes</enabled>
+ <rss name="Daily(wmv)"><![CDATA[http://www.rocketboom.com/vlog/win_media_player_daily_enclosures.xml]]></rss>
+ <rss name="Daily(mov)"><![CDATA[http://www.rocketboom.com/vlog/index.xml]]></rss>
+ </site>
+ <site>
<name>Stage6</name>
<id>18</id>
<user>
@@ -289,6 +296,42 @@
<rss name="G4TV"><![CDATA[http://stage6.divx.com/rss/channel/channel:G4TV]]></rss>
<rss name="CommandN"><![CDATA[http://stage6.divx.com/rss/channel/channel:commandN]]></rss>
</site>
+ <site>
+ <id>21</id>
+ <name>Live Video</name>
+ <enabled>yes</enabled>
+ <rss name="Featured Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=Featured]]></rss>
+ <rss name="New Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=Newest]]></rss>
+ <rss name="Most Viewed Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostViewed]]></rss>
+ <rss name="Most Discussed Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostDiscussed]]></rss>
+ <rss name="Most Hit Votes Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostHit]]></rss>
+ <rss name="Most Miss Votes Videos"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?v=MostMiss]]></rss>
+ <rss name="Arts & Animation"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=1]]></rss>
+ <rss name="Auto & Vehicles"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=6]]></rss>
+ <rss name="Comedy"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=7]]></rss>
+ <rss name="Entertainment"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=8]]></rss>
+ <rss name="Extreme"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=3]]></rss>
+ <rss name="Music"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=9]]></rss>
+ <rss name="News"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=10]]></rss>
+ <rss name="People"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=11]]></rss>
+ <rss name="Pets & Animals"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=12]]></rss>
+ <rss name="Science & Technology"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=13]]></rss>
+ <rss name="Sports"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=5]]></rss>
+ <rss name="Travel & Places"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=14]]></rss>
+ <rss name="Video Blogs"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=17]]></rss>
+ <rss name="Video Comments"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=18]]></rss>
+ <rss name="Video Games"><![CDATA[http://rss.livevideo.com/rss/rss.ashx?catid=15]]></rss>
+ </site>
+ <site>
+ <name>Break</name>
+ <id>22</id>
+ <enabled>yes</enabled>
+ <rss name="Home Page"><![CDATA[http://rss.break.com/channel/homepage/]]></rss>
+ <rss name="Movies"><![CDATA[http://rss.break.com/channel/movies/]]></rss>
+ <rss name="Top Rated"><![CDATA[http://rss.break.com/channel/topratedupdates/]></rss>
+ <rss name="Weeds"><![CDATA[http://rss.break.com/channel/weeds/]]></rss>
+ <rss name="Search"><![CDATA[http://rss.break.com/tag/{0}/]]></rss>
+ </site>
<site>
<name>Generic</name>
<id>50</id>
@@ -299,17 +342,6 @@
<confirm>no</confirm>
<enabled>no</enabled>
<rss name="MSDN"><![CDATA[http://channel9.msdn.com/rss.aspx?ShowID=1]]></rss>
- </site>
- <site>
- <name>Downloaded Videos</name>
- <id>99</id>
- <user>
- </user>
- <password>
- </password>
- <confirm>no</confirm>
- <enabled>yes</enabled>
- <rss name="Downloads"><![CDATA[C:\FlashVideos\]]></rss>
</site>
</sites>
</settings>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -6,6 +6,72 @@
<controls>
<import>common.window.xml</import>
<import>common.facade.xml</import>
+ <control>
+ <type>label</type>
+ <description>Runtime txt</description>
+ <id>54</id>
+ <posX>250</posX>
+ <posY>230</posY>
+ <label>172</label>
+ <visible>no</visible>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>year value</description>
+ <id>55</id>
+ <posX>380</posX>
+ <posY>230</posY>
+ <label>#releasedate</label>
+ <visible>no</visible>
+ <textcolor>ffffffff</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Genre txt</description>
+ <id>56</id>
+ <posX>250</posX>
+ <posY>255</posY>
+ <label>174</label>
+ <visible>no</visible>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>genre value</description>
+ <id>57</id>
+ <posX>315</posX>
+ <posY>255</posY>
+ <label>#genre</label>
+ <visible>no</visible>
+ <disabledcolor>ff808080</disabledcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Plot txt</description>
+ <id>58</id>
+ <posX>250</posX>
+ <posY>280</posY>
+ <visible>no</visible>
+ <label>Plot:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>textboxscrollup</type>
+ <description>Plot value</description>
+ <id>59</id>
+ <posX>250</posX>
+ <posY>303</posY>
+ <width>440</width>
+ <height>200</height>
+ <colordiffuse>ffffffff</colordiffuse>
+ <visible>no</visible>
+ <font>font13</font>
+ <label>#plot</label>
+ <textcolor>FFFFFFFF</textcolor>
+ </control>
+
<control>
<type>button</type>
<description>View button</description>
@@ -19,12 +85,41 @@
<label>101</label>
</control>
<control>
+ <type>button</type>
+ <description>Next button</description>
+ <id>3</id>
+ <posX>60</posX>
+ <posY>127</posY>
+ <onleft>3</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Next Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>Previous button</description>
+ <id>4</id>
+ <posX>60</posX>
+ <posY>157</posY>
+ <onleft>4</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Previous Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
<type>label</type>
<description>Title txt</description>
<id>11</id>
<posX>20</posX>
- <posY>180</posY>
- <visible>yes</visible>
+ <posY>185</posY>
+ <visible>no</visible>
<label>Title:</label>
<textcolor>ffb2d4f5</textcolor>
</control>
@@ -34,7 +129,7 @@
<description>Title txt</description>
<id>111</id>
<posX>60</posX>
- <posY>180</posY>
+ <posY>185</posY>
<visible>no</visible>
<width>160</width>
<label>#videotitle</label>
@@ -45,7 +140,7 @@
<description>Tags txt</description>
<id>12</id>
<posX>20</posX>
- <posY>200</posY>
+ <posY>205</posY>
<visible>no</visible>
<label>Tags:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -56,7 +151,7 @@
<description>Tags txt</description>
<id>121</id>
<posX>65</posX>
- <posY>200</posY>
+ <posY>205</posY>
<width>160</width>
<visible>no</visible>
<label>#tags</label>
@@ -67,7 +162,7 @@
<description>Length txt</description>
<id>13</id>
<posX>20</posX>
- <posY>220</posY>
+ <posY>225</posY>
<visible>no</visible>
<label>Length:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -78,7 +173,7 @@
<description>length txt</description>
<id>131</id>
<posX>80</posX>
- <posY>220</posY>
+ <posY>225</posY>
<width>145</width>
<visible>no</visible>
<label>#length</label>
@@ -89,7 +184,7 @@
<description>Length txt</description>
<id>14</id>
<posX>20</posX>
- <posY>240</posY>
+ <posY>245</posY>
<visible>no</visible>
<label>Description:</label>
<textcolor>ffb2d4f5</textcolor>
@@ -100,12 +195,32 @@
<type>textboxscrollup</type>
<id>141</id>
<posX>20</posX>
- <posY>260</posY>
+ <posY>265</posY>
<width>200</width>
<height>140</height>
<label>#desc</label>
<visible>no</visible>
</control>
-
+ <control>
+ <type>image</type>
+ <description>movie border</description>
+ <id>23</id>
+ <posX>96</posX>
+ <posY>208</posY>
+ <width>120</width>
+ <height>184</height>
+ <visible>no</visible>
+ <texture>playback_background.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <description>movie poster</description>
+ <id>24</id>
+ <posX>104</posX>
+ <posY>222</posY>
+ <width>101</width>
+ <height>150</height>
+ <texture>#movieposter</texture>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml 2007-09-07 23:59:25 UTC (rev 905)
@@ -7,249 +7,265 @@
<define>#selecteditem:-</define>
<define>#selecteditem2:-</define>
<controls>
- <import>common.window2.xml</import>
- <import>common.facade.xml</import>
- <control>
+ <import>common.window2.xml</import>
+ <import>common.facade.xml</import>
+
+ <control>
<type>label</type>
- <description>Runtime txt</description>
+ <description>release date txt</description>
<id>54</id>
<posX>474</posX>
- <posY>340</posY>
+ <posY>306</posY>
<label>172</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
+ </control>
+
+ <control>
<type>label</type>
- <description>Runtime value</description>
- <id>53</id>
+ <description>release date value</description>
+ <id>55</id>
<posX>1050</posX>
<posY>306</posY>
- <label>#runtime</label>
+ <label>#releasedate</label>
+ <visible>no</visible>
<textcolor>ffffffff</textcolor>
<align>right</align>
- <visible>no</visible>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
+ </control>
+
+ <control>
<type>label</type>
- <description>Runtime txt</description>
- <id>52</id>
- <posX>474</posX>
- <posY>306</posY>
- <label>299</label>
- <textcolor>ff6b7487</textcolor>
- <visible>no</visible>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- </control>
- <control>
- <type>label</type>
<description>Genre txt</description>
- <id>51</id>
+ <id>56</id>
<posX>474</posX>
- <posY>373</posY>
+ <posY>340</posY>
<label>174</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
- <control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>genre value</description>
+ <id>57</id>
+ <posX>1050</posX>
+ <posY>340</posY>
+ <label>#genre</label>
+ <disabledcolor>ff808080</disabledcolor>
+ <width>400</width>
+ <align>right</align>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
<type>label</type>
<description>Plot txt</description>
<id>58</id>
<posX>474</posX>
- <posY>406</posY>
+ <posY>373</posY>
<label>Plot:</label>
<visible>no</visible>
<textcolor>ff6b7487</textcolor>
<animation effect="fade" time="200">WindowOpen</animation>
<animation effect="fade" time="200">WindowClose</animation>
</control>
+
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>59</id>
+ <posX>474</posX>
+ <posY>404</posY>
+ <width>882</width>
+ <height>206</height>
+ <label>#trailerdesc</label>
+ <visible>yes</visible>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>View button</description>
+ <id>2</id>
+ <posX>10</posX>
+ <posY>128</posY>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <onup>17</onup>
+ <ondown>3</ondown>
+ <label>101</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
<control>
- <type>button</type>
- <description>View button</description>
- <id>2</id>
- <posX>10</posX>
- <posY>128</posY>
- <onleft>2</onleft>
- <onright>50</onright>
- <onup>17</onup>
- <ondown>3</ondown>
- <label>101</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>button</type>
+ <description>Next button</description>
+ <id>3</id>
+ <posX>10</posX>
+ <posY>159</posY>
+ <onleft>3</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Next Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
- <control>
- <type>button</type>
- <description>Next button</description>
- <id>3</id>
- <posX>10</posX>
- <posY>159</posY>
- <onleft>3</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>4</ondown>
- <label>Next Page</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+
+ <control>
+ <type>button</type>
+ <description>Previous button</description>
+ <id>4</id>
+ <posX>10</posX>
+ <posY>189</posY>
+ <onleft>4</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Previous Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
+
<control>
- <type>button</type>
- <description>Previous button</description>
- <id>4</id>
- <posX>10</posX>
- <posY>189</posY>
- <onleft>4</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>4</ondown>
- <label>Previous Page</label>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>label</type>
+ <description>Title txt</description>
+ <id>11</id>
+ <posX>20</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <label>Title:</label>
+ <textcolor>ffb2d4f5</textcolor>
</control>
+
<control>
- <type>label</type>
- <description>Title txt</description>
- <id>11</id>
- <posX>20</posX>
- <posY>220</posY>
- <visible>yes</visible>
- <label>Title:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
-
- <control>
- <type>fadelabel</type>
- <description>Title txt</description>
- <id>111</id>
- <posX>78</posX>
- <posY>220</posY>
- <visible>yes</visible>
- <width>200</width>
- <label>#videotitle</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Tags txt</description>
- <id>12</id>
- <posX>20</posX>
- <posY>250</posY>
- <visible>yes</visible>
- <label>Tags:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <type>fadelabel</type>
+ <description>Title txt</description>
+ <id>111</id>
+ <posX>78</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <width>200</width>
+ <label>#videotitle</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Tags txt</description>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>250</posY>
+ <visible>yes</visible>
+ <label>Tags:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <type>fadelabel</type>
- <description>Tags txt</description>
- <id>121</id>
- <posX>85</posX>
- <posY>250</posY>
- <width>200</width>
- <visible>no</visible>
- <label>#tags</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Length txt</description>
- <id>13</id>
- <posX>20</posX>
- <posY>280</posY>
- <visible>no</visible>
- <label>Length:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Tags txt</description>
+ <id>121</id>
+ <posX>85</posX>
+ <posY>250</posY>
+ <width>200</width>
+ <visible>no</visible>
+ <label>#tags</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Length txt</description>
+ <id>13</id>
+ <posX>20</posX>
+ <posY>280</posY>
+ <visible>no</visible>
+ <label>Length:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <type>label</type>
- <description>length txt</description>
- <id>131</id>
- <posX>105</posX>
- <posY>280</posY>
- <width>145</width>
- <visible>no</visible>
- <label>#length</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
- <control>
- <type>label</type>
- <description>Desc label</description>
- <id>14</id>
- <posX>20</posX>
- <posY>310</posY>
- <visible>no</visible>
- <label>Description:</label>
- <textcolor>ffb2d4f5</textcolor>
- </control>
+ <control>
+ <type>label</type>
+ <description>length txt</description>
+ <id>131</id>
+ <posX>105</posX>
+ <posY>280</posY>
+ <width>145</width>
+ <visible>no</visible>
+ <label>#length</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Desc label</description>
+ <id>14</id>
+ <posX>20</posX>
+ <posY>310</posY>
+ <visible>no</visible>
+ <label>Description:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
- <control>
- <description>textarea</description>
- <type>textboxscrollup</type>
- <id>141</id>
- <posX>20</posX>
- <posY>335</posY>
- <width>200</width>
- <height>220</height>
- <label>#desc</label>
- <visible>no</visible>
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>141</id>
+ <posX>20</posX>
+ <posY>335</posY>
+ <width>200</width>
+ <height>220</height>
+ <label>#desc</label>
+ <visible>no</visible>
</control>
+
<control>
- <description>textarea</description>
- <type>textboxscrollup</type>
- <id>59</id>
- <posX>474</posX>
- <posY>437</posY>
- <width>882</width>
- <height>173</height>
- <label>#trailerdesc</label>
- <visible>yes</visible>
+ <type>fadelabel</type>
+ <description>Movie Title value</description>
+ <id>25</id>
+ <posX>85</posX>
+ <posY>58</posY>
+ <width>685</width>
+ <label>#movietitle</label>
+ <font>font18</font>
+ <disabledcolor>ff808080</disabledcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
</control>
+
<control>
- <type>fadelabel</type>
- <description>Movie Title value</description>
- <id>25</id>
- <posX>85</posX>
- <posY>58</posY>
- <width>685</width>
- <label>#movietitle</label>
- <font>font18</font>
- <disabledcolor>ff808080</disabledcolor>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
+ <type>image</type>
+ <description>movie border</description>
+ <id>23</id>
+ <posX>10</posX>
+ <posY>320</posY>
+ <texture>status_panel.png</texture>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
</control>
+
<control>
- <type>image</type>
- <description>movie border</description>
- <id>23</id>
- <posX>10</posX>
- <posY>320</posY>
- <texture>status_panel.png</texture>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- <visible>no</visible>
+ <type>image</type>
+ <description>movie poster</description>
+ <id>24</id>
+ <posX>20</posX>
+ <posY>330</posY>
+ <width>270</width>
+ <height>270</height>
+ <texture>#movieposter</texture>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
</control>
- <control>
- <type>image</type>
- <description>movie poster</description>
- <id>24</id>
- <posX>20</posX>
- <posY>330</posY>
- <width>270</width>
- <height>270</height>
- <texture>#movieposter</texture>
- <keepaspectratio>yes</keepaspectratio>
- <centered>yes</centered>
- <animation effect="fade" time="200">WindowOpen</animation>
- <animation effect="fade" time="200">WindowClose</animation>
- <visible>no</visible>
- </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/BreakUtil.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -25,18 +25,22 @@
}
protected override String getUrl(String fsId)
- {
+ { String lsUrl = "";
String lsHtml = getHTMLData(fsId);
//Log.Write("html to parse to get url = \n{0}",lsHtml);
- Regex loPathRegex = new Regex("sGlobalFileName='([^']*)';[^;]*;sGlobalContentFilePath='([^']*)'");
- Regex loUrlRegex = new Regex("so.addVariable\\('sVidLoc', '([^']*)");
-
- String lsUrl = loUrlRegex.Match(lsHtml).Groups[1].Value;
- Match loMatch = loPathRegex.Match(lsHtml);
- String lsFileName = loMatch.Groups[1].Value;
- String lsPathName = loMatch.Groups[2].Value;
- lsUrl = lsUrl+lsPathName+"/"+lsFileName+".flv";
- Log.Info("break flv url = {0}",lsUrl);
+ Regex loPathRegex = new Regex("sGlobalFileName='([^']*)';[^;]*;.+sGlobalContentFilePath='([^']*)'");
+ Regex loUrlRegex = new Regex(@"so.addVariable\('videoPath',\s'([^']*)");
+ Match urlField = loUrlRegex.Match(lsHtml);
+ if(urlField.Success){
+ lsUrl = urlField.Groups[1].Value;
+ Match loMatch = loPathRegex.Match(lsHtml);
+ if(loMatch.Success){
+ String lsFileName = loMatch.Groups[1].Value;
+ String lsPathName = loMatch.Groups[2].Value;
+ lsUrl = lsUrl+lsPathName+"/"+lsFileName+".flv";
+ Log.Info("break flv url = {0}",lsUrl);
+ }
+ }
return lsUrl;
}
public override List<GUIOnlineVideos.VideoInfo> getVideoList(string fsUrl)
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/GUIOnlineVideos.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -764,6 +764,7 @@
liIdx++;
loVideoInfo.Description = cleanString(loVideoInfo.Description);
moSelectedVideo.Description = loVideoInfo.Description;
+ moSelectedVideo.Other = loVideoInfo.Other;
loListItem = new GUIListItem(loVideoInfo.Title);
loListItem.Label2 = loVideoInfo.Title2;
loListItem.Path = loVideoInfo.VideoUrl;
@@ -806,6 +807,13 @@
else{
DisplayVideoInfo(moCurrentVideoList[item.ItemId-1]);
}
+ if(currentView == View.FilmStrip){
+ GUIFilmstripControl filmstrip = parent as GUIFilmstripControl;
+ if (filmstrip == null)
+ return;
+ filmstrip.InfoImageFileName = item.ThumbnailImage;
+ }
+
}
@@ -920,6 +928,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
DisplayVideoInfo(null);
@@ -932,6 +946,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
DisplayVideoInfo(null);
@@ -943,6 +963,12 @@
GUIControl.HideControl(GetID, 23);
GUIControl.HideControl(GetID, 24);
GUIControl.HideControl(GetID, 25);
+// GUIControl.HideControl(GetID, 52);
+// GUIControl.HideControl(GetID, 53);
+ GUIControl.HideControl(GetID, 54);
+ GUIControl.HideControl(GetID, 55);
+ GUIControl.HideControl(GetID, 56);
+ GUIControl.HideControl(GetID, 57);
GUIControl.HideControl(GetID, 58);
GUIControl.HideControl(GetID, 59);
@@ -977,9 +1003,19 @@
GUIPropertyManager.SetProperty("#movieposter", ImageDownloader.downloadPoster(moSelectedVideo.ImageUrl.Replace("_m", "_l"),moSelectedVideo.Title,OnlineVideoSettings.getInstance().msThumbLocation));
GUIPropertyManager.SetProperty("#movietitle", moSelectedVideo.Title);
GUIPropertyManager.SetProperty("#trailerdesc", moSelectedVideo.Description);
+ ITMSClient.TrailerInfo info= (ITMSClient.TrailerInfo)moSelectedVideo.Other;
+ GUIPropertyManager.SetProperty("#genre", info.Genre);
+ GUIPropertyManager.SetProperty("#releasedate", info.Release);
+
//Log.Info("trailer desc:{0}", moSelectedVideo.Description);
GUIControl.ShowControl(GetID, 24);
GUIControl.ShowControl(GetID, 25);
+// GUIControl.ShowControl(GetID, 52);
+// GUIControl.ShowControl(GetID, 53);
+ GUIControl.ShowControl(GetID, 54);
+ GUIControl.ShowControl(GetID, 55);
+ GUIControl.ShowControl(GetID, 56);
+ GUIControl.ShowControl(GetID, 57);
GUIControl.ShowControl(GetID, 58);
GUIControl.ShowControl(GetID, 59);
@@ -1069,7 +1105,7 @@
strLine = GUILocalizeStrings.Get(100);
break;
case View.LargeIcons:
- facadeView.View = GUIFacadeControl.ViewMode.LargeIcons;
+ facadeView.View = GUIFacadeControl.ViewMode.AlbumView;
strLine = GUILocalizeStrings.Get(417);
break;
case View.FilmStrip:
@@ -1082,7 +1118,7 @@
}
private void DisplayVideoInfo(VideoInfo foVideo){
- if(foVideo==null){
+ if(foVideo==null || msSelectedSiteId == "15"){
GUIPropertyManager.SetProperty("#videotitle", String.Empty);
GUIPropertyManager.SetProperty("#tags", String.Empty);
GUIPropertyManager.SetProperty("#length", String.Empty);
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/ItmsHelper.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -56,6 +56,15 @@
trailerInfo.Overview = field.Groups["overview"].Value.Replace("\r\n", " ").Replace('\u0092', '\'').Replace('\u0093', '"').Replace('\u0094', '"');
//Log.Info("got the movie overview {0}", trailerInfo.Overview);
}
+ field = RegexParsers.moviedetailsRegex2.Match(infoPage.Xml);
+ if(field.Success){
+ Log.Info("movie details 2 regex successful");
+ trailerInfo.Release = field.Groups["release"].Value.Replace("\r\n"," ");
+ trailerInfo.Genre = field.Groups["genre"].Value;
+ }
+ else{
+ Log.Info("movie details 2 regex unsuccessful");
+ }
String name;
String url;
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/ItunesUtils/RegexParsers.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -76,7 +76,7 @@
//+ @"Rating:\s*(?<rating>.+?)\s*<.+?"
//+ @"(<TextView[^>]*>\s*(?<cast>[^<]*?)\s*</TextView>.+?){0,}</VBoxView>.+?"
// @"(<GotoURL[^>]+url=""(?<urls>/moviesxml/[^>]+?/index.xml)"">\s*<TextView.+?){0,}</Document>",
- "<GotoURL[^>]+url=\"(?<urls>/moviesxml/[^\"]+)[^>]*>\\s*<TextView",
+ @"<b>In\sTheaters:</b>(?<release>[^<]*)\s*<.+?Genre:[^>]*>(?<genre>[^<]*)",
RegexOptions.Singleline
| RegexOptions.ExplicitCapture
| RegexOptions.Compiled
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/LiveVideoUtil.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -64,7 +64,7 @@
video.Description = rssItem.mediaDescription;
video.ImageUrl = rssItem.mediaThumbnail;
video.Title = rssItem.title;
- video.Length = rssItem.contentList[0].duration;
+ //video.Length = rssItem.contentList[0].duration;
video.VideoUrl = rssItem.link;
loVideoList.Add(video);
}
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos/SiteUtilBase.cs 2007-09-07 23:59:25 UTC (rev 905)
@@ -136,9 +136,11 @@
settings.ProhibitDtd = false;
//doc.Load(XmlReader.Create(fsUrl,settings));
- WebClient client =new WebClient();
- String xml = client.DownloadString(fsUrl);
- doc.LoadXml(xml);
+ //WebClient client =new WebClient();
+ //String xml = client.DownloadString(fsUrl);
+ //doc.LoadXml(xml);
+ XmlTextReader reader = new XmlTextReader(fsUrl);
+ doc.Load(reader);
XmlNamespaceManager expr = new XmlNamespaceManager(doc.NameTable);
expr.AddNamespace("media", "http://search.yahoo.com/mrss");
expr.AddNamespace("exInfo","http://www.gametrailers.com/rssexplained.php");
Modified: trunk/plugins/OnlineVideos/Source/OnlineVideos.sln
===================================================================
--- trunk/plugins/OnlineVideos/Source/OnlineVideos.sln 2007-09-07 23:40:13 UTC (rev 904)
+++ trunk/plugins/OnlineVideos/Source/OnlineVideos.sln 2007-09-07 23:59:25 UTC (rev 905)
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005
-# SharpDevelop 2.2.0.2595
+# SharpDevelop 2.2.1.2648
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OnlineVideos", "OnlineVideos\OnlineVideos.csproj", "{E0D9D390-CDD6-4B98-86F3-6EB04A958882}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Runner", "OnlineVideos\Runner.csproj", "{EFABB07B-B050-45AD-A93F-C5047F15512F}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ide...@us...> - 2007-09-07 23:40:15
|
Revision: 904
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=904&view=rev
Author: ideasdigger
Date: 2007-09-07 16:40:13 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Adding Google libraries and missing images for skins.
Modified Paths:
--------------
trunk/plugins/MyOrganizer/Release/Plugins/Windows/GoogleConnectorLib.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizer.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizerLib.dll
trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnectorLib.csproj
Added Paths:
-----------
trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.AccessControl.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Calendar.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Client.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Extensions.dll
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/hover_my planner.png
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/myorganizer_logo.png
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.AccessControl.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.AccessControl.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Calendar.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Calendar.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Client.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Client.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Extensions.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/Google.GData.Extensions.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/MyOrganizer/Release/Plugins/Windows/GoogleConnectorLib.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizer.dll
===================================================================
(Binary files differ)
Modified: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizerLib.dll
===================================================================
(Binary files differ)
Added: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/hover_my planner.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/hover_my planner.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/myorganizer_logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/Media/myorganizer_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnectorLib.csproj
===================================================================
--- trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnectorLib.csproj 2007-09-07 18:32:51 UTC (rev 903)
+++ trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnectorLib.csproj 2007-09-07 23:40:13 UTC (rev 904)
@@ -31,18 +31,22 @@
<Reference Include="Google.GData.AccessControl, Version=1.0.9.9, Culture=neutral, PublicKeyToken=b4b8eb9a7afc8328">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Program Files\Google\Google Data API SDK\Redist\Google.GData.AccessControl.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="Google.GData.Calendar, Version=1.0.9.9, Culture=neutral, PublicKeyToken=aa6748391206b888">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Program Files\Google\Google Data API SDK\Redist\Google.GData.Calendar.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="Google.GData.Client, Version=1.0.9.9, Culture=neutral, PublicKeyToken=04a59ca9b0273830">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Program Files\Google\Google Data API SDK\Redist\Google.GData.Client.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="Google.GData.Extensions, Version=1.0.9.9, Culture=neutral, PublicKeyToken=0b4c5df2ebf20876">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Program Files\Google\Google Data API SDK\Redist\Google.GData.Extensions.dll</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gre...@us...> - 2007-09-07 18:33:02
|
Revision: 903
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=903&view=rev
Author: gregmac45
Date: 2007-09-07 11:32:51 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
xml updates
Modified Paths:
--------------
trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
Added Paths:
-----------
trunk/plugins/OnlineVideos/OnlineVideoSites.xml
trunk/plugins/OnlineVideos/Skin/Revision/
trunk/plugins/OnlineVideos/Skin/Revision/Media/
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon1.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon11.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon14.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon15.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon18.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon2.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon5.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon6.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon9.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo1.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo11.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo14.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo15.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo18.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo2.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo5.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo6.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo9.jpeg
trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
Removed Paths:
-------------
trunk/plugins/OnlineVideos/OnlineVideoSettings.xml
Deleted: trunk/plugins/OnlineVideos/OnlineVideoSettings.xml
===================================================================
--- trunk/plugins/OnlineVideos/OnlineVideoSettings.xml 2007-09-07 13:17:34 UTC (rev 902)
+++ trunk/plugins/OnlineVideos/OnlineVideoSettings.xml 2007-09-07 18:32:51 UTC (rev 903)
@@ -1,197 +0,0 @@
-<settings>
-<filter></filter><!-- comma delimited example: <filter>dog,cat,snake</filter> -->
-<thumbLocation>C:\OnlineVideoThumbnails\</thumbLocation>
-<sites>
-<site>
-<name>YouTube</name>
-<id>1</id>
-<!-- set the user if you wish to able to see youtube favorites -->
-<user></user>
-<!-- set the password if you wish to add/delete favorites to youtube -->
-<password></password>
-<!-- set the confirmAge to yes if you wish to confirm your age to view certain videos -->
-<!-- The user and password must be set if confirmAge is set to yes -->
-<confirmAge>no</confirmAge>
-<rss name="Top Rated"><![CDATA[http://youtube.com/rss/global/top_rated.rss]]></rss>
-<rss name="Recently Added"><![CDATA[http://youtube.com/rss/global/recently_added.rss]]></rss>
-<rss name="Recently Featured"><![CDATA[http://youtube.com/rss/global/recently_featured.rss]]></rss>
-<rss name="Top Favorites"><![CDATA[http://youtube.com/rss/global/top_favorites.rss]]></rss>
-<rss name="Top Viewed"><![CDATA[http://youtube.com/rss/global/top_viewed.rss]]></rss>
-<rss name="Top Viewed:Today"><![CDATA[http://youtube.com/rss/global/top_viewed_today.rss]]></rss>
-<rss name="Top Viewed:This Week"><![CDATA[http://youtube.com/rss/global/top_viewed_week.rss]]></rss>
-<rss name="Top Viewed:This Month"><![CDATA[http://youtube.com/rss/global/top_viewed_month.rss]]></rss>
-<rss name="Most Discussed:Today"><![CDATA[http://youtube.com/rss/global/most_discussed_today.rss]]></rss>
-<rss name="Most Discussed:This Week"><![CDATA[http://youtube.com/rss/global/most_discussed_week.rss]]></rss>
-<rss name="Most Discussed:This Month"><![CDATA[http://youtube.com/rss/global/most_discussed_month.rss]]></rss>
-<rss name="Search"><![CDATA[http://www.youtube.com/rss/tag/{0}.rss]]></rss>
-</site>
-<site>
-<name>Google Video</name>
-<id>2</id>
-<rss name="Popular"><![CDATA[http://video.google.com/videofeed?type=popular&num=100&output=rss]]></rss>
-<rss name="Random"><![CDATA[http://video.google.com/videofeed?type=random&num=100&output=rss]]></rss>
-<rss name="Comedy"><![CDATA[http://video.google.com/videofeed?type=search&q=genre:comedy&so=1&num=50]]></rss>
-<rss name="Music Video"><![CDATA[http://video.google.com/videofeed?type=search&q=type:music_video&so=1&num=50]]></rss>
-<rss name="Movie Trailer"><![CDATA[http://video.google.com/videofeed?type=search&q=type:movie_trailer&so=1&num=50]]></rss>
-<rss name="TV Show"><![CDATA[http://video.google.com/videofeed?type=search&q=type:tvshow&so=1&num=50]]></rss>
-<rss name="Sports"><![CDATA[http://video.google.com/videofeed?type=search&q=type:sports%20OR%20genre:sports&so=1&num=50]]></rss>
-<rss name="Educational"><![CDATA[http://video.google.com/videofeed?type=search&q=genre:educational&so=1&num=50]]></rss>
-<rss name="Google Picks"><![CDATA[http://video.google.com/videofeed?type=search&q=type:gpick&so=1&num=50]]></rss>
-<rss name="Search"><![CDATA[http://video.google.com/videofeed?type=search&q={0}&so=1&num=50]]></rss>
-</site>
-<!--
-<site>
-<name>Grouper</name>
-<id>3</id>
-<rss name="Featured"><![CDATA[http://grouper.com/rss/media.ashx?o=0&t=1&fx=&fp=1]]></rss>
-<rss name="Newest"><![CDATA[http://www.grouper.com/rss/media.ashx?o=0&fx=]]></rss>
-<rss name="Most Viewed"><![CDATA[http://www.grouper.com/rss/media.ashx?o=1&t=1&fx=]]></rss>
-<rss name="Most Discussed"><![CDATA[http://www.grouper.com/rss/media.ashx?o=4&t=1&fx=]]></rss>
-<rss name="Highest Rated"><![CDATA[http://www.grouper.com/rss/media.ashx?o=3&fx=]]></rss>
-<rss name="Most Viral"><![CDATA[http://www.grouper.com/rss/media.ashx?o=6&fx=]]></rss>
-</site>
--->
-<!-- NOT WORKING CURRENTLY. Videos don't always play.
-<site>
-<name>Guba</name>
-<id>4</id>
-<rss name="Action"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=562&o=0&set=5]]></rss>
-<rss name="Animation"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=457&o=0&set=5]]></rss>
-<rss name="Classics"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=807&o=0&set=5]]></rss>
-<rss name="Comedy"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=456&o=0&set=5]]></rss>
-<rss name="Documentary"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=460&o=0&set=5]]></rss>
-<rss name="Drama"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=459&o=0&set=5]]></rss>
-<rss name="Educational"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=513&o=0&set=5]]></rss>
-<rss name="Family"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=514&o=0&set=5]]></rss>
-<rss name="Foreign"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=463&o=0&set=5]]></rss>
-<rss name="Independent"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=515&o=0&set=5]]></rss>
-<rss name="Miscellaneous"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=458&o=0&set=5]]></rss>
-<rss name="Music Videos"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=462&o=0&set=5]]></rss>
-<rss name="Romance"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=516&o=0&set=5]]></rss>
-<rss name="Sports"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=461&o=0&set=5]]></rss>
-<rss name="TV Shows"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=806&o=0&set=5]]></rss>
-<rss name="Thriller"><![CDATA[http://www.guba.com/rss_feed/rss.pcast?type=itunes&category_id=517&o=0&set=5]]></rss>
-</site>
--->
-<site>
-<name>MetaCafe</name>
-<id>5</id>
-<rss name="New Videos"><![CDATA[http://www.metacafe.com/rss/new_videos.rss]]></rss>
-</site>
-<site>
-<name>DailyMotion</name>
-<id>6</id>
-<rss name="Front Page"><![CDATA[http://www.dailymotion.com/rss]]></rss>
-<rss name="Ads"><![CDATA[http://www.dailymotion.com/rss/cluster/ads]]></rss>
-<rss name="Animals"><![CDATA[http://www.dailymotion.com/rss/cluster/animals]]></rss>
-<rss name="Fun"><![CDATA[http://www.dailymotion.com/rss/cluster/fun]]></rss>
-<rss name="Auto"><![CDATA[http://www.dailymotion.com/rss/cluster/auto]]></rss>
-<rss name="Street"><![CDATA[http://www.dailymotion.com/rss/cluster/street]]></rss>
-<rss name="Creation"><![CDATA[http://www.dailymotion.com/rss/cluster/creation]]></rss>
-<rss name="Short Films"><![CDATA[http://www.dailymotion.com/rss/cluster/shortfilms]]></rss>
-<rss name="Business"><![CDATA[http://www.dailymotion.com/rss/cluster/business]]></rss>
-<rss name="Tech"><![CDATA[http://www.dailymotion.com/rss/cluster/tech]]></rss>
-<rss name="Sport"><![CDATA[http://www.dailymotion.com/rss/cluster/sport]]></rss>
-<rss name="Extreme"><![CDATA[http://www.dailymotion.com/rss/cluster/extreme]]></rss>
-<rss name="Events"><![CDATA[http://www.dailymotion.com/rss/cluster/events]]></rss>
-<rss name="Family"><![CDATA[http://www.dailymotion.com/rss/cluster/family]]></rss>
-<rss name="Music"><![CDATA[http://www.dailymotion.com/rss/cluster/music]]></rss>
-<rss name="News"><![CDATA[http://www.dailymotion.com/rss/cluster/news]]></rss>
-<rss name="Parties"><![CDATA[http://www.dailymotion.com/rss/cluster/parties]]></rss>
-<rss name="School"><![CDATA[http://www.dailymotion.com/rss/cluster/school]]></rss>
-<rss name="Travel"><![CDATA[http://www.dailymotion.com/rss/cluster/travel]]></rss>
-<rss name="Video Games"><![CDATA[http://www.dailymotion.com/rss/cluster/videogames]]></rss>
-<rss name="Blog"><![CDATA[http://www.dailymotion.com/rss/cluster/blog]]></rss>
-<rss name="3D"><![CDATA[http://www.dailymotion.com/rss/cluster/3D]]></rss>
-<rss name="Dating"><![CDATA[http://www.dailymotion.com/rss/cluster/dating]]></rss>
-<rss name="Search"><![CDATA[http://www.dailymotion.com/rss/relevance/search/{0}]]></rss>
-</site>
-<!--
-<site>
-<name>ABC Online</name>
-<id>8</id>
-<rss name="videos" dynamic="yes"><![CDATA[http://ll.static.abc.com/streaming/s/catalog?aff=&isIE=true]]></rss>
-</site>
--->
-<site>
-<name>BlipTV</name> <!-- More can be found at blip.tv Rss links are at the bottom of the pages. -->
-<id>9</id>
-<rss name="Most Popular"><![CDATA[http://blip.tv/?1=1&s=posts&skin=rss]]></rss>
-<rss name="Search"><![CDATA[http://blip.tv/?1=1&search={0};page=1;s=posts&skin=rss]]></rss>
-</site>
-<!--
-<site>
-<name>CBS Innertube</name>
-<id>10</id>
-<rss name="videos" dynamic="yes"><![CDATA[http://www.cbs.com/xml2/browseMenu/76.xml]]></rss>
-</site>
--->
-<site>
-<name>GameTrailers</name> <!-- more can be found at http://gametrailers.com/rss/ -->
-<id>11</id>
-<rss name="New trailers"><![CDATA[http://www.gametrailers.com/rss/newest.xml]]></rss>
-</site>
-<!--
-<site>
-<name>MSN SoapBox</name>
-<id>12</id>
-<rss name="videos"><![CDATA[http://soapbox.msn.com/rss.aspx?listId=mostpopular&categoryId=8118b646-92c6-4051-a1eb-40ef4ee49ec1]]></rss>
-</site>
--->
-<!--
-<site>
-<name>Video Jug</name>
-<id>13</id>
-<rss name="New Films"><![CDATA[http://www.videojug.com/rss]]></rss>
-</site>
--->
-<site>
-<name>VidiLife</name><!-- more feeds can be found at http://rss.vidilife.com/Default.aspx -->
-<id>14</id>
-<rss name="New Videos"><![CDATA[http://rss.vidilife.com/rss.aspx]]></rss>
-</site>
-<site>
-<name>Apple Trailers</name>
-<id>15</id>
-<rss name="New Trailers"><![CDATA[http://www.apple.com/moviesxml/h/view1_all.xml]]></rss>
-<rss name="Action and Adventure"><![CDATA[http://movies.apple.com/moviesxml/g/action_and_adventure_1.xml]]></rss>
-<rss name="Comedy"><![CDATA[http://movies.apple.com/moviesxml/g/comedy_1.xml]]></rss>
-<rss name="Documentary"><![CDATA[http://movies.apple.com/moviesxml/g/documentary_1.xml]]></rss>
-<rss name="Drama"><![CDATA[http://movies.apple.com/moviesxml/g/drama_1.xml]]></rss>
-<rss name="Family"><![CDATA[http://movies.apple.com/moviesxml/g/family_1.xml]]></rss>
-<rss name="Foreign"><![CDATA[http://movies.apple.com/moviesxml/g/fantasy_1.xml]]></rss>
-<rss name="Horror"><![CDATA[http://movies.apple.com/moviesxml/g/horror_1.xml]]></rss>
-<rss name="Musical"><![CDATA[http://movies.apple.com/moviesxml/g/musical_1.xml]]></rss>
-<rss name="Romance"><![CDATA[http://movies.apple.com/moviesxml/g/romance_1.xml]]></rss>
-<rss name="Sience Fiction"><![CDATA[http://movies.apple.com/moviesxml/g/science_fiction_1.xml]]></rss>
-<rss name="Thriller"><![CDATA[http://movies.apple.com/moviesxml/g/thriller_1.xml]]></rss>
-<rss name="20th Century Fox"><![CDATA[http://movies.apple.com/moviesxml/s/fox/index_1.xml]]></rss>
-<rss name="DreamWorks S.K.G"><![CDATA[http://movies.apple.com/moviesxml/s/dreamworks/index_1.xml]]></rss>
-<rss name="Focus Features / Rogue Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/focus_features/index_1.xml]]></rss>
-<rss name="Fox Searchlight Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/fox_searchlight/index_1.xml]]></rss>
-<rss name="Independent"><![CDATA[http://movies.apple.com/moviesxml/s/independent/index_1.xml]]></rss>
-<rss name="Lionsgate"><![CDATA[http://movies.apple.com/moviesxml/s/lions_gate/index_1.xml]]></rss>
-<rss name="MGM Studios"><![CDATA[http://movies.apple.com/moviesxml/s/mgm/index_1.xml]]></rss>
-<rss name="Magnolia Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/magnolia/index_1.xml]]></rss>
-<rss name="Miramax Films"><![CDATA[http://movies.apple.com/moviesxml/s/miramax/index_1.xml]]></rss>
-<rss name="New Line Cinema"><![CDATA[http://movies.apple.com/moviesxml/s/newline/index_1.xml]]></rss>
-<rss name="Paramount Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/paramount/index_1.xml]]></rss>
-<rss name="Paramount Vantage"><![CDATA[http://movies.apple.com/moviesxml/s/paramount_vantage/index_1.xml]]></rss>
-<rss name="Picturehouse"><![CDATA[http://movies.apple.com/moviesxml/s/picturehouse/index_1.xml]]></rss>
-<rss name="Rogue Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/rogue_pictures/index_1.xml]]></rss>
-<rss name="Sony Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/sony_pictures/index_1.xml]]></rss>
-<rss name="Sony Pictures Classics"><![CDATA[http://movies.apple.com/moviesxml/s/sony/index_1.xml]]></rss>
-<rss name="Touchstone Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/touchstone/index_1.xml]]></rss>
-<rss name="Universal Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/universal/index_1.xml]]></rss>
-<rss name="Walt Disney Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/disney/index_1.xml]]></rss>
-<rss name="Warner Bros. Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/wb/index_1.xml]]></rss>
-<rss name="Warner Independent Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/warner_independent_pictures/index_1.xml]]></rss>
-<rss name="Weinstein"><![CDATA[http://movies.apple.com/moviesxml/s/weinstein/index_1.xml]]></rss>
-</site>
-<site>
-<id>99</id>
-<name>Downloaded Videos</name>
-<rss name="Downloads"><![CDATA[C:\FlashVideos\]]></rss>
-</site>
-</sites>
-</settings>
\ No newline at end of file
Copied: trunk/plugins/OnlineVideos/OnlineVideoSites.xml (from rev 878, trunk/plugins/OnlineVideos/OnlineVideoSettings.xml)
===================================================================
--- trunk/plugins/OnlineVideos/OnlineVideoSites.xml (rev 0)
+++ trunk/plugins/OnlineVideos/OnlineVideoSites.xml 2007-09-07 18:32:51 UTC (rev 903)
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings>
+ <sites>
+ <site>
+ <name>YouTube</name>
+ <id>1</id>
+ <user></user>
+ <password></password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Top Rated"><![CDATA[http://youtube.com/rss/global/top_rated.rss]]></rss>
+ <rss name="Recently Added"><![CDATA[http://youtube.com/rss/global/recently_added.rss]]></rss>
+ <rss name="Recently Featured"><![CDATA[http://youtube.com/rss/global/recently_featured.rss]]></rss>
+ <rss name="Top Favorites"><![CDATA[http://youtube.com/rss/global/top_favorites.rss]]></rss>
+ <rss name="Top Viewed"><![CDATA[http://youtube.com/rss/global/top_viewed.rss]]></rss>
+ <rss name="Top Viewed:Today"><![CDATA[http://youtube.com/rss/global/top_viewed_today.rss]]></rss>
+ <rss name="Top Viewed:This Week"><![CDATA[http://youtube.com/rss/global/top_viewed_week.rss]]></rss>
+ <rss name="Top Viewed:This Month"><![CDATA[http://youtube.com/rss/global/top_viewed_month.rss]]></rss>
+ <rss name="Most Discussed:Today"><![CDATA[http://youtube.com/rss/global/most_discussed_today.rss]]></rss>
+ <rss name="Most Discussed:This Week"><![CDATA[http://youtube.com/rss/global/most_discussed_week.rss]]></rss>
+ <rss name="Most Discussed:This Month"><![CDATA[http://youtube.com/rss/global/most_discussed_month.rss]]></rss>
+ <rss name="Search"><![CDATA[http://www.youtube.com/rss/tag/{0}.rss]]></rss>
+ </site>
+ <site>
+ <name>Google Video</name>
+ <id>2</id>
+ <user></user>
+ <password></password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Popular"><![CDATA[http://video.google.com/videofeed?type=popular&num=100&output=rss]]></rss>
+ <rss name="Random"><![CDATA[http://video.google.com/videofeed?type=random&num=100&output=rss]]></rss>
+ <rss name="Comedy"><![CDATA[http://video.google.com/videofeed?type=search&q=genre:comedy&so=1&num=50]]></rss>
+ <rss name="Music Video"><![CDATA[http://video.google.com/videofeed?type=search&q=type:music_video&so=1&num=50]]></rss>
+ <rss name="Movie Trailer"><![CDATA[http://video.google.com/videofeed?type=search&q=type:movie_trailer&so=1&num=50]]></rss>
+ <rss name="TV Show"><![CDATA[http://video.google.com/videofeed?type=search&q=type:tvshow&so=1&num=50]]></rss>
+ <rss name="Sports"><![CDATA[http://video.google.com/videofeed?type=search&q=type:sports%20OR%20genre:sports&so=1&num=50]]></rss>
+ <rss name="Educational"><![CDATA[http://video.google.com/videofeed?type=search&q=genre:educational&so=1&num=50]]></rss>
+ <rss name="Google Picks"><![CDATA[http://video.google.com/videofeed?type=search&q=type:gpick&so=1&num=50]]></rss>
+ <rss name="Search"><![CDATA[http://video.google.com/videofeed?type=search&q={0}&so=1&num=50]]></rss>
+ </site>
+ <site>
+ <name>MetaCafe</name>
+ <id>5</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="New Videos"><![CDATA[http://www.metacafe.com/rss/new_videos.rss]]></rss>
+ <rss name="Top Rated"><![CDATA[http://www.metacafe.com/rss/today_videos/rss.xml?sort=rank]]></rss>
+ <rss name="Top Discussed"><![CDATA[http://www.metacafe.com/rss/today_videos/rss.xml?sort=discussed]]></rss>
+ <rss name="Search"><![CDATA[http://www.metacafe.com/tags/{0}/all.xml?sort=views]]></rss>
+ </site>
+ <site>
+ <name>DailyMotion</name>
+ <id>6</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Front Page"><![CDATA[http://www.dailymotion.com/rss]]></rss>
+ <rss name="Ads"><![CDATA[http://www.dailymotion.com/rss/cluster/ads]]></rss>
+ <rss name="Animals"><![CDATA[http://www.dailymotion.com/rss/cluster/animals]]></rss>
+ <rss name="Fun"><![CDATA[http://www.dailymotion.com/rss/cluster/fun]]></rss>
+ <rss name="Auto"><![CDATA[http://www.dailymotion.com/rss/cluster/auto]]></rss>
+ <rss name="Street"><![CDATA[http://www.dailymotion.com/rss/cluster/street]]></rss>
+ <rss name="Creation"><![CDATA[http://www.dailymotion.com/rss/cluster/creation]]></rss>
+ <rss name="Short Films"><![CDATA[http://www.dailymotion.com/rss/cluster/shortfilms]]></rss>
+ <rss name="Business"><![CDATA[http://www.dailymotion.com/rss/cluster/business]]></rss>
+ <rss name="Tech"><![CDATA[http://www.dailymotion.com/rss/cluster/tech]]></rss>
+ <rss name="Sport"><![CDATA[http://www.dailymotion.com/rss/cluster/sport]]></rss>
+ <rss name="Extreme"><![CDATA[http://www.dailymotion.com/rss/cluster/extreme]]></rss>
+ <rss name="Events"><![CDATA[http://www.dailymotion.com/rss/cluster/events]]></rss>
+ <rss name="Family"><![CDATA[http://www.dailymotion.com/rss/cluster/family]]></rss>
+ <rss name="Music"><![CDATA[http://www.dailymotion.com/rss/cluster/music]]></rss>
+ <rss name="News"><![CDATA[http://www.dailymotion.com/rss/cluster/news]]></rss>
+ <rss name="Parties"><![CDATA[http://www.dailymotion.com/rss/cluster/parties]]></rss>
+ <rss name="School"><![CDATA[http://www.dailymotion.com/rss/cluster/school]]></rss>
+ <rss name="Travel"><![CDATA[http://www.dailymotion.com/rss/cluster/travel]]></rss>
+ <rss name="Video Games"><![CDATA[http://www.dailymotion.com/rss/cluster/videogames]]></rss>
+ <rss name="Blog"><![CDATA[http://www.dailymotion.com/rss/cluster/blog]]></rss>
+ <rss name="3D"><![CDATA[http://www.dailymotion.com/rss/cluster/3D]]></rss>
+ <rss name="Dating"><![CDATA[http://www.dailymotion.com/rss/cluster/dating]]></rss>
+ <rss name="Search"><![CDATA[http://www.dailymotion.com/rss/relevance/search/{0}]]></rss>
+ </site>
+ <site>
+ <name>BlipTV</name>
+ <id>9</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Most Popular"><![CDATA[http://blip.tv/?1=1&s=posts&skin=rss]]></rss>
+ <rss name="Art"><![CDATA[http://blip.tv/posts/view/?category=27&category_name=Art&skin=rss]]></rss>
+ <rss name="Business"><![CDATA[http://blip.tv/posts/view/?category=26&category_name=Business&skin=rss]]></rss>
+ <rss name="Citizen Journalism"><![CDATA[http://blip.tv/posts/view/?category=4&category_name=Citizen%20Journalism&skin=rss]]></rss>
+ <rss name="Comedy"><![CDATA[http://blip.tv/posts/view/?category=2&category_name=Comedy&skin=rss]]></rss>
+ <rss name="Conferences and Other Events"><![CDATA[http://blip.tv/posts/view/?category=10&category_name=Conferences%20and%20Other%20Events&skin=rss]]></rss>
+ <rss name="Convenient Truths Contest"><![CDATA[http://blip.tv/posts/view/?category=20&category_name=Convenient%20Truths%20Contest&skin=rss]]></rss>
+ <rss name="Documentary"><![CDATA[http://blip.tv/posts/view/?category=19&category_name=Documentary&skin=rss]]></rss>
+ <rss name="Educational"><![CDATA[http://blip.tv/posts/view/?category=21&category_name=Educational&skin=rss]]></rss>
+ <rss name="Food and Drink"><![CDATA[http://blip.tv/posts/view/?category=12&category_name=Food%20%26%20Drink&skin=rss]]></rss>
+ <rss name="Friends"><![CDATA[http://blip.tv/posts/view/?category=15&category_name=Friends&skin=rss]]></rss>
+ <rss name="Gaming"><![CDATA[http://blip.tv/posts/view/?category=13&category_name=Gaming&skin=rss]]></rss>
+ <rss name="Health"><![CDATA[http://blip.tv/posts/view/?category=25&category_name=Health&skin=rss]]></rss>
+ <rss name="Literature"><![CDATA[http://blip.tv/posts/view/?category=11&category_name=Literature&skin=rss]]></rss>
+ <rss name="Movies and Television"><![CDATA[http://blip.tv/posts/view/?category=28&category_name=Movies%20and%20Television&skin=rss]]></rss>
+ <rss name="Music and Entertainment"><![CDATA[http://blip.tv/posts/view/?category=5&category_name=Music%20and%20Entertainment&skin=rss]]></rss>
+ <rss name="Personal or Auto-biographical"><![CDATA[http://blip.tv/posts/view/?category=8&category_name=Personal%20or%20Auto-biographical&skin=rss]]></rss>
+ <rss name="Politics"><![CDATA[http://blip.tv/posts/view/?category=3&category_name=Politics&skin=rss]]></rss>
+ <rss name="Religion"><![CDATA[http://blip.tv/posts/view/?category=23&category_name=Religion&skin=rss]]></rss>
+ <rss name="School and Education"><![CDATA[http://blip.tv/posts/view/?category=16&category_name=School%20and%20Education&skin=rss]]></rss>
+ <rss name="Science"><![CDATA[http://blip.tv/posts/view/?category=14&category_name=Science&skin=rss]]></rss>
+ <rss name="Sports"><![CDATA[http://blip.tv/posts/view/?category=6&category_name=Sports&skin=rss]]></rss>
+ <rss name="Technology"><![CDATA[http://blip.tv/posts/view/?category=7&category_name=Technology&skin=rss]]></rss>
+ <rss name="The Environment"><![CDATA[http://blip.tv/posts/view/?category=22&category_name=The%20Environment&skin=rss]]></rss>
+ <rss name="The Mainstream Media"><![CDATA[http://blip.tv/posts/view/?category=18&category_name=The%20Mainstream%20Media&skin=rss]]></rss>
+ <rss name="Travel"><![CDATA[http://blip.tv/posts/view/?category=24&category_name=Travel&skin=rss]]></rss>
+ <rss name="Videoblogging"><![CDATA[http://blip.tv/posts/view/?category=9&category_name=Videoblogging&skin=rss]]></rss>
+ <rss name="Web Development and Sites"><![CDATA[http://blip.tv/posts/view/?category=17&category_name=Web%20Development%20and%20Sites&skin=rss]]></rss>
+ <rss name="Search"><![CDATA[http://blip.tv/?1=1&search={0};page=1;s=posts&skin=rss]]></rss>
+ </site>
+ <site>
+ <name>GameTrailers</name>
+ <id>11</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="New trailers"><![CDATA[http://www.gametrailers.com/rss/newest.xml]]></rss>
+ <rss name="Newest DS"><![CDATA[http://www.gametrailers.com/rss/newestds.xml]]></rss>
+ <rss name="Newest Nintendo"><![CDATA[http://www.gametrailers.com/rss/newestnintendo.xml]]></rss>
+ <rss name="Newest PC"><![CDATA[http://www.gametrailers.com/rss/newestpc.xml]]></rss>
+ <rss name="Newest PS2"><![CDATA[http://www.gametrailers.com/rss/newestps2.xml]]></rss>
+ <rss name="Newest PS3"><![CDATA[http://www.gametrailers.com/rss/newestps3.xml]]></rss>
+ <rss name="Newest PSP"><![CDATA[http://www.gametrailers.com/rss/newestpsp.xml]]></rss>
+ <rss name="Newest Sony"><![CDATA[http://www.gametrailers.com/rss/newestsony.xml]]></rss>
+ <rss name="Newest Xb360"><![CDATA[http://www.gametrailers.com/rss/newestxb360.xml]]></rss>
+ <rss name="Top 20"><![CDATA[http://www.gametrailers.com/rss/top20.xml]]></rss>
+ <rss name="Top 20 DS"><![CDATA[http://www.gametrailers.com/rss/top20ds.xml]]></rss>
+ <rss name="Top 20 GBA"><![CDATA[http://www.gametrailers.com/rss/top20gba.xml]]></rss>
+ <rss name="Top 20 GC"><![CDATA[http://www.gametrailers.com/rss/top20gc.xml]]></rss>
+ <rss name="Top 20 NGage"><![CDATA[http://www.gametrailers.com/rss/top20ngage.xml]]></rss>
+ <rss name="Top 20 Nintendo"><![CDATA[http://www.gametrailers.com/rss/top20nintendo.xml]]></rss>
+ <rss name="Top 20 PC"><![CDATA[http://www.gametrailers.com/rss/top20pc.xml]]></rss>
+ <rss name="Top 20 PS2"><![CDATA[http://www.gametrailers.com/rss/top20ps2.xml]]></rss>
+ <rss name="Top 20 PS3"><![CDATA[http://www.gametrailers.com/rss/top20ps3.xml]]></rss>
+ <rss name="Top 20 PSP"><![CDATA[http://www.gametrailers.com/rss/top20psp.xml]]></rss>
+ <rss name="Top 20 Sony"><![CDATA[http://www.gametrailers.com/rss/top20sony.xml]]></rss>
+ <rss name="Top 20 Xbox360"><![CDATA[http://www.gametrailers.com/rss/top20xb360.xml]]></rss>
+ <rss name="Top 20 Xbox"><![CDATA[http://www.gametrailers.com/rss/top20xbox.xml]]></rss>
+ <rss name="Top Rated"><![CDATA[http://www.gametrailers.com/rss/toprated.xml]]></rss>
+ <rss name="Top Rated DS"><![CDATA[http://www.gametrailers.com/rss/topratedds.xml]]></rss>
+ <rss name="Top Rated GBA"><![CDATA[http://www.gametrailers.com/rss/topratedgba.xml]]></rss>
+ <rss name="Top Rated GC"><![CDATA[http://www.gametrailers.com/rss/topratedgc.xml]]></rss>
+ <rss name="Top Rated NGage"><![CDATA[http://www.gametrailers.com/rss/topratedngage.xml]]></rss>
+ <rss name="Top Rated Nintendo"><![CDATA[http://www.gametrailers.com/rss/topratednintendo.xml]]></rss>
+ <rss name="Top Rated PC"><![CDATA[http://www.gametrailers.com/rss/topratedpc.xml]]></rss>
+ <rss name="Top Rated PS2"><![CDATA[http://www.gametrailers.com/rss/topratedps2.xml]]></rss>
+ <rss name="Top Rated PS3"><![CDATA[http://www.gametrailers.com/rss/topratedps3.xml]]></rss>
+ <rss name="Top Rated PSP"><![CDATA[http://www.gametrailers.com/rss/topratedpsp.xml]]></rss>
+ <rss name="Top Rated Sony"><![CDATA[http://www.gametrailers.com/rss/topratedsony.xml]]></rss>
+ <rss name="Top Rated Xb360"><![CDATA[http://www.gametrailers.com/rss/topratedxb360.xml]]></rss>
+ <rss name="Top Rated Xbox"><![CDATA[http://www.gametrailers.com/rss/topratedxbox.xml]]></rss>
+ </site>
+ <site>
+ <name>VidiLife</name>
+ <id>14</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Top 20 New Videos"><![CDATA[http://rss.vidilife.com/rss.aspx]]></rss>
+ <rss name="Funny Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_funny]]></rss>
+ <rss name="Music Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_music]]></rss>
+ <rss name="Hollywood Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_hollywood]]></rss>
+ <rss name="Stupid Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_stupid]]></rss>
+ <rss name="Sexy Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_sexy]]></rss>
+ <rss name="Amateur Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_amateur]]></rss>
+ <rss name="Hot Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_hot]]></rss>
+ <rss name="Crazy Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_crazy]]></rss>
+ <rss name="Streaming Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_streaming]]></rss>
+ <rss name="Online Videos"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=videos_online]]></rss>
+ <rss name="Funny Commercial"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory1]]></rss>
+ <rss name="Animation"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory2]]></rss>
+ <rss name="Real-Life Video"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory3]]></rss>
+ <rss name="Independent Film"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory4]]></rss>
+ <rss name="Music Video"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory5]]></rss>
+ <rss name="News"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory6]]></rss>
+ <rss name="Video Blog"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory7]]></rss>
+ <rss name="Sports"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory8]]></rss>
+ <rss name="My Vacation/ Vacation Spots"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory9]]></rss>
+ <rss name="Automotive"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory10]]></rss>
+ <rss name="Extreme Video"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory11]]></rss>
+ <rss name="Animals"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory12]]></rss>
+ <rss name="Family"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory13]]></rss>
+ <rss name="Kids"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory14]]></rss>
+ <rss name="School"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory15]]></rss>
+ <rss name="Natural Wonders"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory16]]></rss>
+ <rss name="Comedy"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory17]]></rss>
+ <rss name="Educational"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory18]]></rss>
+ <rss name="Instructional"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory19]]></rss>
+ <rss name="Hot Male"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory20]]></rss>
+ <rss name="Hot Female"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory21]]></rss>
+ <rss name="Business/ Advertising"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory22]]></rss>
+ <rss name="Real Estate"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory23]]></rss>
+ <rss name="Cooking"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory24]]></rss>
+ <rss name="Party"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory105]]></rss>
+ <rss name="Video Games"><![CDATA[http://rss.vidilife.com/rss.aspx?FeedName=SearchByCategory107]]></rss>
+ </site>
+ <site>
+ <name>Apple Trailers</name>
+ <id>15</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="All Trailers"><![CDATA[%]]></rss>
+ <rss name="New Trailers"><![CDATA[http://www.apple.com/moviesxml/h/view1_all.xml]]></rss>
+ <rss name="Weekend Box Office"><![CDATA[http://www.apple.com/moviesxml/h/boxoffice_include.xml]]></rss>
+ <rss name="Opening This Week"><![CDATA[http://www.apple.com/moviesxml/h/openings_include.xml]]></rss>
+ <rss name="Exclusives"><![CDATA[http://www.apple.com/moviesxml/h/view1a_include.xml]]></rss>
+ <rss name="Featured HD"><![CDATA[http://www.apple.com/moviesxml/h/view3a_include.xml]]></rss>
+ <rss name="Action and Adventure"><![CDATA[http://movies.apple.com/moviesxml/g/action_and_adventure_1.xml]]></rss>
+ <rss name="Comedy"><![CDATA[http://movies.apple.com/moviesxml/g/comedy_1.xml]]></rss>
+ <rss name="Documentary"><![CDATA[http://movies.apple.com/moviesxml/g/documentary_1.xml]]></rss>
+ <rss name="Drama"><![CDATA[http://movies.apple.com/moviesxml/g/drama_1.xml]]></rss>
+ <rss name="Family"><![CDATA[http://movies.apple.com/moviesxml/g/family_1.xml]]></rss>
+ <rss name="Foreign"><![CDATA[http://movies.apple.com/moviesxml/g/fantasy_1.xml]]></rss>
+ <rss name="Horror"><![CDATA[http://movies.apple.com/moviesxml/g/horror_1.xml]]></rss>
+ <rss name="Musical"><![CDATA[http://movies.apple.com/moviesxml/g/musical_1.xml]]></rss>
+ <rss name="Romance"><![CDATA[http://movies.apple.com/moviesxml/g/romance_1.xml]]></rss>
+ <rss name="Sience Fiction"><![CDATA[http://movies.apple.com/moviesxml/g/science_fiction_1.xml]]></rss>
+ <rss name="Thriller"><![CDATA[http://movies.apple.com/moviesxml/g/thriller_1.xml]]></rss>
+ <rss name="20th Century Fox"><![CDATA[http://movies.apple.com/moviesxml/s/fox/index_1.xml]]></rss>
+ <rss name="DreamWorks S.K.G"><![CDATA[http://movies.apple.com/moviesxml/s/dreamworks/index_1.xml]]></rss>
+ <rss name="Focus Features / Rogue Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/focus_features/index_1.xml]]></rss>
+ <rss name="Fox Searchlight Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/fox_searchlight/index_1.xml]]></rss>
+ <rss name="Independent"><![CDATA[http://movies.apple.com/moviesxml/s/independent/index_1.xml]]></rss>
+ <rss name="Lionsgate"><![CDATA[http://movies.apple.com/moviesxml/s/lions_gate/index_1.xml]]></rss>
+ <rss name="MGM Studios"><![CDATA[http://movies.apple.com/moviesxml/s/mgm/index_1.xml]]></rss>
+ <rss name="Magnolia Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/magnolia/index_1.xml]]></rss>
+ <rss name="Miramax Films"><![CDATA[http://movies.apple.com/moviesxml/s/miramax/index_1.xml]]></rss>
+ <rss name="New Line Cinema"><![CDATA[http://movies.apple.com/moviesxml/s/newline/index_1.xml]]></rss>
+ <rss name="Paramount Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/paramount/index_1.xml]]></rss>
+ <rss name="Paramount Vantage"><![CDATA[http://movies.apple.com/moviesxml/s/paramount_vantage/index_1.xml]]></rss>
+ <rss name="Picturehouse"><![CDATA[http://movies.apple.com/moviesxml/s/picturehouse/index_1.xml]]></rss>
+ <rss name="Rogue Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/rogue_pictures/index_1.xml]]></rss>
+ <rss name="Sony Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/sony_pictures/index_1.xml]]></rss>
+ <rss name="Sony Pictures Classics"><![CDATA[http://movies.apple.com/moviesxml/s/sony/index_1.xml]]></rss>
+ <rss name="Touchstone Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/touchstone/index_1.xml]]></rss>
+ <rss name="Universal Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/universal/index_1.xml]]></rss>
+ <rss name="Walt Disney Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/disney/index_1.xml]]></rss>
+ <rss name="Warner Bros. Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/wb/index_1.xml]]></rss>
+ <rss name="Warner Independent Pictures"><![CDATA[http://movies.apple.com/moviesxml/s/warner_independent_pictures/index_1.xml]]></rss>
+ <rss name="Weinstein"><![CDATA[http://movies.apple.com/moviesxml/s/weinstein/index_1.xml]]></rss>
+ <rss name="Search"><![CDATA[%{0}]]></rss>
+ </site>
+ <site>
+ <name>Stage6</name>
+ <id>18</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Highest Rated"><![CDATA[http://stage6.divx.com/rss/videos/order:rating]]></rss>
+ <rss name="Movie Trailers"><![CDATA[http://stage6.divx.com/rss/channel/channel:Movie-Trailers]]></rss>
+ <rss name="HD DVD"><![CDATA[http://stage6.divx.com/rss/channel/channel:HD-DVD]]></rss>
+ <rss name="Music videos"><![CDATA[http://stage6.divx.com/rss/channel/channel:musicvideos]]></rss>
+ <rss name="Systm"><![CDATA[http://stage6.divx.com/rss/channel/channel:SYSTM]]></rss>
+ <rss name="Hackcom"><![CDATA[http://stage6.divx.com/rss/channel/channel:Hackcom]]></rss>
+ <rss name="Comic-Con"><![CDATA[http://stage6.divx.com/rss/channel/channel:Comic-Con]]></rss>
+ <rss name="Highest Karma"><![CDATA[http://stage6.divx.com/rss/channels/order:karma]]></rss>
+ <rss name="Geekscape"><![CDATA[http://stage6.divx.com/rss/channel/channel:Geekscape]]></rss>
+ <rss name="G4TV"><![CDATA[http://stage6.divx.com/rss/channel/channel:G4TV]]></rss>
+ <rss name="CommandN"><![CDATA[http://stage6.divx.com/rss/channel/channel:commandN]]></rss>
+ </site>
+ <site>
+ <name>Generic</name>
+ <id>50</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>no</enabled>
+ <rss name="MSDN"><![CDATA[http://channel9.msdn.com/rss.aspx?ShowID=1]]></rss>
+ </site>
+ <site>
+ <name>Downloaded Videos</name>
+ <id>99</id>
+ <user>
+ </user>
+ <password>
+ </password>
+ <confirm>no</confirm>
+ <enabled>yes</enabled>
+ <rss name="Downloads"><![CDATA[C:\FlashVideos\]]></rss>
+ </site>
+ </sites>
+</settings>
\ No newline at end of file
Modified: trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 13:17:34 UTC (rev 902)
+++ trunk/plugins/OnlineVideos/Skin/BlueTwo/myonlinevideos.xml 2007-09-07 18:32:51 UTC (rev 903)
@@ -12,11 +12,100 @@
<id>2</id>
<posX>60</posX>
<posY>97</posY>
- <onleft>4</onleft>
+ <onleft>2</onleft>
<onright>50</onright>
- <onup>3</onup>
+ <onup>2</onup>
<ondown>2</ondown>
<label>101</label>
- </control>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Title txt</description>
+ <id>11</id>
+ <posX>20</posX>
+ <posY>180</posY>
+ <visible>yes</visible>
+ <label>Title:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Title txt</description>
+ <id>111</id>
+ <posX>60</posX>
+ <posY>180</posY>
+ <visible>no</visible>
+ <width>160</width>
+ <label>#videotitle</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Tags txt</description>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>200</posY>
+ <visible>no</visible>
+ <label>Tags:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Tags txt</description>
+ <id>121</id>
+ <posX>65</posX>
+ <posY>200</posY>
+ <width>160</width>
+ <visible>no</visible>
+ <label>#tags</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Length txt</description>
+ <id>13</id>
+ <posX>20</posX>
+ <posY>220</posY>
+ <visible>no</visible>
+ <label>Length:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>length txt</description>
+ <id>131</id>
+ <posX>80</posX>
+ <posY>220</posY>
+ <width>145</width>
+ <visible>no</visible>
+ <label>#length</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Length txt</description>
+ <id>14</id>
+ <posX>20</posX>
+ <posY>240</posY>
+ <visible>no</visible>
+ <label>Description:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>141</id>
+ <posX>20</posX>
+ <posY>260</posY>
+ <width>200</width>
+ <height>140</height>
+ <label>#desc</label>
+ <visible>no</visible>
+ </control>
+
</controls>
</window>
\ No newline at end of file
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon1.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon1.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon11.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon11.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon14.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon14.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon15.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon15.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon18.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon18.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon2.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon2.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon5.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon5.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon6.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon6.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon9.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidSiteIcon9.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo1.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo1.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo11.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo11.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo14.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo14.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo15.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo15.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo18.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo18.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo2.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo2.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo5.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo5.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo6.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo6.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo9.jpeg
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/OnlineVideos/Skin/Revision/Media/OnlineVidlogo9.jpeg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml
===================================================================
--- trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml (rev 0)
+++ trunk/plugins/OnlineVideos/Skin/Revision/myonlinevideos.xml 2007-09-07 18:32:51 UTC (rev 903)
@@ -0,0 +1,255 @@
+<window>
+ <id>4755</id>
+ <defaultcontrol>50</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <define>#header.label:Online Videos</define>
+ <define>#header.hover:hover_online videos.png</define>
+ <define>#selecteditem:-</define>
+ <define>#selecteditem2:-</define>
+ <controls>
+ <import>common.window2.xml</import>
+ <import>common.facade.xml</import>
+ <control>
+ <type>label</type>
+ <description>Runtime txt</description>
+ <id>54</id>
+ <posX>474</posX>
+ <posY>340</posY>
+ <label>172</label>
+ <visible>no</visible>
+ <textcolor>ff6b7487</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Runtime value</description>
+ <id>53</id>
+ <posX>1050</posX>
+ <posY>306</posY>
+ <label>#runtime</label>
+ <textcolor>ffffffff</textcolor>
+ <align>right</align>
+ <visible>no</visible>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Runtime txt</description>
+ <id>52</id>
+ <posX>474</posX>
+ <posY>306</posY>
+ <label>299</label>
+ <textcolor>ff6b7487</textcolor>
+ <visible>no</visible>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Genre txt</description>
+ <id>51</id>
+ <posX>474</posX>
+ <posY>373</posY>
+ <label>174</label>
+ <visible>no</visible>
+ <textcolor>ff6b7487</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Plot txt</description>
+ <id>58</id>
+ <posX>474</posX>
+ <posY>406</posY>
+ <label>Plot:</label>
+ <visible>no</visible>
+ <textcolor>ff6b7487</textcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>View button</description>
+ <id>2</id>
+ <posX>10</posX>
+ <posY>128</posY>
+ <onleft>2</onleft>
+ <onright>50</onright>
+ <onup>17</onup>
+ <ondown>3</ondown>
+ <label>101</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Next button</description>
+ <id>3</id>
+ <posX>10</posX>
+ <posY>159</posY>
+ <onleft>3</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Next Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Previous button</description>
+ <id>4</id>
+ <posX>10</posX>
+ <posY>189</posY>
+ <onleft>4</onleft>
+ <onright>50</onright>
+ <onup>3</onup>
+ <ondown>4</ondown>
+ <label>Previous Page</label>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Title txt</description>
+ <id>11</id>
+ <posX>20</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <label>Title:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Title txt</description>
+ <id>111</id>
+ <posX>78</posX>
+ <posY>220</posY>
+ <visible>yes</visible>
+ <width>200</width>
+ <label>#videotitle</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Tags txt</description>
+ <id>12</id>
+ <posX>20</posX>
+ <posY>250</posY>
+ <visible>yes</visible>
+ <label>Tags:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>fadelabel</type>
+ <description>Tags txt</description>
+ <id>121</id>
+ <posX>85</posX>
+ <posY>250</posY>
+ <width>200</width>
+ <visible>no</visible>
+ <label>#tags</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Length txt</description>
+ <id>13</id>
+ <posX>20</posX>
+ <posY>280</posY>
+ <visible>no</visible>
+ <label>Length:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>length txt</description>
+ <id>131</id>
+ <posX>105</posX>
+ <posY>280</posY>
+ <width>145</width>
+ <visible>no</visible>
+ <label>#length</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Desc label</description>
+ <id>14</id>
+ <posX>20</posX>
+ <posY>310</posY>
+ <visible>no</visible>
+ <label>Description:</label>
+ <textcolor>ffb2d4f5</textcolor>
+ </control>
+
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>141</id>
+ <posX>20</posX>
+ <posY>335</posY>
+ <width>200</width>
+ <height>220</height>
+ <label>#desc</label>
+ <visible>no</visible>
+ </control>
+ <control>
+ <description>textarea</description>
+ <type>textboxscrollup</type>
+ <id>59</id>
+ <posX>474</posX>
+ <posY>437</posY>
+ <width>882</width>
+ <height>173</height>
+ <label>#trailerdesc</label>
+ <visible>yes</visible>
+ </control>
+ <control>
+ <type>fadelabel</type>
+ <description>Movie Title value</description>
+ <id>25</id>
+ <posX>85</posX>
+ <posY>58</posY>
+ <width>685</width>
+ <label>#movietitle</label>
+ <font>font18</font>
+ <disabledcolor>ff808080</disabledcolor>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ </control>
+ <control>
+ <type>image</type>
+ <description>movie border</description>
+ <id>23</id>
+ <posX>10</posX>
+ <posY>320</posY>
+ <texture>status_panel.png</texture>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
+ </control>
+ <control>
+ <type>image</type>
+ <description>movie poster</description>
+ <id>24</id>
+ <posX>20</posX>
+ <posY>330</posY>
+ <width>270</width>
+ <height>270</height>
+ <texture>#movieposter</texture>
+ <keepaspectratio>yes</keepaspectratio>
+ <centered>yes</centered>
+ <animation effect="fade" time="200">WindowOpen</animation>
+ <animation effect="fade" time="200">WindowClose</animation>
+ <visible>no</visible>
+ </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: <rs...@us...> - 2007-09-07 13:17:39
|
Revision: 902
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=902&view=rev
Author: rsparey
Date: 2007-09-07 06:17:34 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Updated Tab toggle buttons in layout. and new back ground changer which now works with windows vista
Modified Paths:
--------------
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Skin Layout.cdr
Added Paths:
-----------
trunk/skins/Foofaraw/Foofaraw Support Files/Skin Backgrounds/FoofarawBackgroundChanger.exe
Added: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Backgrounds/FoofarawBackgroundChanger.exe
===================================================================
(Binary files differ)
Property changes on: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Backgrounds/FoofarawBackgroundChanger.exe
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/skins/Foofaraw/Foofaraw Support Files/Skin Layout/Skin Layout.cdr
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rs...@us...> - 2007-09-07 13:08:50
|
Revision: 901
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=901&view=rev
Author: rsparey
Date: 2007-09-07 06:08:47 -0700 (Fri, 07 Sep 2007)
Log Message:
-----------
Working on TV screens and video window
Modified Paths:
--------------
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleoff_focus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleoff_nofocus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleon_focus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleon_nofocus.png
trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/background.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleoff_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleoff_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleon_focus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/tab_toggleon_nofocus.png
===================================================================
(Binary files differ)
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-09-06 21:27:58 UTC (rev 900)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myHome.xml 2007-09-07 13:08:47 UTC (rev 901)
@@ -2,7 +2,7 @@
<window>
<id>0</id>
<defaultcontrol>50</defaultcontrol>
- <allowoverlay>yes</allowoverlay>
+ <allowoverlay>no</allowoverlay>
<autohidetopbar>no</autohidetopbar>
<controls>
<import>common.window.xml</import>
@@ -382,5 +382,20 @@
<animation effect="slide" time="1000" delay="2000" start="-600,0" end="0,0" acceleration="-1">WindowOpen</animation>
<animation effect="fade" time="500" start="50">WindowClose</animation>
</control>
+ <control>
+ <description>video window</description>
+ <type>videowindow</type>
+ <id>99</id>
+ <posX>760</posX>
+ <posY>210</posY>
+ <width>568</width>
+ <height>320</height>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <action>18</action>
+ <textureFocus>tv_green_border.png</textureFocus>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ </control>
</controls>
</window>
\ No newline at end of file
Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml
===================================================================
--- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-06 21:27:58 UTC (rev 900)
+++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvhome.xml 2007-09-07 13:08:47 UTC (rev 901)
@@ -93,9 +93,11 @@
<onleft>11</onleft>
<onright>2</onright>
<onup>3</onup>
- <ondown>50</ondown>
- <textureFocus>tab_down.png</textureFocus>
- <textureNoFocus>tab_up.png</textureNoFocus>
+ <ondown>9</ondown>
+ <textureFocus>tab_toggleon_focus.png</textureFocus>
+ <textureNoFocus>tab_toggleon_nofocus.png</textureNoFocus>
+ <AltTextureFocus>tab_toggleoff_focus.png</AltTextureFocus>
+ <AltTextureNoFocus>tab_toggleoff_nofocus.png</AltTextureNoFocus>
<textureAscending>arrow_round_up_nofocus.png</textureAscending>
@@ -117,7 +119,7 @@
<onleft>8</onleft>
<onright>7</onright>
<onup>21</onup>
- <ondown>50</ondown>
+ <ondown>12</ondown>
<textureFocus>tab_down.png</textureFocus>
<textureNoFocus>tab_up.png</textureNoFocus>
<textureAscending>arrow_round_up_nofocus.png</textureAscending>
@@ -150,10 +152,10 @@
<description>Current program title</description>
<type>fadelabel</type>
<id>13</id>
- <posX>330</posX>
- <posY>550</posY>
+ <posX>125</posX>
+ <posY>260</posY>
<width>200</width>
- <label>#TV.View.title</label>
+ <label>#TV.View.title</label>
<font>font13</font>
<textcolor>White</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -164,9 +166,9 @@
<description>Current program time</description>
<type>label</type>
<id>13</id>
- <posX>700</posX>
- <posY>580</posY>
- <label>#TV.View.start - #TV.View.stop</label>
+ <posX>515</posX>
+ <posY>220</posY>
+ <label>#TV.View.start - #TV.View.stop</label>
<font>font13</font>
<align>left</align>
<textcolor>FFFFFFFF</textcolor>
@@ -177,9 +179,9 @@
<description>Current Channelname</description>
<type>fadelabel</type>
<id>13</id>
- <posX>190</posX>
- <posY>580</posY>
- <width>200</width>
+ <posX>125</posX>
+ <posY>220</posY>
+ <width>400</width>
<label>#TV.View.channel</label>
<font>font13</font>
<align>Left</align>
@@ -191,8 +193,8 @@
<description>Description1</description>
<type>textboxscrollup</type>
<id>15</id>
- <posX>330</posX>
- <posY>580</posY>
+ <posX>20</posX>
+ <posY>300</posY>
<width>510</width>
<height>120</height>
<seperator>----------------------------------------------------------------------------------------------</seperator>
@@ -258,7 +260,7 @@
<width>200</width>
<height>40</height>
<posX>161</posX>
- <label>#TV.Record.channel\r#TV.Record.title\r#TV.Record.start-#TV.Record.stop</label>
+ <label>#TV.Record.channel\r#TV.Record.title\r#TV.Record.start-#TV.Record.stop</label>
<font>font13</font>
<textcolor>White</textcolor>
<animation effect="fade" time="250">WindowOpen</animation>
@@ -278,11 +280,11 @@
<control>
<description>On Next</description>
- <visable>player.hasvideo</visable>
+
<type>fadelabel</type>
<id>13</id>
- <posX>900</posX>
- <posY>550</posY>
+ <posX>20</posX>
+ <posY>400</posY>
<width>600</width>
<label>On Next</label>
<font>font13</font>
@@ -294,11 +296,11 @@
<control>
<description>On Next Program Title</description>
- <visable>player.hasvideo</visable>
+
<type>fadelabel</type>
<id>13</id>
- <posX>900</posX>
- <posY>580</posY>
+ <posX>125</posX>
+ <posY>400</posY>
<width>400</width>
<label>#TV.Next.title</label>
<font>font13</font>
@@ -310,14 +312,15 @@
<control>
<description>On Now Channel Logo</description>
- <visable>player.hasvideo</visable>
+
<type>image</type>
<id>22</id>
- <posX>50</posX>
- <posY>580</posY>
- <width>80</width>
- <height>80</height>
- <texture>#TV.View.thumb</texture>
+ <posX>20</posX>
+ <posY>210</posY>
+ <width>100</width>
+ <height>100</height>
+ <texture>#TV.View.thumb</texture>
+
<animation effect="fade" time="250">WindowOpen</animation>
<animation effect="fade" time="500">WindowClose</animation>
</control>
@@ -358,8 +361,99 @@
<animation effect="fade" time="500" start="50">WindowClose</animation>
</control>
-
+ <control>
+ <description>TIme Shifting</description>
+
+ <type>togglebutton</type>
+ <id>9</id>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>221</posX>
+ <label>708</label>
+
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>11</onleft>
+ <onright>2</onright>
+ <onup>8</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_toggleon_focus.png</textureFocus>
+ <textureNoFocus>tab_toggleon_nofocus.png</textureNoFocus>
+ <AltTextureFocus>tab_toggleoff_focus.png</AltTextureFocus>
+ <AltTextureNoFocus>tab_toggleoff_nofocus.png</AltTextureNoFocus>
+ <textureAscending>arrow_round_up_nofocus.png</textureAscending>
+ <visible>Control.HasFocus(8)|Control.HasFocus(9)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <description>Search</description>
+
+ <type>button</type>
+ <id>12</id>
+ <label>137</label>
+ <hyperlink>604</hyperlink>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>158</posY>
+ <posX>430</posX>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>8</onleft>
+ <onright>7</onright>
+ <onup>2</onup>
+ <ondown>10</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+
+ <visible>Control.HasFocus(2)|Control.HasFocus(10)|Control.HasFocus(12)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
+<control>
+ <description>Scheduled recordings</description>
+
+ <type>button</type>
+ <id>10</id>
+ <label>603</label>
+ <hyperlink>601</hyperlink>
+ <animation effect="fade" time="400">WindowClose</animation>
+ <animation effect="fade" time="400">WindowOpen</animation>
+ <posY>194</posY>
+ <posX>430</posX>
+ <font>font14</font>
+ <width>209</width>
+ <height>36</height>
+ <onleft>8</onleft>
+ <onright>7</onright>
+ <onup>12</onup>
+ <ondown>50</ondown>
+ <textureFocus>tab_down.png</textureFocus>
+ <textureNoFocus>tab_up.png</textureNoFocus>
+
+ <visible>Control.HasFocus(2)|Control.HasFocus(12)|Control.HasFocus(10)</visible>
+ <animation effect="fade" time="250">visiblechange</animation>
+ <animation effect="slide" end="0,36" time="250">visiblechange</animation>
+ </control>
+ <control>
+ <description>video window</description>
+ <type>videowindow</type>
+ <id>99</id>
+ <posX>760</posX>
+ <posY>210</posY>
+ <width>568</width>
+ <height>320</height>
+ <onleft>2</onleft>
+ <onright>2</onright>
+ <action>18</action>
+ <textureFocus>tv_green_border.png</textureFocus>
+ <animation effect="fade" time="250">WindowOpen</animation>
+ <animation effect="fade" time="500">WindowClose</animation>
+ </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: <ide...@us...> - 2007-09-06 21:28:02
|
Revision: 900
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=900&view=rev
Author: ideasdigger
Date: 2007-09-06 14:27:58 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
deleting empty folders
Removed Paths:
-------------
trunk/plugins/MyOrganizer/Plugins/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ide...@us...> - 2007-09-06 21:27:43
|
Revision: 899
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=899&view=rev
Author: ideasdigger
Date: 2007-09-06 14:26:56 -0700 (Thu, 06 Sep 2007)
Log Message:
-----------
Visit the forum:
http://forum.team-mediaportal.com/myorganizer-t27651.html
MyOrganizer
-----------
v1.0
Supports Google calendar. The calendar feed is configured.
Supports adding and deleting of the events.
Supports MediaPortal 0.2.3.0 RC1
Description:
------------
MyOrganizer is a plug-in that should bring together and give you control
over the different calendars inside the MediaPortal. It is planned to
support Google and Outlook for starters.
The plug-in has an extendable architecture so, if you want to give a hand
with developing connectors to different calendars out there, you are more
than welcome to join in.
Installation Instructions
-------------------------
Place all the bits inside the Windows directory.
Place all the skins in the BlueTwo skin folder.
NOTE: Please do not criticize the skins, but just fix them. Please send me the fixes for testing.
Configuration
-------------
Google feeds:
Default Feed URI - http://www.google.com/calendar/feeds/default/private/full
Other calendar - http://www.google.com/calendar/feeds/<calendar_id>/private/full
Added Paths:
-----------
trunk/plugins/MyOrganizer/
trunk/plugins/MyOrganizer/Plugins/
trunk/plugins/MyOrganizer/Plugins/Windows/
trunk/plugins/MyOrganizer/Readme.txt
trunk/plugins/MyOrganizer/Release/
trunk/plugins/MyOrganizer/Release/Plugins/
trunk/plugins/MyOrganizer/Release/Plugins/Windows/
trunk/plugins/MyOrganizer/Release/Plugins/Windows/GoogleConnectorLib.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizer.dll
trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizerLib.dll
trunk/plugins/MyOrganizer/Release/Skin/
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizer.xml
trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizercreate.xml
trunk/plugins/MyOrganizer/Skin/
trunk/plugins/MyOrganizer/Skin/BlueTwo/
trunk/plugins/MyOrganizer/Skin/BlueTwo/Media/
trunk/plugins/MyOrganizer/Skin/BlueTwo/myorganizer.xml
trunk/plugins/MyOrganizer/Skin/BlueTwo/myorganizercreate.xml
trunk/plugins/MyOrganizer/Sources/
trunk/plugins/MyOrganizer/Sources/GoogleConnector/
trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnector.cs
trunk/plugins/MyOrganizer/Sources/GoogleConnector/GoogleConnectorLib.csproj
trunk/plugins/MyOrganizer/Sources/GoogleConnector/Properties/
trunk/plugins/MyOrganizer/Sources/GoogleConnector/Properties/AssemblyInfo.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Config.Designer.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Config.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Config.resx
trunk/plugins/MyOrganizer/Sources/MyOrganizer/CreateNewEvent.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/IOrganizerService.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/MyOrganizer.csproj
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Organizer.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/OrganizerService.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Properties/
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Properties/AssemblyInfo.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizer/Skin/
trunk/plugins/MyOrganizer/Sources/MyOrganizer.sln
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/Event.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/IConnector.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/IEventReader.cs
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/MyOrganizerLib.csproj
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/Properties/
trunk/plugins/MyOrganizer/Sources/MyOrganizerLib/Properties/AssemblyInfo.cs
Added: trunk/plugins/MyOrganizer/Readme.txt
===================================================================
--- trunk/plugins/MyOrganizer/Readme.txt (rev 0)
+++ trunk/plugins/MyOrganizer/Readme.txt 2007-09-06 21:26:56 UTC (rev 899)
@@ -0,0 +1,38 @@
+Visit the forum:
+http://forum.team-mediaportal.com/myorganizer-t27651.html
+
+MyOrganizer
+-----------
+
+v1.0
+Supports Google calendar. The calendar feed is configured.
+Supports adding and deleting of the events.
+Supports MediaPortal 0.2.3.0 RC1
+
+Description:
+------------
+
+MyOrganizer is a plug-in that should bring together and give you control
+over the different calendars inside the MediaPortal. It is planned to
+support Google and Outlook for starters.
+
+ The plug-in has an extendable architecture so, if you want to give a hand
+with developing connectors to different calendars out there, you are more
+than welcome to join in.
+
+
+Installation Instructions
+-------------------------
+
+Place all the bits inside the Windows directory.
+
+Place all the skins in the BlueTwo skin folder.
+
+NOTE: Please do not criticize the skins, but just fix them. Please send me the fixes for testing.
+
+
+Configuration
+-------------
+Google feeds:
+Default Feed URI - http://www.google.com/calendar/feeds/default/private/full
+Other calendar - http://www.google.com/calendar/feeds/<calendar_id>/private/full
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/GoogleConnectorLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/GoogleConnectorLib.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizer.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizer.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizerLib.dll
===================================================================
(Binary files differ)
Property changes on: trunk/plugins/MyOrganizer/Release/Plugins/Windows/MyOrganizerLib.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizer.xml
===================================================================
--- trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizer.xml (rev 0)
+++ trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizer.xml 2007-09-06 21:26:56 UTC (rev 899)
@@ -0,0 +1,839 @@
+<window>
+ <id>7333</id>
+ <defaultcontrol>49</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <description>BackGround</description>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Selected Date</description>
+ <id>68</id>
+ <posX>251</posX>
+ <posY>90</posY>
+ <label>#date</label>
+ <align>right</align>
+ </control>
+ <control>
+ <type>image</type>
+ <description>Logo Image</description>
+ <id>1</id>
+ <posX>24</posX>
+ <posY>368</posY>
+ <texture>hover_my planner.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <id>129</id>
+ <posX>40</posX>
+ <posY>20</posY>
+ <texture>myorganizer_logo.png</texture>
+ </control>
+ <control>
+ <type>label</type>
+ <description>text label</description>
+ <id>130</id>
+ <posX>265</posX>
+ <posY>60</posY>
+ <label>My Organizer</label>
+ <font>font16</font>
+ <align>right</align>
+ </control>
+
+ <control>
+ <type>group</type>
+ <description>Main buttons group</description>
+ <id>45</id>
+ <posX>48</posX>
+ <posY>120</posY>
+ <width>198</width>
+ <height>142</height>
+ <animation>None</animation>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>0</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+
+ <!-- control>
+ <type>button</type>
+ <description>Next-Month</description>
+ <id>2</id>
+ <posX>52</posX>
+ <posY>124</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>45</onup>
+ <ondown>3</ondown>
+ <label>Next Month</label>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Previous-Month</description>
+ <id>3</id>
+ <posX>52</posX>
+ <posY>158</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>2</onup>
+ <ondown>49</ondown>
+ <label>Previous Month</label>
+ </control -->
+ <control>
+ <type>button</type>
+ <description>Today Button</description>
+ <id>49</id>
+ <posX>52</posX>
+ <posY>124</posY>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>51</onup>
+ <ondown>51</ondown>
+ <label>Goto Today</label>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Add Event Button</description>
+ <id>51</id>
+ <posX>52</posX>
+ <posY>158</posY>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>49</onup>
+ <ondown>49</ondown>
+ <label>Add Event</label>
+ </control>
+ <!-- control>
+ <type>togglebutton</type>
+ <description>ShowDates-Button</description>
+ <id>48</id>
+ <posX>52</posX>
+ <posY>226</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>44</onup>
+ <ondown>43</ondown>
+ <label>Show dates</label>
+ </control -->
+ </control>
+ <control>
+ <type>group</type>
+ <description>Dates group</description>
+ <id>5</id>
+ <posX>320</posX>
+ <posY>16</posY>
+ <width>392</width>
+ <height>304</height>
+ <visible>true</visible>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>5</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+ <control>
+ <type>image</type>
+ <description>MenuBackgroundImage</description>
+ <id>80</id>
+ <posX>320</posX>
+ <posY>16</posY>
+ <width>392</width>
+ <height>304</height>
+ <visible>true</visible>
+ <texture>background_glass_menu_area.png</texture>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>Previous-Month</description>
+ <id>3</id>
+ <posX>400</posX>
+ <posY>25</posY>
+ <width>40</width>
+ <onleft>49</onleft>
+ <onright>2</onright>
+ <onup>49</onup>
+ <ondown>70</ondown>
+ <label><<</label>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Current Month</description>
+ <id>4</id>
+ <posX>465</posX>
+ <posY>25</posY>
+ <colordiffuse>ffe0e0e0</colordiffuse>
+ <label>Month</label>
+ <font>font18</font>
+ <!-- align>left</align -->
+ </control>
+ <control>
+ <type>button</type>
+ <description>Next-Month</description>
+ <id>2</id>
+ <posX>600</posX>
+ <posY>25</posY>
+ <width>40</width>
+ <onleft>3</onleft>
+ <onright>70</onright>
+ <onup>49</onup>
+ <!-- ondown>3</ondown -->
+ <label>>></label>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>70</id>
+ <posX>355</posX>
+ <posY>58</posY>
+ <label>S</label>
+ <font>font18</font>
+ <textcolor>Red</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>71</id>
+ <posX>405</posX>
+ <posY>58</posY>
+ <label>M</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>72</id>
+ <posX>455</posX>
+ <posY>58</posY>
+ <label>T</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>73</id>
+ <posX>505</posX>
+ <posY>58</posY>
+ <label>W</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>74</id>
+ <posX>555</posX>
+ <posY>58</posY>
+ <label>T</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>75</id>
+ <posX>605</posX>
+ <posY>58</posY>
+ <label>F</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>76</id>
+ <posX>655</posX>
+ <posY>58</posY>
+ <label>S</label>
+ <font>font18</font>
+ <textcolor>Red</textcolor>
+ </control>
+
+ <control>
+ <type>button</type>
+ <id>7</id>
+ <posX>345</posX>
+ <posY>88</posY>
+ <onleft>3</onleft>
+ <onright>8</onright>
+ <onup>3</onup>
+ <ondown>14</ondown>
+ <label>01.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>8</id>
+ <posX>395</posX>
+ <posY>88</posY>
+ <onleft>7</onleft>
+ <onright>9</onright>
+ <onup>3</onup>
+ <ondown>15</ondown>
+ <label>02.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>9</id>
+ <posX>445</posX>
+ <posY>88</posY>
+ <onleft>8</onleft>
+ <onright>10</onright>
+ <onup>3</onup>
+ <ondown>16</ondown>
+ <label>03.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>10</id>
+ <posX>495</posX>
+ <posY>88</posY>
+ <onleft>9</onleft>
+ <onright>11</onright>
+ <onup>3</onup>
+ <ondown>17</ondown>
+ <label>04.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>11</id>
+ <posX>545</posX>
+ <posY>88</posY>
+ <onleft>10</onleft>
+ <onright>12</onright>
+ <onup>3</onup>
+ <ondown>18</ondown>
+ <label>05.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>12</id>
+ <posX>595</posX>
+ <posY>88</posY>
+ <onleft>11</onleft>
+ <onright>13</onright>
+ <onup>3</onup>
+ <ondown>19</ondown>
+ <label>06.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>13</id>
+ <posX>645</posX>
+ <posY>88</posY>
+ <onleft>12</onleft>
+ <onright>14</onright>
+ <onup>3</onup>
+ <ondown>20</ondown>
+ <label>07.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>14</id>
+ <posX>345</posX>
+ <posY>123</posY>
+ <onleft>3</onleft>
+ <onright>15</onright>
+ <onup>7</onup>
+ <ondown>21</ondown>
+ <label>08.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>15</id>
+ <posX>395</posX>
+ <posY>123</posY>
+ <onleft>14</onleft>
+ <onright>16</onright>
+ <onup>8</onup>
+ <ondown>22</ondown>
+ <label>09.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>16</id>
+ <posX>445</posX>
+ <posY>123</posY>
+ <onleft>15</onleft>
+ <onright>17</onright>
+ <onup>9</onup>
+ <ondown>23</ondown>
+ <label>10.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>17</id>
+ <posX>495</posX>
+ <posY>123</posY>
+ <onleft>16</onleft>
+ <onright>18</onright>
+ <onup>10</onup>
+ <ondown>24</ondown>
+ <label>11.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>18</id>
+ <posX>545</posX>
+ <posY>123</posY>
+ <onleft>17</onleft>
+ <onright>19</onright>
+ <onup>11</onup>
+ <ondown>25</ondown>
+ <label>12.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>19</id>
+ <posX>595</posX>
+ <posY>123</posY>
+ <onleft>18</onleft>
+ <onright>20</onright>
+ <onup>12</onup>
+ <ondown>26</ondown>
+ <label>13.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>20</id>
+ <posX>645</posX>
+ <posY>123</posY>
+ <onleft>19</onleft>
+ <onright>21</onright>
+ <onup>13</onup>
+ <ondown>27</ondown>
+ <label>14.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>21</id>
+ <posX>345</posX>
+ <posY>158</posY>
+ <onleft>3</onleft>
+ <onright>22</onright>
+ <onup>14</onup>
+ <ondown>28</ondown>
+ <label>15.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>22</id>
+ <posX>395</posX>
+ <posY>158</posY>
+ <onleft>21</onleft>
+ <onright>23</onright>
+ <onup>15</onup>
+ <ondown>29</ondown>
+ <label>16.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>23</id>
+ <posX>445</posX>
+ <posY>158</posY>
+ <onleft>22</onleft>
+ <onright>24</onright>
+ <onup>16</onup>
+ <ondown>30</ondown>
+ <label>17.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>24</id>
+ <posX>495</posX>
+ <posY>158</posY>
+ <onleft>23</onleft>
+ <onright>25</onright>
+ <onup>17</onup>
+ <ondown>31</ondown>
+ <label>18.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>25</id>
+ <posX>545</posX>
+ <posY>158</posY>
+ <onleft>24</onleft>
+ <onright>26</onright>
+ <onup>18</onup>
+ <ondown>32</ondown>
+
+ <label>19.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>26</id>
+ <posX>595</posX>
+ <posY>158</posY>
+ <onleft>25</onleft>
+ <onright>27</onright>
+ <onup>19</onup>
+ <ondown>33</ondown>
+
+ <label>20.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>27</id>
+ <posX>645</posX>
+ <posY>158</posY>
+ <onleft>26</onleft>
+ <onright>28</onright>
+ <onup>20</onup>
+ <ondown>34</ondown>
+
+ <label>21.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>28</id>
+ <posX>345</posX>
+ <posY>193</posY>
+ <onleft>3</onleft>
+ <onright>29</onright>
+ <onup>21</onup>
+ <ondown>35</ondown>
+
+ <label>23.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>29</id>
+ <posX>395</posX>
+ <posY>193</posY>
+ <onleft>28</onleft>
+ <onright>30</onright>
+ <onup>22</onup>
+ <ondown>36</ondown>
+
+ <label>23.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>30</id>
+ <posX>445</posX>
+ <posY>193</posY>
+ <onleft>29</onleft>
+ <onright>31</onright>
+ <onup>23</onup>
+ <ondown>37</ondown>
+
+ <label>24.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>31</id>
+ <posX>495</posX>
+ <posY>193</posY>
+ <onleft>30</onleft>
+ <onright>32</onright>
+ <onup>24</onup>
+ <ondown>38</ondown>
+ <label>25.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>32</id>
+ <posX>545</posX>
+ <posY>193</posY>
+ <onleft>31</onleft>
+ <onright>33</onright>
+ <onup>25</onup>
+ <ondown>39</ondown>
+ <label>26.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>33</id>
+ <posX>595</posX>
+ <posY>193</posY>
+ <onleft>32</onleft>
+ <onright>34</onright>
+ <onup>26</onup>
+ <ondown>40</ondown>
+ <label>27.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>34</id>
+ <posX>645</posX>
+ <posY>193</posY>
+ <onleft>33</onleft>
+ <onright>35</onright>
+ <onup>27</onup>
+ <ondown>41</ondown>
+ <label>28.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>35</id>
+ <posX>345</posX>
+ <posY>228</posY>
+ <onleft>3</onleft>
+ <onright>36</onright>
+ <onup>28</onup>
+ <ondown>42</ondown>
+ <label>29.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>36</id>
+ <posX>395</posX>
+ <posY>228</posY>
+ <onleft>35</onleft>
+ <onright>37</onright>
+ <onup>29</onup>
+ <ondown>43</ondown>
+ <label>30.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>37</id>
+ <posX>445</posX>
+ <posY>228</posY>
+ <onleft>36</onleft>
+ <onright>38</onright>
+ <onup>30</onup>
+ <ondown>43</ondown>
+ <label>31.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>38</id>
+ <posX>495</posX>
+ <posY>228</posY>
+ <onleft>37</onleft>
+ <onright>39</onright>
+ <onup>31</onup>
+ <ondown>43</ondown>
+ <label>32.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>39</id>
+ <posX>545</posX>
+ <posY>228</posY>
+ <onleft>38</onleft>
+ <onright>40</onright>
+ <onup>32</onup>
+ <ondown>42</ondown>
+ <label>33.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>40</id>
+ <posX>595</posX>
+ <posY>228</posY>
+ <onleft>39</onleft>
+ <onright>41</onright>
+ <onup>33</onup>
+ <ondown>43</ondown>
+ <label>34.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>41</id>
+ <posX>645</posX>
+ <posY>228</posY>
+ <onleft>40</onleft>
+ <onright>42</onright>
+ <onup>34</onup>
+ <ondown>43</ondown>
+ <label>35.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>42</id>
+ <posX>345</posX>
+ <posY>263</posY>
+ <onleft>3</onleft>
+ <onright>43</onright>
+ <onup>35</onup>
+ <ondown>50</ondown>
+ <label>36.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>43</id>
+ <posX>395</posX>
+ <posY>263</posY>
+ <onleft>42</onleft>
+ <onright>2</onright>
+ <onup>36</onup>
+ <ondown>50</ondown>
+ <label>37.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+
+ <!-- control>
+ <type>button</type>
+ <description>OKButton</description>
+ <id>46</id>
+ <posX>470</posX>
+ <posY>272</posY>
+ <label>OK</label>
+ <width>100</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <description>CancelButton</description>
+ <id>47</id>
+ <posX>580</posX>
+ <posY>272</posY>
+ <label>Cancel</label>
+ <width>100</width>
+ <height>32</height>
+ </control -->
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Events</description>
+ <id>69</id>
+ <posX>144</posX>
+ <posY>296</posY>
+ <label>Events:</label>
+ <align>left</align>
+ </control>
+ <control>
+ <type>listcontrol</type>
+ <description>events listcontrol</description>
+ <id>50</id>
+ <posX>144</posX>
+ <posY>328</posY>
+ <width>568</width>
+ <height>236</height>
+ <onleft>5</onleft>
+ <onright>5</onright>
+ <onup>49</onup>
+ <ondown>5</ondown>
+ <textureDown>page_down_nofocus.png</textureDown>
+ <remoteColor>ffFFA075</remoteColor>
+ <textureDownFocus>page_down_focus.png</textureDownFocus>
+ <shadedColor>20ffffff</shadedColor>
+ <textureHeight>32</textureHeight>
+ <font>font13</font>
+ <playedColor>ffa0d0ff</playedColor>
+ <IconYOff>8</IconYOff>
+ <IconXOff>8</IconXOff>
+ <textXOff>5</textXOff>
+ <textYOff>4</textYOff>
+ <textureUp>page_up_nofocus.png</textureUp>
+ <spinHeight>27</spinHeight>
+ <textureNoFocus>list_sub_nofocus.png</textureNoFocus>
+ <spinPosY>530</spinPosY>
+ <textXOff2>0</textXOff2>
+ <animation>WindowClose</animation>
+ <textYOff2>4</textYOff2>
+ <downloadColor>ff80ff80</downloadColor>
+ <spinPosX>590</spinPosX>
+ <suffix>|</suffix>
+ <textureUpFocus>page_up_focus.png</textureUpFocus>
+ <image>folder_focus.png</image>
+ <selectedColor>FFF8BC70</selectedColor>
+ <spinWidth>26</spinWidth>
+ <textureFocus>list_sub_focus.png</textureFocus>
+ </control>
+
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizercreate.xml
===================================================================
--- trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizercreate.xml (rev 0)
+++ trunk/plugins/MyOrganizer/Release/Skin/BlueTwo/myorganizercreate.xml 2007-09-06 21:26:56 UTC (rev 899)
@@ -0,0 +1,402 @@
+<window>
+ <id>7334</id>
+ <defaultcontrol>67</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <description>BackGround</description>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <type>group</type>
+ <description>Time group</description>
+ <id>10</id>
+ <posX>8</posX>
+ <posY>176</posY>
+ <width>500</width>
+ <height>344</height>
+ <animation>None</animation>
+ <visible>true</visible>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>5</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+ <control>
+ <type>image</type>
+ <description>MenuBackgroundImage</description>
+ <id>11</id>
+ <posX>8</posX>
+ <posY>176</posY>
+ <width>704</width>
+ <height>344</height>
+ <visible>true</visible>
+ <texture>background_glass_menu_area.png</texture>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>DateLabel</description>
+ <id>35</id>
+ <posX>50</posX>
+ <posY>75</posY>
+ <label>Date:</label>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>DateSpin</description>
+ <id>36</id>
+ <posX>160</posX>
+ <posY>80</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>int</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>22</onright>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>MonthSpin</description>
+ <id>37</id>
+ <posX>240</posX>
+ <posY>80</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>4</digits>
+ <spintype>disc</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>24</onright>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>YearSpin</description>
+ <id>38</id>
+ <posX>340</posX>
+ <posY>80</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>int</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>24</onright>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>TimeLabel</description>
+ <id>20</id>
+ <posX>50</posX>
+ <posY>110</posY>
+ <label>Time Start:</label>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>TimeHourSpin</description>
+ <id>21</id>
+ <posX>160</posX>
+ <posY>115</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>int</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>22</onright>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>TimeMinuteSpin</description>
+ <id>22</id>
+ <posX>240</posX>
+ <posY>115</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>disc</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>24</onright>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Time End Label</description>
+ <id>30</id>
+ <posX>350</posX>
+ <posY>110</posY>
+ <label>Ends:</label>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>TimeEndHourSpin</description>
+ <id>31</id>
+ <posX>440</posX>
+ <posY>115</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>int</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>22</onright>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>TimeEndMinuteSpin</description>
+ <id>32</id>
+ <posX>520</posX>
+ <posY>115</posY>
+ <width>16</width>
+ <height>16</height>
+ <digits>2</digits>
+ <spintype>disc</spintype>
+ <showrange>no</showrange>
+ <onleft>21</onleft>
+ <onright>24</onright>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Reminder</description>
+ <id>23</id>
+ <posX>50</posX>
+ <posY>135</posY>
+ <label>Reminder:</label>
+ </control>
+ <control>
+ <type>spincontrol</type>
+ <description>RemindSpin</description>
+ <id>24</id>
+ <posX>160</posX>
+ <posY>135</posY>
+ <width>16</width>
+ <height>16</height>
+ <spintype>disc</spintype>
+ <showrange>no</showrange>
+ <onleft>22</onleft>
+ <onright>50</onright>
+ </control>
+
+ <!-- control>
+ <type>togglebutton</type>
+ <description>ReccuringDateButton</description>
+ <id>26</id>
+ <posX>500</posX>
+ <posY>65</posY>
+ <onleft>8</onleft>
+ <onright>7</onright>
+ <onup>22</onup>
+ <ondown>24</ondown>
+ <animation>unfocus</animation>
+ <label>Reccuring date</label>
+ <textcolor>ffffffff</textcolor>
+ </control>
+ <control>
+ <type>button</type>
+ <description>ShowAddedDatesButton</description>
+ <id>27</id>
+ <posX>500</posX>
+ <posY>100</posY>
+ <onleft>8</onleft>
+ <onright>7</onright>
+ <onup>23</onup>
+ <ondown>11</ondown>
+ <animation>unfocus</animation>
+ <label>Show/add dates</label>
+ <textcolor>ff000000</textcolor>
+ </control -->
+ </control>
+
+ <control>
+ <type>group</type>
+ <description>Information group</description>
+ <id>50</id>
+ <posX>8</posX>
+ <posY>400</posY>
+ <width>500</width>
+ <height>128</height>
+ <visible>true</visible>
+ <animation>None</animation>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>5</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+ <control>
+ <type>image</type>
+ <description>MenuBackgroundImage</description>
+ <id>51</id>
+ <posX>16</posX>
+ <posY>48</posY>
+ <width>704</width>
+ <height>128</height>
+ <visible>true</visible>
+ <texture>album_background_nofocus.png</texture>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>SubjectLabel</description>
+ <id>65</id>
+ <posX>48</posX>
+ <posY>192</posY>
+ <label>Subject:</label>
+ </control>
+ <control>
+ <type>textbox</type>
+ <description>SubjectText</description>
+ <id>66</id>
+ <posX>48</posX>
+ <posY>224</posY>
+ <width>624</width>
+ <height>90</height>
+ <image>icon-folder.png</image>
+ <label>Subject</label>
+ <text>-</text>
+ <SpinPosX>48</SpinPosX>
+ <SpinPosY>314</SpinPosY>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Subject Edit Button</description>
+ <id>67</id>
+ <posX>160</posX>
+ <posY>192</posY>
+ <onleft>10</onleft>
+ <onright>60</onright>
+ <onup>21</onup>
+ <ondown>60</ondown>
+ <animation>unfocus</animation>
+ <label>Edit</label>
+ <width>75</width>
+ <height>32</height>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>DescriptionLabel</description>
+ <id>55</id>
+ <posX>48</posX>
+ <posY>282</posY>
+ <label>Description:</label>
+ </control>
+ <control>
+ <type>textbox</type>
+ <description>DescriptionText</description>
+ <id>56</id>
+ <posX>48</posX>
+ <posY>314</posY>
+ <width>624</width>
+ <height>90</height>
+ <image>icon-folder.png</image>
+ <label>Description</label>
+ <text>-</text>
+ <SpinPosX>48</SpinPosX>
+ <SpinPosY>314</SpinPosY>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Description Edit Button</description>
+ <id>57</id>
+ <posX>160</posX>
+ <posY>282</posY>
+ <onleft>10</onleft>
+ <onright>60</onright>
+ <onup>66</onup>
+ <ondown>60</ondown>
+ <animation>unfocus</animation>
+ <label>Edit</label>
+ <width>75</width>
+ <height>32</height>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>LocationLabel</description>
+ <id>58</id>
+ <posX>50</posX>
+ <posY>350</posY>
+ <label>Location:</label>
+ </control>
+ <control>
+ <type>textbox</type>
+ <description>Location Text</description>
+ <id>59</id>
+ <posX>200</posX>
+ <posY>350</posY>
+ <width>480</width>
+ <height>26</height>
+ <image>icon-folder.png</image>
+ <text>-</text>
+ <SpinPosX>200</SpinPosX>
+ <SpinPosY>376</SpinPosY>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Location Edit Button</description>
+ <id>60</id>
+ <posX>48</posX>
+ <posY>376</posY>
+ <onleft>57</onleft>
+ <onright>200</onright>
+ <onup>57</onup>
+ <ondown>200</ondown>
+ <label>Edit</label>
+ <width>75</width>
+ <height>32</height>
+ </control>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>OKButton</description>
+ <id>200</id>
+ <posX>472</posX>
+ <posY>528</posY>
+ <onleft>8</onleft>
+ <onright>201</onright>
+ <onup>57</onup>
+ <ondown>21</ondown>
+ <animation>unfocus</animation>
+ <label>OK</label>
+ <width>100</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <description>CancelButton</description>
+ <id>201</id>
+ <posX>584</posX>
+ <posY>528</posY>
+ <onleft>200</onleft>
+ <onright>21</onright>
+ <onup>57</onup>
+ <ondown>21</ondown>
+ <animation>unfocus</animation>
+ <label>Cancel</label>
+ <width>100</width>
+ <height>32</height>
+ </control>
+ </controls>
+</window>
\ No newline at end of file
Added: trunk/plugins/MyOrganizer/Skin/BlueTwo/myorganizer.xml
===================================================================
--- trunk/plugins/MyOrganizer/Skin/BlueTwo/myorganizer.xml (rev 0)
+++ trunk/plugins/MyOrganizer/Skin/BlueTwo/myorganizer.xml 2007-09-06 21:26:56 UTC (rev 899)
@@ -0,0 +1,839 @@
+<window>
+ <id>7333</id>
+ <defaultcontrol>49</defaultcontrol>
+ <allowoverlay>yes</allowoverlay>
+ <controls>
+ <control>
+ <type>image</type>
+ <description>BackGround</description>
+ <id>1</id>
+ <posX>0</posX>
+ <posY>0</posY>
+ <texture>background.png</texture>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Selected Date</description>
+ <id>68</id>
+ <posX>251</posX>
+ <posY>90</posY>
+ <label>#date</label>
+ <align>right</align>
+ </control>
+ <control>
+ <type>image</type>
+ <description>Logo Image</description>
+ <id>1</id>
+ <posX>24</posX>
+ <posY>368</posY>
+ <texture>hover_my planner.png</texture>
+ </control>
+ <control>
+ <type>image</type>
+ <id>129</id>
+ <posX>40</posX>
+ <posY>20</posY>
+ <texture>myorganizer_logo.png</texture>
+ </control>
+ <control>
+ <type>label</type>
+ <description>text label</description>
+ <id>130</id>
+ <posX>265</posX>
+ <posY>60</posY>
+ <label>My Organizer</label>
+ <font>font16</font>
+ <align>right</align>
+ </control>
+
+ <control>
+ <type>group</type>
+ <description>Main buttons group</description>
+ <id>45</id>
+ <posX>48</posX>
+ <posY>120</posY>
+ <width>198</width>
+ <height>142</height>
+ <animation>None</animation>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>0</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+
+ <!-- control>
+ <type>button</type>
+ <description>Next-Month</description>
+ <id>2</id>
+ <posX>52</posX>
+ <posY>124</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>45</onup>
+ <ondown>3</ondown>
+ <label>Next Month</label>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Previous-Month</description>
+ <id>3</id>
+ <posX>52</posX>
+ <posY>158</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>2</onup>
+ <ondown>49</ondown>
+ <label>Previous Month</label>
+ </control -->
+ <control>
+ <type>button</type>
+ <description>Today Button</description>
+ <id>49</id>
+ <posX>52</posX>
+ <posY>124</posY>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>51</onup>
+ <ondown>51</ondown>
+ <label>Goto Today</label>
+ </control>
+ <control>
+ <type>button</type>
+ <description>Add Event Button</description>
+ <id>51</id>
+ <posX>52</posX>
+ <posY>158</posY>
+ <onleft>3</onleft>
+ <onright>3</onright>
+ <onup>49</onup>
+ <ondown>49</ondown>
+ <label>Add Event</label>
+ </control>
+ <!-- control>
+ <type>togglebutton</type>
+ <description>ShowDates-Button</description>
+ <id>48</id>
+ <posX>52</posX>
+ <posY>226</posY>
+ <onleft>13</onleft>
+ <onright>7</onright>
+ <onup>44</onup>
+ <ondown>43</ondown>
+ <label>Show dates</label>
+ </control -->
+ </control>
+ <control>
+ <type>group</type>
+ <description>Dates group</description>
+ <id>5</id>
+ <posX>320</posX>
+ <posY>16</posY>
+ <width>392</width>
+ <height>304</height>
+ <visible>true</visible>
+ <mpe>
+ <layout>Grid</layout>
+ <spring>no</spring>
+ <spacing>5</spacing>
+ <padding>
+ <top>0</top>
+ <right>0</right>
+ <bottom>0</bottom>
+ <left>0</left>
+ </padding>
+ </mpe>
+ <control>
+ <type>image</type>
+ <description>MenuBackgroundImage</description>
+ <id>80</id>
+ <posX>320</posX>
+ <posY>16</posY>
+ <width>392</width>
+ <height>304</height>
+ <visible>true</visible>
+ <texture>background_glass_menu_area.png</texture>
+ </control>
+
+ <control>
+ <type>button</type>
+ <description>Previous-Month</description>
+ <id>3</id>
+ <posX>400</posX>
+ <posY>25</posY>
+ <width>40</width>
+ <onleft>49</onleft>
+ <onright>2</onright>
+ <onup>49</onup>
+ <ondown>70</ondown>
+ <label><<</label>
+ </control>
+ <control>
+ <type>label</type>
+ <description>Current Month</description>
+ <id>4</id>
+ <posX>465</posX>
+ <posY>25</posY>
+ <colordiffuse>ffe0e0e0</colordiffuse>
+ <label>Month</label>
+ <font>font18</font>
+ <!-- align>left</align -->
+ </control>
+ <control>
+ <type>button</type>
+ <description>Next-Month</description>
+ <id>2</id>
+ <posX>600</posX>
+ <posY>25</posY>
+ <width>40</width>
+ <onleft>3</onleft>
+ <onright>70</onright>
+ <onup>49</onup>
+ <!-- ondown>3</ondown -->
+ <label>>></label>
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>70</id>
+ <posX>355</posX>
+ <posY>58</posY>
+ <label>S</label>
+ <font>font18</font>
+ <textcolor>Red</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>71</id>
+ <posX>405</posX>
+ <posY>58</posY>
+ <label>M</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>72</id>
+ <posX>455</posX>
+ <posY>58</posY>
+ <label>T</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>73</id>
+ <posX>505</posX>
+ <posY>58</posY>
+ <label>W</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>74</id>
+ <posX>555</posX>
+ <posY>58</posY>
+ <label>T</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>75</id>
+ <posX>605</posX>
+ <posY>58</posY>
+ <label>F</label>
+ <font>font18</font>
+ <textcolor>Gold</textcolor>
+ </control>
+ <control>
+ <type>label</type>
+ <description>label</description>
+ <id>76</id>
+ <posX>655</posX>
+ <posY>58</posY>
+ <label>S</label>
+ <font>font18</font>
+ <textcolor>Red</textcolor>
+ </control>
+
+ <control>
+ <type>button</type>
+ <id>7</id>
+ <posX>345</posX>
+ <posY>88</posY>
+ <onleft>3</onleft>
+ <onright>8</onright>
+ <onup>3</onup>
+ <ondown>14</ondown>
+ <label>01.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>8</id>
+ <posX>395</posX>
+ <posY>88</posY>
+ <onleft>7</onleft>
+ <onright>9</onright>
+ <onup>3</onup>
+ <ondown>15</ondown>
+ <label>02.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>9</id>
+ <posX>445</posX>
+ <posY>88</posY>
+ <onleft>8</onleft>
+ <onright>10</onright>
+ <onup>3</onup>
+ <ondown>16</ondown>
+ <label>03.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>10</id>
+ <posX>495</posX>
+ <posY>88</posY>
+ <onleft>9</onleft>
+ <onright>11</onright>
+ <onup>3</onup>
+ <ondown>17</ondown>
+ <label>04.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>11</id>
+ <posX>545</posX>
+ <posY>88</posY>
+ <onleft>10</onleft>
+ <onright>12</onright>
+ <onup>3</onup>
+ <ondown>18</ondown>
+ <label>05.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>12</id>
+ <posX>595</posX>
+ <posY>88</posY>
+ <onleft>11</onleft>
+ <onright>13</onright>
+ <onup>3</onup>
+ <ondown>19</ondown>
+ <label>06.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>13</id>
+ <posX>645</posX>
+ <posY>88</posY>
+ <onleft>12</onleft>
+ <onright>14</onright>
+ <onup>3</onup>
+ <ondown>20</ondown>
+ <label>07.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>14</id>
+ <posX>345</posX>
+ <posY>123</posY>
+ <onleft>3</onleft>
+ <onright>15</onright>
+ <onup>7</onup>
+ <ondown>21</ondown>
+ <label>08.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>15</id>
+ <posX>395</posX>
+ <posY>123</posY>
+ <onleft>14</onleft>
+ <onright>16</onright>
+ <onup>8</onup>
+ <ondown>22</ondown>
+ <label>09.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>16</id>
+ <posX>445</posX>
+ <posY>123</posY>
+ <onleft>15</onleft>
+ <onright>17</onright>
+ <onup>9</onup>
+ <ondown>23</ondown>
+ <label>10.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>17</id>
+ <posX>495</posX>
+ <posY>123</posY>
+ <onleft>16</onleft>
+ <onright>18</onright>
+ <onup>10</onup>
+ <ondown>24</ondown>
+ <label>11.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>18</id>
+ <posX>545</posX>
+ <posY>123</posY>
+ <onleft>17</onleft>
+ <onright>19</onright>
+ <onup>11</onup>
+ <ondown>25</ondown>
+ <label>12.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>19</id>
+ <posX>595</posX>
+ <posY>123</posY>
+ <onleft>18</onleft>
+ <onright>20</onright>
+ <onup>12</onup>
+ <ondown>26</ondown>
+ <label>13.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>20</id>
+ <posX>645</posX>
+ <posY>123</posY>
+ <onleft>19</onleft>
+ <onright>21</onright>
+ <onup>13</onup>
+ <ondown>27</ondown>
+ <label>14.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>21</id>
+ <posX>345</posX>
+ <posY>158</posY>
+ <onleft>3</onleft>
+ <onright>22</onright>
+ <onup>14</onup>
+ <ondown>28</ondown>
+ <label>15.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>22</id>
+ <posX>395</posX>
+ <posY>158</posY>
+ <onleft>21</onleft>
+ <onright>23</onright>
+ <onup>15</onup>
+ <ondown>29</ondown>
+ <label>16.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>23</id>
+ <posX>445</posX>
+ <posY>158</posY>
+ <onleft>22</onleft>
+ <onright>24</onright>
+ <onup>16</onup>
+ <ondown>30</ondown>
+ <label>17.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>24</id>
+ <posX>495</posX>
+ <posY>158</posY>
+ <onleft>23</onleft>
+ <onright>25</onright>
+ <onup>17</onup>
+ <ondown>31</ondown>
+ <label>18.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>25</id>
+ <posX>545</posX>
+ <posY>158</posY>
+ <onleft>24</onleft>
+ <onright>26</onright>
+ <onup>18</onup>
+ <ondown>32</ondown>
+
+ <label>19.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>26</id>
+ <posX>595</posX>
+ <posY>158</posY>
+ <onleft>25</onleft>
+ <onright>27</onright>
+ <onup>19</onup>
+ <ondown>33</ondown>
+
+ <label>20.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>27</id>
+ <posX>645</posX>
+ <posY>158</posY>
+ <onleft>26</onleft>
+ <onright>28</onright>
+ <onup>20</onup>
+ <ondown>34</ondown>
+
+ <label>21.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>28</id>
+ <posX>345</posX>
+ <posY>193</posY>
+ <onleft>3</onleft>
+ <onright>29</onright>
+ <onup>21</onup>
+ <ondown>35</ondown>
+
+ <label>23.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>29</id>
+ <posX>395</posX>
+ <posY>193</posY>
+ <onleft>28</onleft>
+ <onright>30</onright>
+ <onup>22</onup>
+ <ondown>36</ondown>
+
+ <label>23.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>30</id>
+ <posX>445</posX>
+ <posY>193</posY>
+ <onleft>29</onleft>
+ <onright>31</onright>
+ <onup>23</onup>
+ <ondown>37</ondown>
+
+ <label>24.</label>
+
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>31</id>
+ <posX>495</posX>
+ <posY>193</posY>
+ <onleft>30</onleft>
+ <onright>32</onright>
+ <onup>24</onup>
+ <ondown>38</ondown>
+ <label>25.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>32</id>
+ <posX>545</posX>
+ <posY>193</posY>
+ <onleft>31</onleft>
+ <onright>33</onright>
+ <onup>25</onup>
+ <ondown>39</ondown>
+ <label>26.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>33</id>
+ <posX>595</posX>
+ <posY>193</posY>
+ <onleft>32</onleft>
+ <onright>34</onright>
+ <onup>26</onup>
+ <ondown>40</ondown>
+ <label>27.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>34</id>
+ <posX>645</posX>
+ <posY>193</posY>
+ <onleft>33</onleft>
+ <onright>35</onright>
+ <onup>27</onup>
+ <ondown>41</ondown>
+ <label>28.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>35</id>
+ <posX>345</posX>
+ <posY>228</posY>
+ <onleft>3</onleft>
+ <onright>36</onright>
+ <onup>28</onup>
+ <ondown>42</ondown>
+ <label>29.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>36</id>
+ <posX>395</posX>
+ <posY>228</posY>
+ <onleft>35</onleft>
+ <onright>37</onright>
+ <onup>29</onup>
+ <ondown>43</ondown>
+ <label>30.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>37</id>
+ <posX>445</posX>
+ <posY>228</posY>
+ <onleft>36</onleft>
+ <onright>38</onright>
+ <onup>30</onup>
+ <ondown>43</ondown>
+ <label>31.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>38</id>
+ <posX>495</posX>
+ <posY>228</posY>
+ <onleft>37</onleft>
+ <onright>39</onright>
+ <onup>31</onup>
+ <ondown>43</ondown>
+ <label>32.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>39</id>
+ <posX>545</posX>
+ <posY>228</posY>
+ <onleft>38</onleft>
+ <onright>40</onright>
+ <onup>32</onup>
+ <ondown>42</ondown>
+ <label>33.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>40</id>
+ <posX>595</posX>
+ <posY>228</posY>
+ <onleft>39</onleft>
+ <onright>41</onright>
+ <onup>33</onup>
+ <ondown>43</ondown>
+ <label>34.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>41</id>
+ <posX>645</posX>
+ <posY>228</posY>
+ <onleft>40</onleft>
+ <onright>42</onright>
+ <onup>34</onup>
+ <ondown>43</ondown>
+ <label>35.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>42</id>
+ <posX>345</posX>
+ <posY>263</posY>
+ <onleft>3</onleft>
+ <onright>43</onright>
+ <onup>35</onup>
+ <ondown>50</ondown>
+ <label>36.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <id>43</id>
+ <posX>395</posX>
+ <posY>263</posY>
+ <onleft>42</onleft>
+ <onright>2</onright>
+ <onup>36</onup>
+ <ondown>50</ondown>
+ <label>37.</label>
+ <width>40</width>
+ <height>32</height>
+ </control>
+
+ <!-- control>
+ <type>button</type>
+ <description>OKButton</description>
+ <id>46</id>
+ <posX>470</posX>
+ <posY>272</posY>
+ <label>OK</label>
+ <width>100</width>
+ <height>32</height>
+ </control>
+ <control>
+ <type>button</type>
+ <description>CancelButton</description>
+ <id>47</id>
+ <posX>580</posX>
+ <posY>272</posY>
+ <label>Cancel</label>
+ <width>100</width>
+ <height>32</height>
+ </control -->
+ </control>
+
+ <control>
+ <type>label</type>
+ <description>Events</description>
...
[truncated message content] |
2 messages has been excluded from this view by a project administrator.
