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: <ts...@us...> - 2007-11-28 18:27:52
|
Revision: 1098 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1098&view=rev Author: tsmotw Date: 2007-11-28 10:27:44 -0800 (Wed, 28 Nov 2007) Log Message: ----------- Started on BasicHome.xml Modified Paths: -------------- trunk/skins/Xephyr/BasicHome.xml trunk/skins/Xephyr/Media/hover_musicvideo.png trunk/skins/Xephyr/Media/hover_my music.png trunk/skins/Xephyr/Media/hover_my pictures.png trunk/skins/Xephyr/Media/hover_my plugins.png trunk/skins/Xephyr/Media/hover_my radio.png trunk/skins/Xephyr/Media/hover_my tv series.png trunk/skins/Xephyr/Media/hover_my tv.png trunk/skins/Xephyr/Media/hover_my videos.png trunk/skins/Xephyr/Media/hover_my weather.png trunk/skins/Xephyr/Media/hover_play dvd.png trunk/skins/Xephyr/Media/hover_settings.png trunk/skins/Xephyr/Media/mymenu_Movies_focus.png trunk/skins/Xephyr/Media/mymenu_Movies_nofocus.png trunk/skins/Xephyr/Media/mymenu_MusicVideos_focus.png trunk/skins/Xephyr/Media/mymenu_MusicVideos_nofocus.png trunk/skins/Xephyr/Media/mymenu_Music_focus.png trunk/skins/Xephyr/Media/mymenu_Music_nofocus.png trunk/skins/Xephyr/Media/mymenu_Pictures_focus.png trunk/skins/Xephyr/Media/mymenu_Pictures_nofocus.png trunk/skins/Xephyr/Media/mymenu_TVSeries_focus.png trunk/skins/Xephyr/Media/mymenu_TVSeries_nofocus.png trunk/skins/Xephyr/Media/mymenu_full_nofocus.png trunk/skins/Xephyr/SettingsGUI.xml trunk/skins/Xephyr/SettingsMyMusic.xml trunk/skins/Xephyr/SettingsOSD.xml trunk/skins/Xephyr/SettingsSlideShow.xml trunk/skins/Xephyr/TVSeries.xml trunk/skins/Xephyr/myHome.xml trunk/skins/Xephyr/myHomePlugIns.xml trunk/skins/Xephyr/settings.xml trunk/skins/Xephyr/settingsScreen.xml trunk/skins/Xephyr/settingsSkipSteps.xml trunk/skins/Xephyr/settings_dvd.xml trunk/skins/Xephyr/settings_general.xml trunk/skins/Xephyr/settings_movies.xml trunk/skins/Xephyr/settings_recording.xml trunk/skins/Xephyr/settings_tv.xml trunk/skins/Xephyr/settings_tvEpg.xml trunk/skins/Xephyr/settings_tvSort.xml trunk/skins/Xephyr/settings_tvepg_select.xml Added Paths: ----------- trunk/skins/Xephyr/Media/1glassback_tvseries.png trunk/skins/Xephyr/Media/1main_vertical.png trunk/skins/Xephyr/Media/Animations/movies/dummy.png trunk/skins/Xephyr/Media/Animations/music/dummy.png trunk/skins/Xephyr/Media/Animations/pictures/dummy.png trunk/skins/Xephyr/Media/Animations/plugins/ trunk/skins/Xephyr/Media/Animations/plugins/dummy.png trunk/skins/Xephyr/Media/Animations/radio/ trunk/skins/Xephyr/Media/Animations/radio/dummy.png trunk/skins/Xephyr/Media/Animations/settings/ trunk/skins/Xephyr/Media/Animations/settings/dummy.png trunk/skins/Xephyr/Media/Animations/tv/dummy.png trunk/skins/Xephyr/Media/Animations/weather/ trunk/skins/Xephyr/Media/Animations/weather/dummy.png trunk/skins/Xephyr/Media/mymenu_dvd_focus.png trunk/skins/Xephyr/Media/mymenu_dvd_nofocus.png trunk/skins/Xephyr/Media/mymenu_plugins_focus.png trunk/skins/Xephyr/Media/mymenu_plugins_nofocus.png trunk/skins/Xephyr/Media/mymenu_radio_focus.png trunk/skins/Xephyr/Media/mymenu_radio_nofocus.png trunk/skins/Xephyr/Media/mymenu_settings.png trunk/skins/Xephyr/Media/mymenu_settings_focus.png trunk/skins/Xephyr/Media/mymenu_settings_nofocus.png trunk/skins/Xephyr/Media/mymenu_tv_focus.png trunk/skins/Xephyr/Media/mymenu_tv_nofocus.png trunk/skins/Xephyr/Media/mymenu_weather_focus.png trunk/skins/Xephyr/Media/mymenu_weather_nofocus.png trunk/skins/Xephyr/musicvideos.animation.xml Removed Paths: ------------- trunk/skins/Xephyr/Media/1glassmusic backup.png trunk/skins/Xephyr/Media/Animations/Music1.png trunk/skins/Xephyr/Media/Animations/Music11.png trunk/skins/Xephyr/Media/Animations/Music2.png trunk/skins/Xephyr/Media/Animations/Music22.png trunk/skins/Xephyr/Media/Animations/Music3.png trunk/skins/Xephyr/Media/Animations/Pictures1.png trunk/skins/Xephyr/Media/Animations/Pictures11.png trunk/skins/Xephyr/Media/Animations/Pictures2.png trunk/skins/Xephyr/Media/Animations/Pictures22.png trunk/skins/Xephyr/Media/Animations/Pictures3.png trunk/skins/Xephyr/Media/Animations/Radio1.png trunk/skins/Xephyr/Media/Animations/Radio11.png trunk/skins/Xephyr/Media/Animations/Radio2.png trunk/skins/Xephyr/Media/Animations/Radio22.png trunk/skins/Xephyr/Media/Animations/Radio3.png trunk/skins/Xephyr/Media/Animations/TV1.png trunk/skins/Xephyr/Media/Animations/TV11.png trunk/skins/Xephyr/Media/Animations/TV2.png trunk/skins/Xephyr/Media/Animations/TV22.png trunk/skins/Xephyr/Media/Animations/TV3.png trunk/skins/Xephyr/Media/Animations/Video1.png trunk/skins/Xephyr/Media/Animations/Video11.png trunk/skins/Xephyr/Media/Animations/Video2.png trunk/skins/Xephyr/Media/Animations/Video22.png trunk/skins/Xephyr/Media/Animations/Video3.png trunk/skins/Xephyr/Media/Animations/extras/ trunk/skins/Xephyr/Media/Animations/movies/300.png trunk/skins/Xephyr/Media/Animations/movies/bg_movie1.png trunk/skins/Xephyr/Media/Animations/movies/bg_movie4.png trunk/skins/Xephyr/Media/Animations/music/joss_stone.png trunk/skins/Xephyr/Media/Animations/music/madonna2.png trunk/skins/Xephyr/Media/Animations/music/systemofadown.png trunk/skins/Xephyr/Media/Animations/pictures/guildwars1.png trunk/skins/Xephyr/Media/Animations/pictures/marekokon.png trunk/skins/Xephyr/Media/Animations/pictures/wanchai.png trunk/skins/Xephyr/Media/Animations/tv/bg_tv1.png trunk/skins/Xephyr/Media/Animations/tv/darkangel.png trunk/skins/Xephyr/Media/Animations/tv/malcolm.png trunk/skins/Xephyr/Media/mymenu_Extras_focus.png trunk/skins/Xephyr/Media/mymenu_Extras_nofocus.png trunk/skins/Xephyr/Media/mymenu_Games_focus.png trunk/skins/Xephyr/Media/mymenu_Games_nofocus.png trunk/skins/Xephyr/Media/mymenu_Trailers_focus.png trunk/skins/Xephyr/Media/mymenu_Trailers_nofocus.png trunk/skins/Xephyr/TVSeries - Copy.xml trunk/skins/Xephyr/common.MusicAnimation.xml trunk/skins/Xephyr/common.PicturesAnimation.xml trunk/skins/Xephyr/common.RadioAnimation.xml trunk/skins/Xephyr/common.TvAnimation.xml trunk/skins/Xephyr/common.VideoAnimation.xml Modified: trunk/skins/Xephyr/BasicHome.xml =================================================================== --- trunk/skins/Xephyr/BasicHome.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/BasicHome.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -16,9 +16,40 @@ <texture>bgs/bg_default.png</texture> </control> + <control> + <description>MY MUSIC + MUSIC VIDEOS BACKGROUND</description> + <id>98791</id> + <type>multiimage</type> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <imagepath>music</imagepath> + <timeperimage>60000</timeperimage> + <fadetime>800</fadetime> + <loop>yes</loop> + <randomize>false</randomize> + <visible>Control.HasFocus(98703)|Control.HasFocus(98733)|Control.HasFocus(98705)|Control.HasFocus(98755)</visible> + </control> <control> - <description>MY TV BACKGROUND</description> + <description>MY PICTURES BACKGROUND</description> + <id>98793</id> + <type>multiimage</type> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <imagepath>pictures</imagepath> + <timeperimage>60000</timeperimage> + <fadetime>800</fadetime> + <loop>yes</loop> + <randomize>false</randomize> + <visible>Control.HasFocus(98704)|Control.HasFocus(98744)</visible> + </control> + + <control> + <description>MY TV + TVSERIES BACKGROUND</description> <id>98795</id> <type>multiimage</type> <posx>0</posx> @@ -26,16 +57,15 @@ <width>1280</width> <height>720</height> <imagepath>tv</imagepath> - <timeperimage>6000</timeperimage> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> - <visible>Control.HasFocus(98705)|Control.HasFocus(98755)</visible> + <visible>Control.HasFocus(98802)|Control.HasFocus(98822)|Control.HasFocus(98702)|Control.HasFocus(98722)</visible> </control> - - + <control> - <description>MY MOVIES BACKGROUND</description> + <description>MY MOVIES + PLAY DVD BACKGROUND</description> <type>multiimage</type> <id>98792</id> <posx>0</posx> @@ -43,118 +73,77 @@ <width>1280</width> <height>720</height> <imagepath>movies</imagepath> - <timeperimage>6000</timeperimage> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> - <visible>Control.HasFocus(98702)|Control.HasFocus(98722)</visible> + <visible>Control.HasFocus(98701)|Control.HasFocus(98711)|Control.HasFocus(98707)|Control.HasFocus(98777)</visible> </control> - - + <control> - <description>MY MUSIC BACKGROUND</description> - <id>98791</id> + <description>MY WEATHER BACKGROUND</description> + <id>98793</id> <type>multiimage</type> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <imagepath>music</imagepath> - <timeperimage>6000</timeperimage> + <imagepath>weather</imagepath> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> - <visible>Control.HasFocus(98701)|Control.HasFocus(98711)|Control.HasFocus(98704)|Control.HasFocus(98744)</visible> + <visible>Control.HasFocus(98706)|Control.HasFocus(98766)</visible> </control> - - + <control> - <description>MY PICTURES BACKGROUND</description> + <description>MY RADIO BACKGROUND</description> <id>98793</id> <type>multiimage</type> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <imagepath>pictures</imagepath> - <timeperimage>6000</timeperimage> + <imagepath>radio</imagepath> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> - <visible>Control.HasFocus(98703)|Control.HasFocus(98733)</visible> + <visible>Control.HasFocus(98708)|Control.HasFocus(98788)</visible> </control> + <control> + <description>MY SETTINGS BACKGROUND</description> + <id>98793</id> + <type>multiimage</type> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <imagepath>settings</imagepath> + <timeperimage>60000</timeperimage> + <fadetime>800</fadetime> + <loop>yes</loop> + <randomize>false</randomize> + <visible>Control.HasFocus(98709)|Control.HasFocus(?98799)</visible> + </control> <control> - <description>MY EXTRAS BACKGROUND</description> + <description>MY PLUGINS BACKGROUND</description> <id>98793</id> <type>multiimage</type> <posx>0</posx> <posy>0</posy> <width>1280</width> <height>720</height> - <imagepath>extras</imagepath> - <timeperimage>6000</timeperimage> + <imagepath>plugins</imagepath> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> - <visible>Control.HasFocus(98706)|Control.HasFocus(98766)</visible> + <visible>Control.HasFocus(98801)|Control.HasFocus(98811)</visible> </control> - - <control> - <description>background image</description> - <type>image</type> - <id>1</id> - <posX>875</posX> - <posY>0</posY> - <texture>1timepanel.png</texture> - <animation effect="fade" time="500">WindowOpen</animation> - <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation> - </control> - <control> - <description>background image</description> - <type>image</type> - <id>1</id> - <posX>1150</posX> - <posY>0</posY> - <texture>1divider.png</texture> - <animation effect="fade" time="500">WindowOpen</animation> - <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation> - </control> - <control> - <description>Date</description> - <type>label</type> - <id>200</id> - <posX>1150</posX> - <posY>5</posY> - <label>#date</label> - <align>right</align> - <font>font14</font> - <textcolor>ffffffff</textcolor> - <animation effect="fade" time="500">WindowOpen</animation> - <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation> - </control> - <control> - <description>Time</description> - <type>label</type> - <id>201</id> - <posX>1200</posX> - <posY>5</posY> - <label>#time</label> - <align>left</align> - <font>font14</font> - <textcolor>ffffffff</textcolor> - <animation effect="fade" time="500">WindowOpen</animation> - <animation effect="slide" time="500" start="400,0" acceleration="-1" >WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="slide" time="500" end="400,0" acceleration="-1" >WindowClose</animation> - </control> - + + <!-- TOPBAR Buttons --> <control> <description>Back button</description> @@ -251,16 +240,7 @@ <onup>13</onup> <ondown>98711</ondown> </control> - <!--<control> - <description>DateTime BACKGROUND</description> - <type>image</type> - <id>99001</id> - <posX>868</posX> - <posY>0</posY> - <width>412</width> - <height>49</height> - <texture>mydate_bg.png</texture> - </control>--> + <control> @@ -2770,6 +2750,8 @@ <animation effect="slide" end="-1280,0" time="600" acceleration="-0.4" reversible="false">WindowClose</animation> <animation effect="fade" time="1000">WindowClose</animation> </control> - + + + <import>common.time.xml</import> </controls> </window> \ No newline at end of file Added: trunk/skins/Xephyr/Media/1glassback_tvseries.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/1glassback_tvseries.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/1glassmusic backup.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/1main_vertical.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/1main_vertical.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/Animations/Music1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Music11.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Music2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Music22.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Music3.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Pictures1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Pictures11.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Pictures2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Pictures22.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Pictures3.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Radio1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Radio11.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Radio2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Radio22.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Radio3.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/TV1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/TV11.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/TV2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/TV22.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/TV3.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Video1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Video11.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Video2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Video22.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/Video3.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/movies/300.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/movies/bg_movie1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/movies/bg_movie4.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/Animations/movies/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/movies/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/Animations/music/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/music/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/Animations/music/joss_stone.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/music/madonna2.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/music/systemofadown.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/Animations/pictures/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/pictures/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/Animations/pictures/guildwars1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/pictures/marekokon.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/pictures/wanchai.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/Animations/plugins/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/plugins/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/Animations/radio/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/radio/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/Animations/settings/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/settings/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/Animations/tv/bg_tv1.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/Animations/tv/darkangel.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/Animations/tv/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/tv/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/skins/Xephyr/Media/Animations/tv/malcolm.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/Animations/weather/dummy.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/Animations/weather/dummy.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Xephyr/Media/hover_musicvideo.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my music.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my pictures.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my plugins.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my radio.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my tv series.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my tv.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my videos.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_my weather.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_play dvd.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/hover_settings.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Extras_focus.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Extras_nofocus.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Games_focus.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Games_nofocus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Movies_focus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Movies_nofocus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_MusicVideos_focus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_MusicVideos_nofocus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Music_focus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Music_nofocus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Pictures_focus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_Pictures_nofocus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_TVSeries_focus.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/mymenu_TVSeries_nofocus.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Trailers_focus.png =================================================================== (Binary files differ) Deleted: trunk/skins/Xephyr/Media/mymenu_Trailers_nofocus.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/mymenu_dvd_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_dvd_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_dvd_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_dvd_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Xephyr/Media/mymenu_full_nofocus.png =================================================================== (Binary files differ) Added: trunk/skins/Xephyr/Media/mymenu_plugins_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_plugins_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_plugins_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_plugins_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_radio_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_radio_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_radio_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_radio_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_settings.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_settings.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_settings_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_settings_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_settings_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_settings_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_tv_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_tv_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_tv_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_tv_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_weather_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_weather_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/skins/Xephyr/Media/mymenu_weather_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/mymenu_weather_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Xephyr/SettingsGUI.xml =================================================================== --- trunk/skins/Xephyr/SettingsGUI.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/SettingsGUI.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -64,7 +64,7 @@ <posY>63</posY> <width>1280</width> <height>75</height> - <texture>mymenu_full_nofocus.png</texture> + <texture>mymenu_settings.png</texture> <animation effect="slide" time="1000" start="0,250">WindowOpen</animation> <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation> </control> Modified: trunk/skins/Xephyr/SettingsMyMusic.xml =================================================================== --- trunk/skins/Xephyr/SettingsMyMusic.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/SettingsMyMusic.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -64,7 +64,7 @@ <posY>63</posY> <width>1280</width> <height>75</height> - <texture>mymenu_full_nofocus.png</texture> + <texture>mymenu_settings.png</texture> <animation effect="slide" time="1000" start="0,250">WindowOpen</animation> <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation> </control> Modified: trunk/skins/Xephyr/SettingsOSD.xml =================================================================== --- trunk/skins/Xephyr/SettingsOSD.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/SettingsOSD.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -64,7 +64,7 @@ <posY>63</posY> <width>1280</width> <height>75</height> - <texture>mymenu_full_nofocus.png</texture> + <texture>mymenu_settings.png</texture> <animation effect="slide" time="1000" start="0,250">WindowOpen</animation> <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation> </control> Modified: trunk/skins/Xephyr/SettingsSlideShow.xml =================================================================== --- trunk/skins/Xephyr/SettingsSlideShow.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/SettingsSlideShow.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -65,7 +65,7 @@ <posY>63</posY> <width>1280</width> <height>75</height> - <texture>mymenu_full_nofocus.png</texture> + <texture>mymenu_settings.png</texture> <animation effect="slide" time="1000" start="0,250">WindowOpen</animation> <animation effect="slide" delay="500" time="1000" end="0,250">WindowClose</animation> </control> Deleted: trunk/skins/Xephyr/TVSeries - Copy.xml =================================================================== --- trunk/skins/Xephyr/TVSeries - Copy.xml 2007-11-28 15:06:23 UTC (rev 1097) +++ trunk/skins/Xephyr/TVSeries - Copy.xml 2007-11-28 18:27:44 UTC (rev 1098) @@ -1,949 +0,0 @@ -<?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> - - <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>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>780</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>770</posX> - <posY>625</posY> - <width>180</width> - <height>70</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>55ffffff</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 ( in textlist )</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> - <visible>Control.IsVisible(1235)</visible> - </control> - - <control> - <type>image</type> - <description>thumb Logos ( graphical listings )</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>260</posX> - <posY>100</posY> - <width>730</width> - <height>80</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> - <visible>!Control.IsVisible(1235)</visible> - </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>740</posX> - <posY>668</posY> - <width>200</width> - <label>#TVSeries.LastView</label> - <align>right</align> - <textcolor>333333</textcolor> - <font>font16</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>760</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" ... [truncated message content] |
From: <an...@us...> - 2007-11-28 15:06:32
|
Revision: 1097 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1097&view=rev Author: and-81 Date: 2007-11-28 07:06:23 -0800 (Wed, 28 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 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 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/FormMain.resx trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj trunk/plugins/IR Server Suite/Applications/IR File Tool/Properties/AssemblyInfo.cs trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj 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/Virtual Remote.csproj trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Custom HID Receiver/Custom HID Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/FusionRemote Receiver/FusionREMOTE Receiver.csproj 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/IgorPlug Receiver/IgorPlug Receiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Microsoft MCE Transceiver/Microsoft MCE Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/Serial IR Blaster/Serial IR Blaster.csproj trunk/plugins/IR Server Suite/IR Server Plugins/USB-UIRT Transceiver/USB-UIRT Transceiver.csproj trunk/plugins/IR Server Suite/IR Server Plugins/WinLirc Transceiver/WinLirc Transceiver.csproj 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/XBCDRC Receiver/XBCDRC Receiver.csproj trunk/plugins/IR Server Suite/IR Server Suite.sln trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MP Control Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/TV2 Blaster Plugin/TV2 Blaster Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/TV3 Blaster Plugin/TV3 Blaster Plugin.csproj trunk/plugins/MCEReplacement/MCEReplacement.csproj Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs trunk/plugins/IR Server Suite/Applications/IR File Tool/MceDetectionData.cs trunk/plugins/IR Server Suite/Applications/IR File Tool/Pronto.cs trunk/plugins/IR Server Suite/Applications/IR File Tool/RemoteDetectionData.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-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-11-28 15:06:23 UTC (rev 1097) @@ -98,6 +98,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy "*.*" "\MediaPortal Development\Plugin Releases\IR Server Suite\$(ProjectName)\"</PostBuildEvent> + <PostBuildEvent> + </PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-28 15:06:23 UTC (rev 1097) @@ -83,6 +83,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy "*.*" "\MediaPortal Development\Plugin Releases\IR Server Suite\$(ProjectName)\"</PostBuildEvent> + <PostBuildEvent> + </PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file 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-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-11-28 15:06:23 UTC (rev 1097) @@ -84,6 +84,7 @@ </Target> --> <PropertyGroup> - <PostBuildEvent>copy "$(TargetFileName)" "\MediaPortal Development\Plugin Releases\IR Server Suite\IR Blast\"</PostBuildEvent> + <PostBuildEvent> + </PostBuildEvent> </PropertyGroup> </Project> \ No newline at end of file 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-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.Designer.cs 2007-11-28 15:06:23 UTC (rev 1097) @@ -28,20 +28,210 @@ /// </summary> private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); + this.menuStrip = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.quitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textBoxPronto = new System.Windows.Forms.TextBox(); + this.labelCarrier = new System.Windows.Forms.Label(); + this.toolTips = new System.Windows.Forms.ToolTip(this.components); + this.textBoxCarrier = new System.Windows.Forms.TextBox(); + this.buttonSetCarrier = new System.Windows.Forms.Button(); + this.checkBoxStoreBinary = new System.Windows.Forms.CheckBox(); + this.buttonAttemptDecode = new System.Windows.Forms.Button(); + this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); + this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); + this.menuStrip.SuspendLayout(); this.SuspendLayout(); // + // menuStrip + // + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem}); + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(497, 24); + this.menuStrip.TabIndex = 0; + this.menuStrip.Text = "menuStrip"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newToolStripMenuItem, + this.openToolStripMenuItem, + this.saveToolStripMenuItem, + this.saveasToolStripMenuItem, + this.toolStripSeparator1, + this.quitToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.newToolStripMenuItem.Text = "&New"; + this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.openToolStripMenuItem.Text = "&Open ..."; + this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // saveasToolStripMenuItem + // + this.saveasToolStripMenuItem.Name = "saveasToolStripMenuItem"; + this.saveasToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.saveasToolStripMenuItem.Text = "Save &as ..."; + this.saveasToolStripMenuItem.Click += new System.EventHandler(this.saveasToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(135, 6); + // + // quitToolStripMenuItem + // + this.quitToolStripMenuItem.Name = "quitToolStripMenuItem"; + this.quitToolStripMenuItem.Size = new System.Drawing.Size(138, 22); + this.quitToolStripMenuItem.Text = "&Quit"; + this.quitToolStripMenuItem.Click += new System.EventHandler(this.quitToolStripMenuItem_Click); + // + // textBoxPronto + // + this.textBoxPronto.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.textBoxPronto.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBoxPronto.Location = new System.Drawing.Point(8, 32); + this.textBoxPronto.Multiline = true; + this.textBoxPronto.Name = "textBoxPronto"; + this.textBoxPronto.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBoxPronto.Size = new System.Drawing.Size(481, 136); + this.textBoxPronto.TabIndex = 1; + // + // labelCarrier + // + this.labelCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.labelCarrier.Location = new System.Drawing.Point(8, 176); + this.labelCarrier.Name = "labelCarrier"; + this.labelCarrier.Size = new System.Drawing.Size(56, 20); + this.labelCarrier.TabIndex = 2; + this.labelCarrier.Text = "Carrier:"; + this.labelCarrier.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // textBoxCarrier + // + this.textBoxCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.textBoxCarrier.Location = new System.Drawing.Point(64, 176); + this.textBoxCarrier.Name = "textBoxCarrier"; + this.textBoxCarrier.Size = new System.Drawing.Size(64, 20); + this.textBoxCarrier.TabIndex = 3; + // + // buttonSetCarrier + // + this.buttonSetCarrier.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonSetCarrier.Location = new System.Drawing.Point(136, 176); + this.buttonSetCarrier.Name = "buttonSetCarrier"; + this.buttonSetCarrier.Size = new System.Drawing.Size(32, 20); + this.buttonSetCarrier.TabIndex = 4; + this.buttonSetCarrier.Text = "Set"; + this.toolTips.SetToolTip(this.buttonSetCarrier, "Change the carrier frequency"); + this.buttonSetCarrier.UseVisualStyleBackColor = true; + this.buttonSetCarrier.Click += new System.EventHandler(this.buttonSetCarrier_Click); + // + // checkBoxStoreBinary + // + this.checkBoxStoreBinary.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.checkBoxStoreBinary.Location = new System.Drawing.Point(328, 176); + this.checkBoxStoreBinary.Name = "checkBoxStoreBinary"; + this.checkBoxStoreBinary.Size = new System.Drawing.Size(160, 24); + this.checkBoxStoreBinary.TabIndex = 6; + this.checkBoxStoreBinary.Text = "Store mceir.dll compatible"; + this.toolTips.SetToolTip(this.checkBoxStoreBinary, "Store this IR Code in an MceIr.dll compatible form"); + this.checkBoxStoreBinary.UseVisualStyleBackColor = true; + // + // buttonAttemptDecode + // + this.buttonAttemptDecode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonAttemptDecode.Location = new System.Drawing.Point(192, 176); + this.buttonAttemptDecode.Name = "buttonAttemptDecode"; + this.buttonAttemptDecode.Size = new System.Drawing.Size(112, 24); + this.buttonAttemptDecode.TabIndex = 5; + this.buttonAttemptDecode.Text = "Attempt decode"; + this.toolTips.SetToolTip(this.buttonAttemptDecode, "Try to decode the IR signal into a recognised format"); + this.buttonAttemptDecode.UseVisualStyleBackColor = true; + this.buttonAttemptDecode.Click += new System.EventHandler(this.buttonAttemptDecode_Click); + // + // openFileDialog + // + this.openFileDialog.DefaultExt = "IR"; + this.openFileDialog.Filter = "IR Files|*.IR"; + this.openFileDialog.Title = "Open an IR file ..."; + // + // saveFileDialog + // + this.saveFileDialog.DefaultExt = "IR"; + this.saveFileDialog.Filter = "IR Files|*.IR"; + this.saveFileDialog.Title = "Save an IR file ..."; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 264); + this.ClientSize = new System.Drawing.Size(497, 209); + this.Controls.Add(this.buttonAttemptDecode); + this.Controls.Add(this.checkBoxStoreBinary); + this.Controls.Add(this.buttonSetCarrier); + this.Controls.Add(this.textBoxCarrier); + this.Controls.Add(this.labelCarrier); + this.Controls.Add(this.textBoxPronto); + this.Controls.Add(this.menuStrip); + this.MainMenuStrip = this.menuStrip; + this.MinimumSize = new System.Drawing.Size(505, 236); this.Name = "FormMain"; this.Text = "IR File Tool"; + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } #endregion + + private System.Windows.Forms.MenuStrip menuStrip; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveasToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem quitToolStripMenuItem; + private System.Windows.Forms.TextBox textBoxPronto; + private System.Windows.Forms.Label labelCarrier; + private System.Windows.Forms.ToolTip toolTips; + private System.Windows.Forms.TextBox textBoxCarrier; + private System.Windows.Forms.Button buttonSetCarrier; + private System.Windows.Forms.CheckBox checkBoxStoreBinary; + private System.Windows.Forms.Button buttonAttemptDecode; + private System.Windows.Forms.OpenFileDialog openFileDialog; + private System.Windows.Forms.SaveFileDialog saveFileDialog; } } Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2007-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.cs 2007-11-28 15:06:23 UTC (rev 1097) @@ -3,16 +3,192 @@ using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Text; using System.Windows.Forms; namespace IrFileTool { + public partial class FormMain : Form { + + string _fileName = String.Empty; + + IrCode _code = new IrCode(); + + public FormMain() { InitializeComponent(); } + + void RefreshForm() + { + textBoxPronto.Text = Encoding.ASCII.GetString(_code.ToByteArray(true)); + + switch (_code.Carrier) + { + case IrCode.CarrierFrequencyDCMode: + textBoxCarrier.Text = "DC Mode"; + break; + + case IrCode.CarrierFrequencyUnknown: + textBoxCarrier.Text = "Unknown"; + break; + + default: + textBoxCarrier.Text = _code.Carrier.ToString(); + break; + } + } + + void Save() + { + if (!checkBoxStoreBinary.Checked) + { + Pronto.WriteProntoFile(_fileName, Pronto.ConvertIrCodeToProntoRaw(_code)); + } + else + { + using (FileStream file = File.OpenWrite(_fileName)) + { + byte[] fileBytes = DataPacket(_code); + + file.Write(fileBytes, 0, fileBytes.Length); + } + } + } + + + private void newToolStripMenuItem_Click(object sender, EventArgs e) + { + _code = new IrCode(); + + RefreshForm(); + } + + private void openToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog.ShowDialog(this) != DialogResult.OK) + return; + + using (FileStream file = File.OpenRead(openFileDialog.FileName)) + { + if (file.Length == 0) + { + MessageBox.Show(this, "The selected file is empty", "Empty file", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + byte[] fileData = new byte[file.Length]; + + file.Read(fileData, 0, (int)file.Length); + + _code = IrCode.FromByteArray(fileData); + } + + RefreshForm(); + } + + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + Save(); + } + + private void saveasToolStripMenuItem_Click(object sender, EventArgs e) + { + if (saveFileDialog.ShowDialog(this) != DialogResult.OK) + return; + + _fileName = saveFileDialog.FileName; + + Save(); + } + + private void quitToolStripMenuItem_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void buttonAttemptDecode_Click(object sender, EventArgs e) + { + IrDecoder.DecodeIR(_code.TimingData, new RemoteCallback(RemoteEvent), new KeyboardCallback(KeyboardEvent), new MouseCallback(MouseEvent)); + } + + static byte[] DataPacket(IrCode code) + { + if (code.TimingData.Length == 0) + return null; + + // Construct data bytes into "packet" ... + List<byte> packet = new List<byte>(); + + for (int index = 0; index < code.TimingData.Length; index++) + { + double time = (double)code.TimingData[index]; + + byte duration = (byte)Math.Abs(Math.Round(time / 50)); + bool pulse = (time > 0); + + while (duration > 0x7F) + { + packet.Add((byte)(pulse ? 0xFF : 0x7F)); + + duration -= 0x7F; + } + + packet.Add((byte)(pulse ? 0x80 | duration : duration)); + } + + // Insert byte count markers into packet data bytes ... + int subpackets = (int)Math.Ceiling(packet.Count / (double)4); + + byte[] output = new byte[packet.Count + subpackets + 1]; + + int outputPos = 0; + + for (int packetPos = 0; packetPos < packet.Count; ) + { + byte copyCount = (byte)(packet.Count - packetPos < 4 ? packet.Count - packetPos : 0x04); + + output[outputPos++] = (byte)(0x80 | copyCount); + + for (int index = 0; index < copyCount; index++) + output[outputPos++] = packet[packetPos++]; + } + + output[outputPos] = 0x80; + + return output; + } + + void RemoteEvent(IrProtocol codeType, uint keyCode, bool firstPress) + { + MessageBox.Show(this, String.Format("Remote: {0}, {1}", Enum.GetName(typeof(IrProtocol), codeType), keyCode), "Decode IR", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + void KeyboardEvent(uint keyCode, uint modifiers) + { + MessageBox.Show(this, String.Format("Keyboard: {0}, {1}", keyCode, modifiers), "Decode IR", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + void MouseEvent(int deltaX, int deltaY, bool right, bool left) + { + MessageBox.Show(this, String.Format("Mouse: DX {0}, DY {1}, Right: {2}, Left: {3}", deltaX, deltaY, right, left), "Decode IR", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void buttonSetCarrier_Click(object sender, EventArgs e) + { + if (textBoxCarrier.Text == "Unknown") + return; + + if (textBoxCarrier.Text == "DC Mode") + _code.Carrier = IrCode.CarrierFrequencyDCMode; + + _code.Carrier = int.Parse(textBoxCarrier.Text); + + RefreshForm(); + } + } -} \ No newline at end of file + +} Modified: trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx 2007-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/FormMain.resx 2007-11-28 15:06:23 UTC (rev 1097) @@ -117,4 +117,16 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> + <metadata name="toolTips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>119, 17</value> + </metadata> + <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>209, 17</value> + </metadata> + <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>333, 17</value> + </metadata> </root> \ No newline at end of file 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-11-27 21:02:33 UTC (rev 1096) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IR File Tool.csproj 2007-11-28 15:06:23 UTC (rev 1097) @@ -10,8 +10,7 @@ <RootNamespace>IRFileTool</RootNamespace> <AssemblyName>IR File Tool</AssemblyName> <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent> - <StartupObject> - </StartupObject> + <StartupObject>IrFileTool.Program</StartupObject> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -21,14 +20,17 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> + <DebugType>none</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> + <DefineConstants> + </DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <TreatWarningsAsErrors>true</TreatWarningsAsErrors> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <DebugSymbols>true</DebugSymbols> @@ -64,8 +66,13 @@ <Compile Include="FormMain.Designer.cs"> <DependentUpon>FormMain.cs</DependentUpon> </Compile> + <Compile Include="IrCode.cs" /> + <Compile Include="IrDecoder.cs" /> + <Compile Include="MceDetectionData.cs" /> <Compile Include="Program.cs" /> + <Compile Include="Pronto.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="RemoteDetectionData.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="FormMain.resx"> Added: trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IrCode.cs 2007-11-28 15:06:23 UTC (rev 1097) @@ -0,0 +1,287 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text; + +// Remember: Pulse is Positive, Space is Negative. + +namespace IrFileTool +{ + + /// <summary> + /// Encapsulates an MCE compatible IR Code. + /// </summary> + class IrCode + { + + #region Constants + + /// <summary> + /// The carrier frequency for this code is Unknown. + /// </summary> + public const int CarrierFrequencyUnknown = -1; + /// <summary> + /// This code does not use a carrier wave. + /// </summary> + public const int CarrierFrequencyDCMode = 0; + /// <summary> + /// Default carrier frequency, 36kHz (the carrier frequency for RC5, RC6 and RC-MM). + /// </summary> + public const int CarrierFrequencyDefault = 36000; + + /// <summary> + /// How long the longest IR Code space should be (microseconds). + /// </summary> + const int LongestSpace = -100000; + + #endregion Constants + + #region Member Variables + + int _carrier; + int[] _timingData; + + #endregion Member Variables + + #region Properties + + /// <summary> + /// Gets or Sets the IR carrier frequency. + /// </summary> + public int Carrier + { + get { return _carrier; } + set { _carrier = value; } + } + + /// <summary> + /// Gets or Sets the IR timing data. + /// </summary> + public int[] TimingData + { + get { return _timingData; } + set { _timingData = value; } + } + + #endregion Properties + + #region Constructors + + public IrCode() : this(CarrierFrequencyUnknown, new int[] { }) { } + public IrCode(int carrier) : this(carrier, new int[] { }) { } + public IrCode(int[] timingData) : this(CarrierFrequencyUnknown, timingData) { } + public IrCode(int carrier, int[] timingData) + { + _carrier = carrier; + _timingData = timingData; + } + + #endregion Constructors + + #region Methods + + /// <summary> + /// Locates the gap between button presses and reduces the data down to just the first press. + /// </summary> + /// <returns>true if successful, otherwise false.</returns> + public bool FinalizeData() + { + if (_timingData.Length == 0) + return false; + + List<int> newData = new List<int>(); + + foreach (int time in _timingData) + { + if (time <= LongestSpace) + { + newData.Add(LongestSpace); + break; + } + else + { + newData.Add(time); + } + } + + _timingData = newData.ToArray(); + return true; + } + + /// <summary> + /// Add timing data to this IR Code. + /// </summary> + /// <param name="timingData">Addition timing data.</param> + public void AddTimingData(int[] timingData) + { + List<int> newTimingData = new List<int>(); + + int index = 0; + + if (_timingData.Length > 1) + { + for (index = 0; index < _timingData.Length - 1; index++) + newTimingData.Add(_timingData[index]); + } + else if (_timingData.Length == 0) + { + _timingData = new int[timingData.Length]; + timingData.CopyTo(_timingData, 0); + return; + } + + if (timingData.Length == 0 || index >= _timingData.Length) + return; + + if (Math.Sign(timingData[0]) == Math.Sign(_timingData[index])) + { + newTimingData.Add(_timingData[index] + timingData[0]); + + for (index = 1; index < timingData.Length; index++) + newTimingData.Add(timingData[index]); + } + else + { + newTimingData.Add(_timingData[index]); + newTimingData.AddRange(timingData); + } + + _timingData = newTimingData.ToArray(); + } + + /// <summary> + /// Creates a byte array representation of this IR Code. + /// </summary> + /// <param name="asPronto">Set this parameter true to convert the IR Code into Pronto format.</param> + /// <returns>Byte array representation.</returns> + public byte[] ToByteArray(bool asPronto) + { + StringBuilder output = new StringBuilder(); + + if (asPronto) + { + ushort[] prontoData = Pronto.ConvertIrCodeToProntoRaw(this); + + for (int index = 0; index < prontoData.Length; index++) + { + output.Append(prontoData[index].ToString("X4")); + if (index != prontoData.Length - 1) + output.Append(' '); + } + } + else // Native format (only benefit is a slightly more accurate Carrier Frequency) + { + output.Append("MCE,"); + output.AppendFormat("{0},", _carrier); + + for (int index = 0; index < _timingData.Length; index++) + { + output.Append(_timingData[index]); + if (index != _timingData.Length - 1) + output.Append(','); + } + } + + return Encoding.ASCII.GetBytes(output.ToString()); + } + + #endregion Methods + + #region Static Methods + + /// <summary> + /// Creates an IrCode object from old IR file bytes. + /// </summary> + /// <param name="data">IR file bytes.</param> + /// <returns>New IrCode object.</returns> + static IrCode FromOldData(byte[] data) + { + List<int> timingData = new List<int>(); + + int len = 0; + + for (int index = 0; index < data.Length; index++) + { + byte curByte = data[index]; + + if ((curByte & 0x80) != 0) + len += (int)(curByte & 0x7F); + else + len -= (int)curByte; + + if ((curByte & 0x7F) != 0x7F) + { + timingData.Add(len * 50); + len = 0; + } + } + + if (len != 0) + timingData.Add(len * 50); + + return new IrCode(timingData.ToArray()); + } + + /// <summary> + /// Create an IrCode object from Native file bytes. + /// </summary> + /// <param name="data">IR file bytes.</param> + /// <returns>New IrCode object.</returns> + static IrCode FromNativeData(string data) + { + if (String.IsNullOrEmpty(data)) + throw new ArgumentNullException("data"); + + string[] elements = data.Split(new char[] { ',' }); + + if (elements.Length < 3) + throw new ApplicationException("Invalid native IR file data"); + + IrCode newCode = new IrCode(); + newCode.Carrier = int.Parse(elements[1]); + + int[] timingData = new int[elements.Length - 2]; + for (int index = 2; index < elements.Length; index++) + timingData[index - 2] = int.Parse(elements[index]); + + newCode.TimingData = timingData; + + return newCode; + } + + /// <summary> + /// Create a new IrCode object from byte array data. + /// </summary> + /// <param name="data">Byte array to create from.</param> + /// <returns>New IrCode object.</returns> + public static IrCode FromByteArray(byte[] data) + { + if (data[4] == ' ') + { + string code = Encoding.ASCII.GetString(data); + + string[] stringData = code.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); + + ushort[] prontoData = new ushort[stringData.Length]; + for (int i = 0; i < stringData.Length; i++) + prontoData[i] = ushort.Parse(stringData[i], System.Globalization.NumberStyles.HexNumber); + + return Pronto.ConvertProntoDataToIrCode(prontoData); + } + else if (data[0] == 'M' && data[1] == 'C' && data[2] == 'E') + { + string code = Encoding.ASCII.GetString(data); + + return FromNativeData(code); + } + else + { + return FromOldData(data); + } + } + + #endregion Static Methods + + } + +} Added: trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs (rev 0) +++ trunk/plugins/IR Server Suite/Applications/IR File Tool/IrDecoder.cs 2007-11-28 15:06:23 UTC (rev 1097) @@ -0,0 +1,2070 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Text; + +namespace IrFileTool +{ + + #region Enumerations + + /// <summary> + /// Protocol of IR Code. + /// </summary> + enum IrProtocol + { + /// <summary> + /// No protocol. + /// </summary> + None, + + /// <summary> + /// Daewoo protocol. + /// </summary> + Daewoo, + /// <summary> + /// ITT protocol (unsupported). + /// </summary> + ITT, + /// <summary> + /// JVC protocol. + /// </summary> + JVC, + /// <summary> + /// Matsushita protocol. + /// </summary> + Matsushita, + /// <summary> + /// Mitsubishi protocol. + /// </summary> + Mitsubishi, + /// <summary> + /// NEC protocol. + /// </summary> + NEC, + /// <summary> + /// Nokia NRC17 protocol. + /// </summary> + NRC17, + /// <summary> + /// Panasonic protocol. + /// </summary> + Panasonic, + /// <summary> + /// Philips RC5 protocol. + /// </summary> + RC5, + /// <summary> + /// Philips RC5X protocol. + /// </summary> + RC5X, + /// <summary> + /// Philips RC6 protocol (Mode 0). + /// </summary> + RC6, + /// <summary> + /// Philips RC6 protocol (Mode 6A). + /// </summary> + RC6A, + /// <summary> + /// Microsoft's protocol variation of Philips RC6. + /// </summary> + RC6_MCE, + /// <summary> + /// RCA protocol. + /// </summary> + RCA, + /// <summary> + /// Philips RC-MM protocol. This protocol cannot be reliably (if at all) decoded by the MCE device. + /// </summary> + RCMM, + /// <summary> + /// RECS-80 protocol. + /// </summary> + RECS80, + /// <summary> + /// Sharp protocol (unsupported). + /// </summary> + Sharp, + /// <summary> + /// Sony SIRC protocol. + /// </summary> + SIRC, + /// <summary> + /// Toshiba protocol. + /// </summary> + Toshiba, + /// <summary> + /// X-Sat protocol (unsupported). + /// </summary> + XSAT, + + /// <summary> + /// Unknown protocol. + /// </summary> + Unknown, + } + + #endregion Enumerations + + #region Delegates + + delegate void RemoteCallback(IrProtocol codeType, uint keyCode, bool firstPress); + delegate void KeyboardCallback(uint keyCode, uint modifiers); + delegate void MouseCallback(int deltaX, int deltaY, bool rightButton, bool leftButton); + + #endregion Delegates + + /// <summary> + /// Used for decoding received IR Codes. + /// </summary> + static class IrDecoder + { + + #region Constants + + const ushort ToggleBitMce = 0x8000; + const ushort ToggleMaskMce = 0x7FFF; + const ushort CustomerMce = 0x800F; + + const ushort ToggleBitRC5 = 0x0800; + const ushort ToggleMaskRC5 = 0xF7FF; + + const uint ToggleBitRC5X = 0x00020000; + const ushort ToggleMaskRC5X = 0xFFFF; + + const uint RC6HeaderMask = 0xFFFFFFF0; + + const uint PrefixRC6 = 0x000FC950; + const uint PrefixRC6A = 0x000FCA90; + + const uint MceMouse = 1; + const uint MceKeyboard = 4; + + #endregion Constants + + #region Detection Data + + static RemoteDetectionData Daewoo_Data = new RemoteDetectionData(); + static RemoteDetectionData JVC_Data = new RemoteDetectionData(); + static RemoteDetectionData Matsushita_Data = new RemoteDetectionData(); + static RemoteDetectionData Mitsubishi_Data = new RemoteDetectionData(); + static RemoteDetectionData NEC_Data = new RemoteDetectionData(); + static RemoteDetectionData NRC17_Data = new RemoteDetectionData(); + static RemoteDetectionData Panasonic_Data = new RemoteDetectionData(); + static RemoteDetectionData RC5_Data = new RemoteDetectionData(); + static RemoteDetectionData RC6_Data = new RemoteDetectionData(); + static RemoteDetectionData RCA_Data = new RemoteDetectionData(); + static RemoteDetectionData RECS80_Data = new RemoteDetectionData(); + static RemoteDetectionData SIRC_Data = new RemoteDetectionData(); + static RemoteDetectionData Toshiba_Data = new RemoteDetectionData(); + + static MceDetectionData MCE_Data = new MceDetectionData(); + + #endregion Detection Data + + #region Methods + + /// <summary> + /// Decode timing data to discover IR Protocol and packet payload. + /// </summary> + /// <param name="timingData">Input timing data.</param> + /// <param name="remoteCallback">Method to call when Remote button decoded.</param> + /// <param name="keyboardCallback">Method to call when Keyboard event decoded.</param> + /// <param name="mouseCallback">Method to call when Mouse event decoded.</param> + public static void DecodeIR(int[] timingData, RemoteCallback remoteCallback, KeyboardCallback keyboardCallback, MouseCallback mouseCallback) + { + if (timingData == null) + return; + + try + { + DetectDaewoo(timingData, remoteCallback); + //DetectITT(timingData, remoteCallback); + DetectJVC(timingData, remoteCallback); + DetectMatsushita(timingData, remoteCallback); + DetectMitsubishi(timingData, remoteCallback); + DetectNEC(timingData, remoteCallback); + DetectNRC17(timingData, remoteCallback); + DetectPanasonic(timingData, remoteCallback); + DetectRC5(timingData, remoteCallback); + DetectRC6(timingData, remoteCallback); + DetectRCA(timingData, remoteCallback); + //DetectRCMM(timingData, remoteCallback); + DetectRECS80(timingData, remoteCallback); + //DetectSharp(timingData, remoteCallback); + DetectSIRC(timingData, remoteCallback); + DetectToshiba(timingData, remoteCallback); + //DetectXSAT(timingData, remoteCallback); + + DetectMCE(timingData, keyboardCallback, mouseCallback); + //DetectIMon(timingData, keyboardCallback, mouseCallback); + } +#if TRACE + catch (Exception ex) + { + Trace.WriteLine(ex.ToString()); +#else + catch + { +#endif + Daewoo_Data = new RemoteDetectionData(); + JVC_Data = new RemoteDetectionData(); + Matsushita_Data = new RemoteDetectionData(); + Mitsubishi_Data = new RemoteDetectionData(); + NEC_Data = new RemoteDetectionData(); + NRC17_Data = new RemoteDetectionData(); + Panasonic_Data = new RemoteDetectionData(); + RC5_Data = new RemoteDetectionData(); + RC6_Data = new RemoteDetectionData(); + RCA_Data = new RemoteDetectionData(); + RECS80_Data = new RemoteDetectionData(); + SIRC_Data = new RemoteDetectionData(); + Toshiba_Data = new RemoteDetectionData(); + + MCE_Data = new MceDetectionData(); + } + } + + static void DetectDaewoo(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("Daewoo - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), Daewoo_Data.State), timingData[i]); + + switch (Daewoo_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + if (pulse && IsBetween(duration, 7800, 8200)) + { + Daewoo_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + if (!pulse && IsBetween(duration, 3800 , 4200)) + { + Daewoo_Data.State = RemoteDetectionState.Data; + Daewoo_Data.HalfBit = 0; + Daewoo_Data.Bit = 0; + Daewoo_Data.Code = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 10000 , 40000)) // For Repeats + { + Daewoo_Data.State = RemoteDetectionState.Data; + Daewoo_Data.HalfBit = 0; + Daewoo_Data.Bit = 0; + Daewoo_Data.Code = 0; + ignored = false; + } + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (pulse && IsBetween(duration, 350, 750)) + { + Daewoo_Data.HalfBit = 1; + ignored = false; + } + else if (!pulse && IsBetween(duration, 250, 650) && Daewoo_Data.HalfBit == 1) + { + Daewoo_Data.Code <<= 1; + Daewoo_Data.Bit++; + Daewoo_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 1250, 1650) && Daewoo_Data.HalfBit == 1) + { + Daewoo_Data.Code <<= 1; + Daewoo_Data.Code |= 1; + Daewoo_Data.Bit++; + Daewoo_Data.HalfBit = 0; + ignored = false; + } + else + { + //Trace.WriteLine("Daewoo Error"); + } + + if (Daewoo_Data.Bit == 16) + { + remoteCallback(IrProtocol.Daewoo, Daewoo_Data.Code, false); + Daewoo_Data.State = RemoteDetectionState.Leading; + } + break; + #endregion Data + + #region Leading + case RemoteDetectionState.Leading: + if (pulse && IsBetween(duration, 350, 750)) + { + Daewoo_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + break; + #endregion Leading + + } + + if (ignored && (Daewoo_Data.State != RemoteDetectionState.HeaderPulse)) + Daewoo_Data.State = RemoteDetectionState.HeaderPulse; + } + } + static void DetectJVC(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("JVC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), JVC_Data.State), timingData[i]); + + switch (JVC_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + if (pulse && IsBetween(duration, 8300, 8500)) + { + JVC_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + if (!pulse && IsBetween(duration, 4100, 4300)) + { + JVC_Data.Toggle = 0; + + JVC_Data.State = RemoteDetectionState.Data; + JVC_Data.HalfBit = 0; + JVC_Data.Bit = 0; + JVC_Data.Code = 0; + ignored = false; + } + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (pulse && IsBetween(duration, 450, 650)) + { + JVC_Data.HalfBit = 1; + ignored = false; + } + else if (!pulse && IsBetween(duration, 450, 650) && JVC_Data.HalfBit == 1) + { + JVC_Data.Code <<= 1; + JVC_Data.Bit++; + JVC_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 1450, 1700) && JVC_Data.HalfBit == 1) + { + JVC_Data.Code <<= 1; + JVC_Data.Code |= 1; + JVC_Data.Bit++; + JVC_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && duration >= 10000) + { + if (JVC_Data.Bit == 16) + { + bool first = false; + if (JVC_Data.Code != JVC_Data.Toggle) + first = true; + + remoteCallback(IrProtocol.JVC, JVC_Data.Code, first); + ignored = false; + + JVC_Data.Toggle = (int)JVC_Data.Code; + + if (duration > 25000) + JVC_Data.State = RemoteDetectionState.HeaderPulse; + else + JVC_Data.State = RemoteDetectionState.Data; + + JVC_Data.HalfBit = 0; + JVC_Data.Bit = 0; + JVC_Data.Code = 0; + } + else if (JVC_Data.Bit == 32) + { + remoteCallback(IrProtocol.Unknown, JVC_Data.Code, false); + } + else + { + //Trace.WriteLine("JVC Error"); + } + + } + else + { + //Trace.WriteLine("JVC Error"); + } + + break; + #endregion Data + + } + + if (ignored && (JVC_Data.State != RemoteDetectionState.HeaderPulse)) + JVC_Data.State = RemoteDetectionState.HeaderPulse; + } + } + static void DetectMatsushita(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("Matsushita - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), Matsushita_Data.State), timingData[i]); + + switch (Matsushita_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + if (pulse && IsBetween(duration, 3300, 3700)) + { + Matsushita_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + //else + //Trace.WriteLine("HeaderPulse fall through"); + + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + if (!pulse && IsBetween(duration, 3300, 3700)) + { + Matsushita_Data.State = RemoteDetectionState.Data; + Matsushita_Data.HalfBit = 0; + Matsushita_Data.Bit = 0; + Matsushita_Data.Code = 0; + ignored = false; + } + //else + //Trace.WriteLine("HeaderSpace fell through"); + + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (pulse && IsBetween(duration, 650, 1050)) + { + Matsushita_Data.HalfBit = 1; + ignored = false; + } + else if (!pulse && IsBetween(duration, 650, 1050) && Matsushita_Data.HalfBit == 1) + { + Matsushita_Data.Code <<= 1; + Matsushita_Data.Bit++; + Matsushita_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 2450, 2850) && Matsushita_Data.HalfBit == 1) + { + Matsushita_Data.Code <<= 1; + Matsushita_Data.Code |= 1; + Matsushita_Data.Bit++; + Matsushita_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && duration >= 20000 && Matsushita_Data.HalfBit == 1) + { + if (Matsushita_Data.Bit != 22) + break; + + uint code = Matsushita_Data.Code >> 12; + remoteCallback(IrProtocol.Matsushita, code, false); + Matsushita_Data.State = RemoteDetectionState.HeaderPulse; + Matsushita_Data.HalfBit = 0; + ignored = false; + } + else + { + //Trace.WriteLine("Matsushita Error"); + } + + break; + #endregion Data + + } + + if (ignored && (Matsushita_Data.State != RemoteDetectionState.HeaderPulse)) + { + //Trace.WriteLine("ignored"); + Matsushita_Data.State = RemoteDetectionState.HeaderPulse; + } + } + } + static void DetectMitsubishi(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("Mitsubishi - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), Mitsubishi_Data.State), timingData[i]); + + switch (Mitsubishi_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + if (pulse && IsBetween(duration, 7800, 8200)) + { + Mitsubishi_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + if (!pulse && IsBetween(duration, 3800, 4200)) + { + Mitsubishi_Data.State = RemoteDetectionState.Data; + Mitsubishi_Data.HalfBit = 0; + Mitsubishi_Data.Bit = 0; + Mitsubishi_Data.Code = 0; + ignored = false; + } + + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (pulse && IsBetween(duration, 350, 650)) + { + Mitsubishi_Data.HalfBit = 1; + ignored = false; + } + else if (!pulse && IsBetween(duration, 350, 650) && Mitsubishi_Data.HalfBit == 1) + { + Mitsubishi_Data.Code <<= 1; + Mitsubishi_Data.Bit++; + Mitsubishi_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 1300, 1700) && Mitsubishi_Data.HalfBit == 1) + { + Mitsubishi_Data.Code <<= 1; + Mitsubishi_Data.Code |= 1; + Mitsubishi_Data.Bit++; + Mitsubishi_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 3800, 4200) && Mitsubishi_Data.HalfBit == 1 && Mitsubishi_Data.Bit == 8) + { + Mitsubishi_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && duration >= 20000 && Mitsubishi_Data.HalfBit == 1 && Mitsubishi_Data.Bit == 16) + { + remoteCallback(IrProtocol.Mitsubishi, Mitsubishi_Data.Code, false); + Mitsubishi_Data.State = RemoteDetectionState.HeaderPulse; + Mitsubishi_Data.HalfBit = 0; + ignored = false; + } + + break; + #endregion Data + + } + + if (ignored && (Mitsubishi_Data.State != RemoteDetectionState.HeaderPulse)) + { + //Trace.WriteLine("ignored"); + Mitsubishi_Data.State = RemoteDetectionState.HeaderPulse; + } + } + } + static void DetectNEC(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("NEC - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NEC_Data.State), timingData[i]); + + switch (NEC_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + if (pulse && IsBetween(duration, 8800, 9200)) + { + NEC_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + if (!pulse && IsBetween(duration, 4300, 4700)) + { + NEC_Data.State = RemoteDetectionState.Data; + NEC_Data.HalfBit = 0; + NEC_Data.Bit = 0; + NEC_Data.Code = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 2050, 2450)) // For Repeats + { + //Trace.Write("Repeat"); + + if (NEC_Data.Code != 0) + { + uint address = (NEC_Data.Code >> 24) & 0xFF; + uint command = (NEC_Data.Code >> 8) & 0xFF; + + uint code = (address << 8) + command; + + //Trace.WriteLine(" Code: {0}", code); + + remoteCallback(IrProtocol.NEC, code, false); + + NEC_Data.State = RemoteDetectionState.Leading; + ignored = false; + } + } + + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (pulse && IsBetween(duration, 350, 750)) + { + NEC_Data.HalfBit = 1; + ignored = false; + } + else if (!pulse && IsBetween(duration, 350, 650) && NEC_Data.HalfBit == 1) + { + NEC_Data.Code <<= 1; + NEC_Data.Bit++; + NEC_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && IsBetween(duration, 1200, 2800) && NEC_Data.HalfBit == 1) + { + NEC_Data.Code <<= 1; + NEC_Data.Code |= 1; + NEC_Data.Bit++; + NEC_Data.HalfBit = 0; + ignored = false; + } + else if (!pulse && duration >= 12000) + { + if (NEC_Data.Bit != 32) + { + if (NEC_Data.Code != 0) + { + //Trace.WriteLine("Invalid NEC: {0}bit, {1:X}", NEC_Data.Bit, NEC_Data.Code); + remoteCallback(IrProtocol.Unknown, NEC_Data.Code, false); + } + break; + } + + uint address = (NEC_Data.Code >> 24) & 0xFF; + uint notAddress = (NEC_Data.Code >> 16) & 0xFF; + + uint command = (NEC_Data.Code >> 8) & 0xFF; + uint notCommand = NEC_Data.Code & 0xFF; + + if ((address + notAddress == 0xFF) && (command + notCommand == 0xFF)) + { + uint code = (address << 8) + command; + remoteCallback(IrProtocol.NEC, code, true); + NEC_Data.State = RemoteDetectionState.HeaderPulse; + ignored = false; + } + else + { + //Trace.WriteLine("Invalid NEC: {0:X}", NEC_Data.Code); + remoteCallback(IrProtocol.Unknown, NEC_Data.Code, false); + } + } + + break; + #endregion Data + + #region Leading + case RemoteDetectionState.Leading: + if (pulse && IsBetween(duration, 400, 800)) + { + ignored = false; + } + else if (!pulse && duration > 10000) + { + ignored = false; + NEC_Data.State = RemoteDetectionState.HeaderPulse; + } + + break; + #endregion Leading + + } + + if (ignored && (NEC_Data.State != RemoteDetectionState.HeaderPulse)) + NEC_Data.State = RemoteDetectionState.HeaderPulse; + } + } + static void DetectNRC17(int[] timingData, RemoteCallback remoteCallback) + { + for (int i = 0; i < timingData.Length; i++) + { + int duration = Math.Abs(timingData[i]); + bool pulse = (timingData[i] > 0); + bool ignored = true; + + //Trace.WriteLine("NRC17 - {0}: {1}", Enum.GetName(typeof(RemoteDetectionState), NRC17_Data.State), timingData[i]); + + switch (NRC17_Data.State) + { + + #region HeaderPulse + case RemoteDetectionState.HeaderPulse: + + if (pulse && IsBetween(duration, 400, 650)) + { + NRC17_Data.State = RemoteDetectionState.HeaderSpace; + ignored = false; + } + break; + #endregion HeaderPulse + + #region HeaderSpace + case RemoteDetectionState.HeaderSpace: + + if (!pulse && + (IsBetween(duration, 2350, 2600) || // Normal battery + IsBetween(duration, 3350, 3600))) // Low battery + { + NRC17_Data.State = RemoteDetectionState.Data; + NRC17_Data.HalfBit = 0; + NRC17_Data.Bit = 17; + NRC17_Data.Header = 0; + NRC17_Data.Code = 0; + ignored = false; + } + break; + #endregion HeaderSpace + + #region Data + case RemoteDetectionState.Data: + if (NRC17_Data.HalfBit == 0) + { + if (pulse && IsBetween(duration, 300, 700)) + { + // Logic 1 + NRC17_Data.HalfBit = 1; + NRC17_Data.Code |= (uint)(1 << NRC17_Data.Bit--); + ignored = false; + } + else if (!pulse && IsBetween(duration, 300, 700)) + { + // Logic 0 + NRC17_Data.HalfBit = 1; + NRC17_Data.Bit--; + ignored = false; + } + } + else + { + if (!pulse && IsBetween(duration, 300, 700)) + { + NRC17_Data.HalfBit = 0; + ... [truncated message content] |
From: <mis...@us...> - 2007-11-27 21:02:35
|
Revision: 1096 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1096&view=rev Author: misterd_sf Date: 2007-11-27 13:02:33 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Updated italian language file by ettore. Thx Made the configuration forms resizable. Added anchors, autosize etc. Modified Paths: -------------- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.resx trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.Designer.cs trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/VideoSection.resx trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationForm.Designer.cs trunk/plugins/My MPlayer/MPlayer_GUIPlugin/ConfigurationPanel/GUIConfiguration.Designer.cs trunk/plugins/My MPlayer/MPlayer_Installer/ConfigurationWizard.Designer.cs Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationForm.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -52,19 +52,19 @@ this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.general_Tab = new System.Windows.Forms.TabPage(); - this.generalSection1 = new MPlayer.ConfigurationPanel.GeneralSection(); this.video_Tab = new System.Windows.Forms.TabPage(); - this.videoSection1 = new MPlayer.ConfigurationPanel.VideoSection(); this.subtitles_Tab = new System.Windows.Forms.TabPage(); - this.subtitleSection1 = new MPlayer.ConfigurationPanel.SubtitleSection(); this.audio_Tab = new System.Windows.Forms.TabPage(); - this.audioSection1 = new MPlayer.ConfigurationPanel.AudioSection(); this.extension_Tab = new System.Windows.Forms.TabPage(); this.dvd_vcd_svcd_streams_Tab = new System.Windows.Forms.TabPage(); - this.streamSection1 = new MPlayer.ConfigurationPanel.StreamSection(); this.fontDialog1 = new System.Windows.Forms.FontDialog(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); + this.generalSection1 = new MPlayer.ConfigurationPanel.GeneralSection(); + this.videoSection1 = new MPlayer.ConfigurationPanel.VideoSection(); + this.subtitleSection1 = new MPlayer.ConfigurationPanel.SubtitleSection(); + this.audioSection1 = new MPlayer.ConfigurationPanel.AudioSection(); this.extensionSection1 = new MPlayer.ConfigurationPanel.ExtensionSection(); + this.streamSection1 = new MPlayer.ConfigurationPanel.StreamSection(); this.tabControl1.SuspendLayout(); this.general_Tab.SuspendLayout(); this.video_Tab.SuspendLayout(); @@ -76,7 +76,9 @@ // // okButton // - this.okButton.Location = new System.Drawing.Point(25, 460); + this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.okButton.AutoSize = true; + this.okButton.Location = new System.Drawing.Point(25, 453); this.okButton.Name = "okButton"; this.okButton.Size = new System.Drawing.Size(75, 23); this.okButton.TabIndex = 3; @@ -86,8 +88,10 @@ // // cancelButton // + this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.AutoSize = true; this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(327, 460); + this.cancelButton.Location = new System.Drawing.Point(332, 453); this.cancelButton.Name = "cancelButton"; this.cancelButton.Size = new System.Drawing.Size(75, 23); this.cancelButton.TabIndex = 20; @@ -101,6 +105,9 @@ // // tabControl1 // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tabControl1.Controls.Add(this.general_Tab); this.tabControl1.Controls.Add(this.video_Tab); this.tabControl1.Controls.Add(this.subtitles_Tab); @@ -110,7 +117,7 @@ this.tabControl1.Location = new System.Drawing.Point(12, 12); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(411, 431); + this.tabControl1.Size = new System.Drawing.Size(412, 424); this.tabControl1.TabIndex = 24; // // general_Tab @@ -119,81 +126,49 @@ this.general_Tab.Location = new System.Drawing.Point(4, 22); this.general_Tab.Name = "general_Tab"; this.general_Tab.Padding = new System.Windows.Forms.Padding(3); - this.general_Tab.Size = new System.Drawing.Size(403, 405); + this.general_Tab.Size = new System.Drawing.Size(404, 398); this.general_Tab.TabIndex = 0; this.general_Tab.Text = "General"; this.general_Tab.UseVisualStyleBackColor = true; // - // generalSection1 - // - this.generalSection1.BackColor = System.Drawing.Color.Transparent; - this.generalSection1.Location = new System.Drawing.Point(0, 0); - this.generalSection1.Name = "generalSection1"; - this.generalSection1.Size = new System.Drawing.Size(403, 405); - this.generalSection1.TabIndex = 0; - // // video_Tab // this.video_Tab.Controls.Add(this.videoSection1); this.video_Tab.Location = new System.Drawing.Point(4, 22); this.video_Tab.Name = "video_Tab"; this.video_Tab.Padding = new System.Windows.Forms.Padding(3); - this.video_Tab.Size = new System.Drawing.Size(403, 405); + this.video_Tab.Size = new System.Drawing.Size(404, 398); this.video_Tab.TabIndex = 4; this.video_Tab.Text = "Video"; this.video_Tab.UseVisualStyleBackColor = true; // - // videoSection1 - // - this.videoSection1.BackColor = System.Drawing.Color.Transparent; - this.videoSection1.Location = new System.Drawing.Point(0, 0); - this.videoSection1.Name = "videoSection1"; - this.videoSection1.Size = new System.Drawing.Size(403, 405); - this.videoSection1.TabIndex = 0; - // // subtitles_Tab // this.subtitles_Tab.Controls.Add(this.subtitleSection1); this.subtitles_Tab.Location = new System.Drawing.Point(4, 22); this.subtitles_Tab.Name = "subtitles_Tab"; - this.subtitles_Tab.Size = new System.Drawing.Size(403, 405); + this.subtitles_Tab.Size = new System.Drawing.Size(404, 398); this.subtitles_Tab.TabIndex = 6; this.subtitles_Tab.Text = "Subtitles"; this.subtitles_Tab.UseVisualStyleBackColor = true; // - // subtitleSection1 - // - this.subtitleSection1.BackColor = System.Drawing.Color.Transparent; - this.subtitleSection1.Location = new System.Drawing.Point(0, 0); - this.subtitleSection1.Name = "subtitleSection1"; - this.subtitleSection1.Size = new System.Drawing.Size(403, 405); - this.subtitleSection1.TabIndex = 0; - // // audio_Tab // this.audio_Tab.Controls.Add(this.audioSection1); this.audio_Tab.Location = new System.Drawing.Point(4, 22); this.audio_Tab.Name = "audio_Tab"; - this.audio_Tab.Size = new System.Drawing.Size(403, 405); + this.audio_Tab.Size = new System.Drawing.Size(404, 398); this.audio_Tab.TabIndex = 5; this.audio_Tab.Text = "Audio"; this.audio_Tab.UseVisualStyleBackColor = true; // - // audioSection1 - // - this.audioSection1.BackColor = System.Drawing.Color.Transparent; - this.audioSection1.Location = new System.Drawing.Point(0, 0); - this.audioSection1.Name = "audioSection1"; - this.audioSection1.Size = new System.Drawing.Size(403, 405); - this.audioSection1.TabIndex = 0; - // // extension_Tab // this.extension_Tab.Controls.Add(this.extensionSection1); this.extension_Tab.Location = new System.Drawing.Point(4, 22); this.extension_Tab.Name = "extension_Tab"; this.extension_Tab.Padding = new System.Windows.Forms.Padding(3); - this.extension_Tab.Size = new System.Drawing.Size(403, 405); + this.extension_Tab.Size = new System.Drawing.Size(404, 398); this.extension_Tab.TabIndex = 1; this.extension_Tab.Text = "Extensions"; this.extension_Tab.UseVisualStyleBackColor = true; @@ -203,36 +178,86 @@ this.dvd_vcd_svcd_streams_Tab.Controls.Add(this.streamSection1); this.dvd_vcd_svcd_streams_Tab.Location = new System.Drawing.Point(4, 22); this.dvd_vcd_svcd_streams_Tab.Name = "dvd_vcd_svcd_streams_Tab"; - this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(403, 405); + this.dvd_vcd_svcd_streams_Tab.Size = new System.Drawing.Size(404, 398); this.dvd_vcd_svcd_streams_Tab.TabIndex = 3; this.dvd_vcd_svcd_streams_Tab.Text = "DVD/VCD/SVCD/Streams"; this.dvd_vcd_svcd_streams_Tab.UseVisualStyleBackColor = true; // - // streamSection1 + // generalSection1 // - this.streamSection1.BackColor = System.Drawing.Color.Transparent; - this.streamSection1.Location = new System.Drawing.Point(0, 0); - this.streamSection1.Name = "streamSection1"; - this.streamSection1.Size = new System.Drawing.Size(403, 405); - this.streamSection1.TabIndex = 0; + this.generalSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.generalSection1.BackColor = System.Drawing.Color.Transparent; + this.generalSection1.Location = new System.Drawing.Point(0, 0); + this.generalSection1.Name = "generalSection1"; + this.generalSection1.Size = new System.Drawing.Size(404, 398); + this.generalSection1.TabIndex = 0; // + // videoSection1 + // + this.videoSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.videoSection1.BackColor = System.Drawing.Color.Transparent; + this.videoSection1.Location = new System.Drawing.Point(0, 0); + this.videoSection1.Name = "videoSection1"; + this.videoSection1.Size = new System.Drawing.Size(395, 397); + this.videoSection1.TabIndex = 0; + // + // subtitleSection1 + // + this.subtitleSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.subtitleSection1.BackColor = System.Drawing.Color.Transparent; + this.subtitleSection1.Location = new System.Drawing.Point(0, 0); + this.subtitleSection1.Name = "subtitleSection1"; + this.subtitleSection1.Size = new System.Drawing.Size(395, 397); + this.subtitleSection1.TabIndex = 0; + // + // audioSection1 + // + this.audioSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioSection1.BackColor = System.Drawing.Color.Transparent; + this.audioSection1.Location = new System.Drawing.Point(0, 0); + this.audioSection1.Name = "audioSection1"; + this.audioSection1.Size = new System.Drawing.Size(395, 397); + this.audioSection1.TabIndex = 0; + // // extensionSection1 // + this.extensionSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.extensionSection1.BackColor = System.Drawing.Color.Transparent; this.extensionSection1.Location = new System.Drawing.Point(0, 0); this.extensionSection1.Name = "extensionSection1"; - this.extensionSection1.Size = new System.Drawing.Size(403, 405); + this.extensionSection1.Size = new System.Drawing.Size(395, 397); this.extensionSection1.TabIndex = 0; // + // streamSection1 + // + this.streamSection1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.streamSection1.BackColor = System.Drawing.Color.Transparent; + this.streamSection1.Location = new System.Drawing.Point(0, 0); + this.streamSection1.Name = "streamSection1"; + this.streamSection1.Size = new System.Drawing.Size(395, 397); + this.streamSection1.TabIndex = 0; + // // ConfigurationForm // this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); - this.ClientSize = new System.Drawing.Size(435, 492); + this.ClientSize = new System.Drawing.Size(440, 485); this.Controls.Add(this.tabControl1); this.Controls.Add(this.cancelButton); this.Controls.Add(this.okButton); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimizeBox = false; this.Name = "ConfigurationForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "MPlayer Configuration"; @@ -245,6 +270,7 @@ this.extension_Tab.ResumeLayout(false); this.dvd_vcd_svcd_streams_Tab.ResumeLayout(false); this.ResumeLayout(false); + this.PerformLayout(); } Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationManager.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -609,7 +609,7 @@ _seekStepTimeout = Convert.ToInt16(timeout); String m_strLanguage = xmlreader.GetValueAsString("skin", "language", "English"); - LocalizeStrings.Load(m_strLanguage); + //LocalizeStrings.Load(m_strLanguage); } try { loadXMLData(); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/AudioSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -66,14 +66,16 @@ // // audioDelayStep // - this.audioDelayStep.Location = new System.Drawing.Point(129, 96); + this.audioDelayStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.audioDelayStep.Location = new System.Drawing.Point(138, 96); this.audioDelayStep.Maximum = new decimal(new int[] { 10000, 0, 0, 0}); this.audioDelayStep.Name = "audioDelayStep"; - this.audioDelayStep.Size = new System.Drawing.Size(260, 20); + this.audioDelayStep.Size = new System.Drawing.Size(251, 20); this.audioDelayStep.TabIndex = 69; this.toolTip.SetToolTip(this.audioDelayStep, "With this option you could define in which steps\r\nthe audio delay will be changed" + " during playback"); @@ -85,9 +87,10 @@ // // label32 // + this.label32.AutoSize = true; this.label32.Location = new System.Drawing.Point(6, 98); this.label32.Name = "label32"; - this.label32.Size = new System.Drawing.Size(117, 31); + this.label32.Size = new System.Drawing.Size(126, 13); this.label32.TabIndex = 68; this.label32.Text = "Audio Delay Step (msec):"; this.toolTip.SetToolTip(this.label32, "With this option you could define in which steps\r\nthe audio delay will be changed" + @@ -95,9 +98,10 @@ // // label29 // + this.label29.AutoSize = true; this.label29.Location = new System.Drawing.Point(6, 45); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(117, 23); + this.label29.Size = new System.Drawing.Size(109, 13); this.label29.TabIndex = 67; this.label29.Text = "Sound output device:"; this.toolTip.SetToolTip(this.label29, "Defines the selected output device.\r\nThis can only be choosen, if the direct soun" + @@ -105,6 +109,8 @@ // // soundOutputDevice // + this.soundOutputDevice.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.soundOutputDevice.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.soundOutputDevice.FormattingEnabled = true; this.soundOutputDevice.Items.AddRange(new object[] { @@ -112,18 +118,19 @@ "(don\'t play sound)", "Win32", "DirectSound"}); - this.soundOutputDevice.Location = new System.Drawing.Point(129, 42); + this.soundOutputDevice.Location = new System.Drawing.Point(138, 42); this.soundOutputDevice.Name = "soundOutputDevice"; - this.soundOutputDevice.Size = new System.Drawing.Size(260, 21); + this.soundOutputDevice.Size = new System.Drawing.Size(251, 21); this.soundOutputDevice.TabIndex = 66; this.toolTip.SetToolTip(this.soundOutputDevice, "Defines the selected output device.\r\nThis can only be choosen, if the direct soun" + "d output\r\ndriver is selected."); // // passthroughAC3_DTS // + this.passthroughAC3_DTS.AutoSize = true; this.passthroughAC3_DTS.Location = new System.Drawing.Point(9, 132); this.passthroughAC3_DTS.Name = "passthroughAC3_DTS"; - this.passthroughAC3_DTS.Size = new System.Drawing.Size(178, 23); + this.passthroughAC3_DTS.Size = new System.Drawing.Size(135, 17); this.passthroughAC3_DTS.TabIndex = 65; this.passthroughAC3_DTS.Text = "Passthrough AC3/DTS"; this.toolTip.SetToolTip(this.passthroughAC3_DTS, "Indicates, if AC3/DTS should be passed through.\r\nIf you select this option and"); @@ -131,9 +138,10 @@ // // audioNormalize // + this.audioNormalize.AutoSize = true; this.audioNormalize.Location = new System.Drawing.Point(9, 161); this.audioNormalize.Name = "audioNormalize"; - this.audioNormalize.Size = new System.Drawing.Size(178, 23); + this.audioNormalize.Size = new System.Drawing.Size(108, 17); this.audioNormalize.TabIndex = 64; this.audioNormalize.Text = "Volume normalize"; this.toolTip.SetToolTip(this.audioNormalize, "Indicates, if the volume should be normalized during playback."); @@ -141,15 +149,18 @@ // // label7 // + this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(6, 72); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(117, 23); + this.label7.Size = new System.Drawing.Size(84, 13); this.label7.TabIndex = 63; this.label7.Text = "Audio Channels:"; this.toolTip.SetToolTip(this.label7, "Defines how many audio channels will be decoded"); // // audioChannels // + this.audioChannels.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.audioChannels.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.audioChannels.FormattingEnabled = true; this.audioChannels.Items.AddRange(new object[] { @@ -157,23 +168,26 @@ "Stereo", "Surround", "Full 5.1"}); - this.audioChannels.Location = new System.Drawing.Point(129, 69); + this.audioChannels.Location = new System.Drawing.Point(138, 69); this.audioChannels.Name = "audioChannels"; - this.audioChannels.Size = new System.Drawing.Size(260, 21); + this.audioChannels.Size = new System.Drawing.Size(251, 21); this.audioChannels.TabIndex = 62; this.toolTip.SetToolTip(this.audioChannels, "Defines how many audio channels will be decoded"); // // label1 // + this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(6, 18); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(117, 23); + this.label1.Size = new System.Drawing.Size(103, 13); this.label1.TabIndex = 60; this.label1.Text = "Sound output driver:"; this.toolTip.SetToolTip(this.label1, "Defines the sound output driver.\r\nThe direct sound output driver is recommend\r\n"); // // soundOutputDriver // + this.soundOutputDriver.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.soundOutputDriver.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.soundOutputDriver.FormattingEnabled = true; this.soundOutputDriver.Items.AddRange(new object[] { @@ -181,9 +195,9 @@ "(don\'t play sound)", "Win32", "DirectSound"}); - this.soundOutputDriver.Location = new System.Drawing.Point(129, 15); + this.soundOutputDriver.Location = new System.Drawing.Point(138, 15); this.soundOutputDriver.Name = "soundOutputDriver"; - this.soundOutputDriver.Size = new System.Drawing.Size(260, 21); + this.soundOutputDriver.Size = new System.Drawing.Size(251, 21); this.soundOutputDriver.TabIndex = 61; this.toolTip.SetToolTip(this.soundOutputDriver, "Defines the sound output driver.\r\nThe direct sound output driver is recommend"); this.soundOutputDriver.SelectedIndexChanged += new System.EventHandler(this.soundOutputDriver_SelectedIndexChanged); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/ExtensionSettings.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -26,50 +26,35 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ExtensionSection)); this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.groupBox1 = new System.Windows.Forms.GroupBox(); this.videoExtList = new System.Windows.Forms.ListBox(); this.videoDelete = new System.Windows.Forms.Button(); - this.label24 = new System.Windows.Forms.Label(); - this.label23 = new System.Windows.Forms.Label(); - this.label25 = new System.Windows.Forms.Label(); this.videoExtension = new System.Windows.Forms.TextBox(); this.videoPlayerUse = new System.Windows.Forms.CheckBox(); this.videoAdd = new System.Windows.Forms.Button(); this.videoArgument = new System.Windows.Forms.TextBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.label26 = new System.Windows.Forms.Label(); this.audioPlayerUse = new System.Windows.Forms.CheckBox(); this.audioArgument = new System.Windows.Forms.TextBox(); - this.label27 = new System.Windows.Forms.Label(); - this.label28 = new System.Windows.Forms.Label(); this.audioExtension = new System.Windows.Forms.TextBox(); this.audioDelete = new System.Windows.Forms.Button(); this.audioAdd = new System.Windows.Forms.Button(); this.audioExtList = new System.Windows.Forms.ListBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.label24 = new System.Windows.Forms.Label(); + this.label23 = new System.Windows.Forms.Label(); + this.label25 = new System.Windows.Forms.Label(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.label26 = new System.Windows.Forms.Label(); + this.label27 = new System.Windows.Forms.Label(); + this.label28 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); this.SuspendLayout(); // - // groupBox1 - // - this.groupBox1.Controls.Add(this.videoExtList); - this.groupBox1.Controls.Add(this.videoDelete); - this.groupBox1.Controls.Add(this.label24); - this.groupBox1.Controls.Add(this.label23); - this.groupBox1.Controls.Add(this.label25); - this.groupBox1.Controls.Add(this.videoExtension); - this.groupBox1.Controls.Add(this.videoPlayerUse); - this.groupBox1.Controls.Add(this.videoAdd); - this.groupBox1.Controls.Add(this.videoArgument); - this.groupBox1.Location = new System.Drawing.Point(3, 6); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(394, 189); - this.groupBox1.TabIndex = 30; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Video"; - // // videoExtList // + this.videoExtList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.videoExtList.FormattingEnabled = true; this.videoExtList.Location = new System.Drawing.Point(6, 19); this.videoExtList.Name = "videoExtList"; @@ -80,6 +65,8 @@ // // videoDelete // + this.videoDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.videoDelete.AutoSize = true; this.videoDelete.Location = new System.Drawing.Point(174, 156); this.videoDelete.Name = "videoDelete"; this.videoDelete.Size = new System.Drawing.Size(75, 23); @@ -89,35 +76,9 @@ this.videoDelete.UseVisualStyleBackColor = true; this.videoDelete.Click += new System.EventHandler(this.videoDelete_Click); // - // label24 - // - this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(90, 48); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(60, 13); - this.label24.TabIndex = 23; - this.label24.Text = "Arguments:"; - // - // label23 - // - this.label23.AutoSize = true; - this.label23.Location = new System.Drawing.Point(90, 22); - this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(56, 13); - this.label23.TabIndex = 22; - this.label23.Text = "Extension:"; - // - // label25 - // - this.label25.AutoSize = true; - this.label25.Location = new System.Drawing.Point(90, 72); - this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(100, 13); - this.label25.TabIndex = 26; - this.label25.Text = "External Player use:"; - // // videoExtension // + this.videoExtension.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.videoExtension.Enabled = false; this.videoExtension.Location = new System.Drawing.Point(196, 19); this.videoExtension.Name = "videoExtension"; @@ -128,6 +89,7 @@ // // videoPlayerUse // + this.videoPlayerUse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.videoPlayerUse.AutoSize = true; this.videoPlayerUse.Enabled = false; this.videoPlayerUse.Location = new System.Drawing.Point(196, 71); @@ -139,6 +101,8 @@ // // videoAdd // + this.videoAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.videoAdd.AutoSize = true; this.videoAdd.Location = new System.Drawing.Point(93, 156); this.videoAdd.Name = "videoAdd"; this.videoAdd.Size = new System.Drawing.Size(75, 23); @@ -150,6 +114,7 @@ // // videoArgument // + this.videoArgument.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.videoArgument.Enabled = false; this.videoArgument.Location = new System.Drawing.Point(196, 45); this.videoArgument.Name = "videoArgument"; @@ -157,35 +122,9 @@ this.videoArgument.TabIndex = 24; this.toolTip.SetToolTip(this.videoArgument, "Arguments which will be used, when the selected extension is played"); // - // groupBox2 - // - this.groupBox2.Controls.Add(this.label26); - this.groupBox2.Controls.Add(this.audioPlayerUse); - this.groupBox2.Controls.Add(this.audioArgument); - this.groupBox2.Controls.Add(this.label27); - this.groupBox2.Controls.Add(this.label28); - this.groupBox2.Controls.Add(this.audioExtension); - this.groupBox2.Controls.Add(this.audioDelete); - this.groupBox2.Controls.Add(this.audioAdd); - this.groupBox2.Controls.Add(this.audioExtList); - this.groupBox2.Location = new System.Drawing.Point(3, 201); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(394, 189); - this.groupBox2.TabIndex = 31; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Audio"; - // - // label26 - // - this.label26.AutoSize = true; - this.label26.Location = new System.Drawing.Point(90, 72); - this.label26.Name = "label26"; - this.label26.Size = new System.Drawing.Size(100, 13); - this.label26.TabIndex = 44; - this.label26.Text = "External Player use:"; - // // audioPlayerUse // + this.audioPlayerUse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.audioPlayerUse.AutoSize = true; this.audioPlayerUse.Enabled = false; this.audioPlayerUse.Location = new System.Drawing.Point(196, 71); @@ -197,6 +136,7 @@ // // audioArgument // + this.audioArgument.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.audioArgument.Enabled = false; this.audioArgument.Location = new System.Drawing.Point(196, 45); this.audioArgument.Name = "audioArgument"; @@ -204,26 +144,9 @@ this.audioArgument.TabIndex = 42; this.toolTip.SetToolTip(this.audioArgument, "Arguments which will be used, when the selected extension is played\r\n"); // - // label27 - // - this.label27.AutoSize = true; - this.label27.Location = new System.Drawing.Point(90, 48); - this.label27.Name = "label27"; - this.label27.Size = new System.Drawing.Size(60, 13); - this.label27.TabIndex = 41; - this.label27.Text = "Arguments:"; - // - // label28 - // - this.label28.AutoSize = true; - this.label28.Location = new System.Drawing.Point(90, 22); - this.label28.Name = "label28"; - this.label28.Size = new System.Drawing.Size(56, 13); - this.label28.TabIndex = 40; - this.label28.Text = "Extension:"; - // // audioExtension // + this.audioExtension.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.audioExtension.Enabled = false; this.audioExtension.Location = new System.Drawing.Point(196, 19); this.audioExtension.Name = "audioExtension"; @@ -234,6 +157,8 @@ // // audioDelete // + this.audioDelete.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.audioDelete.AutoSize = true; this.audioDelete.Location = new System.Drawing.Point(174, 156); this.audioDelete.Name = "audioDelete"; this.audioDelete.Size = new System.Drawing.Size(75, 23); @@ -245,6 +170,8 @@ // // audioAdd // + this.audioAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.audioAdd.AutoSize = true; this.audioAdd.Location = new System.Drawing.Point(93, 156); this.audioAdd.Name = "audioAdd"; this.audioAdd.Size = new System.Drawing.Size(75, 23); @@ -256,6 +183,9 @@ // // audioExtList // + this.audioExtList.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.audioExtList.FormattingEnabled = true; this.audioExtList.Location = new System.Drawing.Point(6, 19); this.audioExtList.Name = "audioExtList"; @@ -264,6 +194,106 @@ this.toolTip.SetToolTip(this.audioExtList, "List of supported audio extensions"); this.audioExtList.SelectedIndexChanged += new System.EventHandler(this.audioExtList_SelectedIndexChanged); // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox1.Controls.Add(this.videoExtList); + this.groupBox1.Controls.Add(this.videoDelete); + this.groupBox1.Controls.Add(this.label24); + this.groupBox1.Controls.Add(this.label23); + this.groupBox1.Controls.Add(this.label25); + this.groupBox1.Controls.Add(this.videoExtension); + this.groupBox1.Controls.Add(this.videoPlayerUse); + this.groupBox1.Controls.Add(this.videoAdd); + this.groupBox1.Controls.Add(this.videoArgument); + this.groupBox1.Location = new System.Drawing.Point(3, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(394, 189); + this.groupBox1.TabIndex = 30; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Video"; + // + // label24 + // + this.label24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label24.AutoSize = true; + this.label24.Location = new System.Drawing.Point(90, 48); + this.label24.Name = "label24"; + this.label24.Size = new System.Drawing.Size(60, 13); + this.label24.TabIndex = 23; + this.label24.Text = "Arguments:"; + // + // label23 + // + this.label23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label23.AutoSize = true; + this.label23.Location = new System.Drawing.Point(90, 22); + this.label23.Name = "label23"; + this.label23.Size = new System.Drawing.Size(56, 13); + this.label23.TabIndex = 22; + this.label23.Text = "Extension:"; + // + // label25 + // + this.label25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label25.AutoSize = true; + this.label25.Location = new System.Drawing.Point(90, 72); + this.label25.Name = "label25"; + this.label25.Size = new System.Drawing.Size(100, 13); + this.label25.TabIndex = 26; + this.label25.Text = "External Player use:"; + // + // groupBox2 + // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.groupBox2.Controls.Add(this.label26); + this.groupBox2.Controls.Add(this.audioPlayerUse); + this.groupBox2.Controls.Add(this.audioArgument); + this.groupBox2.Controls.Add(this.label27); + this.groupBox2.Controls.Add(this.label28); + this.groupBox2.Controls.Add(this.audioExtension); + this.groupBox2.Controls.Add(this.audioDelete); + this.groupBox2.Controls.Add(this.audioAdd); + this.groupBox2.Controls.Add(this.audioExtList); + this.groupBox2.Location = new System.Drawing.Point(3, 201); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(394, 189); + this.groupBox2.TabIndex = 31; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Audio"; + // + // label26 + // + this.label26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label26.AutoSize = true; + this.label26.Location = new System.Drawing.Point(90, 72); + this.label26.Name = "label26"; + this.label26.Size = new System.Drawing.Size(100, 13); + this.label26.TabIndex = 44; + this.label26.Text = "External Player use:"; + // + // label27 + // + this.label27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label27.AutoSize = true; + this.label27.Location = new System.Drawing.Point(90, 48); + this.label27.Name = "label27"; + this.label27.Size = new System.Drawing.Size(60, 13); + this.label27.TabIndex = 41; + this.label27.Text = "Arguments:"; + // + // label28 + // + this.label28.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label28.AutoSize = true; + this.label28.Location = new System.Drawing.Point(90, 22); + this.label28.Name = "label28"; + this.label28.Size = new System.Drawing.Size(56, 13); + this.label28.TabIndex = 40; + this.label28.Text = "Extension:"; + // // ExtensionSection // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/GeneralSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -69,15 +69,18 @@ // // label35 // + this.label35.AutoSize = true; this.label35.Location = new System.Drawing.Point(6, 18); this.label35.Name = "label35"; - this.label35.Size = new System.Drawing.Size(117, 23); + this.label35.Size = new System.Drawing.Size(33, 13); this.label35.TabIndex = 76; this.label35.Text = "OSD:"; this.toolTip.SetToolTip(this.label35, resources.GetString("label35.ToolTip")); // // osdSelect // + this.osdSelect.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.osdSelect.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.osdSelect.FormattingEnabled = true; this.osdSelect.Items.AddRange(new object[] { @@ -91,9 +94,10 @@ // // label30 // + this.label30.AutoSize = true; this.label30.Location = new System.Drawing.Point(3, 45); this.label30.Name = "label30"; - this.label30.Size = new System.Drawing.Size(117, 23); + this.label30.Size = new System.Drawing.Size(59, 13); this.label30.TabIndex = 74; this.label30.Text = "Cachesize:"; this.toolTip.SetToolTip(this.label30, "The size of cache that MPlayer will be used in KB (Kilobytes).\r\nFor streaming a v" + @@ -101,6 +105,8 @@ // // cacheSize // + this.cacheSize.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.cacheSize.FormattingEnabled = true; this.cacheSize.Items.AddRange(new object[] { "2048", @@ -116,6 +122,8 @@ // // folderSearch // + this.folderSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.folderSearch.AutoSize = true; this.folderSearch.Location = new System.Drawing.Point(313, 154); this.folderSearch.Name = "folderSearch"; this.folderSearch.Size = new System.Drawing.Size(76, 23); @@ -127,15 +135,18 @@ // // label8 // + this.label8.AutoSize = true; this.label8.Location = new System.Drawing.Point(3, 159); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(117, 23); + this.label8.Size = new System.Drawing.Size(85, 13); this.label8.TabIndex = 71; this.label8.Text = "Path to MPlayer:"; this.toolTip.SetToolTip(this.label8, "Path to the executable of MPlayer\r\n"); // // mplayerPath // + this.mplayerPath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.mplayerPath.Location = new System.Drawing.Point(129, 156); this.mplayerPath.Name = "mplayerPath"; this.mplayerPath.Size = new System.Drawing.Size(174, 20); @@ -145,9 +156,10 @@ // // rebuildIndex // + this.rebuildIndex.AutoSize = true; this.rebuildIndex.Location = new System.Drawing.Point(6, 98); this.rebuildIndex.Name = "rebuildIndex"; - this.rebuildIndex.Size = new System.Drawing.Size(188, 23); + this.rebuildIndex.Size = new System.Drawing.Size(165, 17); this.rebuildIndex.TabIndex = 66; this.rebuildIndex.Text = "Rebuild file index if necessary"; this.toolTip.SetToolTip(this.rebuildIndex, "Indicates, if the index of the file should be rebuild if necessary\r\n"); @@ -155,9 +167,10 @@ // // priorityBoost // + this.priorityBoost.AutoSize = true; this.priorityBoost.Location = new System.Drawing.Point(6, 127); this.priorityBoost.Name = "priorityBoost"; - this.priorityBoost.Size = new System.Drawing.Size(188, 23); + this.priorityBoost.Size = new System.Drawing.Size(87, 17); this.priorityBoost.TabIndex = 67; this.priorityBoost.Text = "Priority Boost"; this.toolTip.SetToolTip(this.priorityBoost, "Increases the process priority of MPlayer to above normal.\r\n"); @@ -165,15 +178,18 @@ // // label5 // + this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(3, 72); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(117, 23); + this.label5.Size = new System.Drawing.Size(102, 13); this.label5.TabIndex = 68; this.label5.Text = "Optional Arguments:"; this.toolTip.SetToolTip(this.label5, "Specify the optional arguments that\r\nshould be used for every playback.\r\n"); // // optionalArguments // + this.optionalArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.optionalArguments.Location = new System.Drawing.Point(129, 69); this.optionalArguments.Name = "optionalArguments"; this.optionalArguments.Size = new System.Drawing.Size(260, 20); @@ -187,6 +203,9 @@ // // externalLibGroup // + this.externalLibGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.externalLibGroup.AutoSize = true; this.externalLibGroup.Controls.Add(this.externalOSDLibraryBlank); this.externalLibGroup.Location = new System.Drawing.Point(9, 202); this.externalLibGroup.Name = "externalLibGroup"; Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/StreamSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -77,14 +77,17 @@ // // label20 // + this.label20.AutoSize = true; this.label20.Location = new System.Drawing.Point(6, 304); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(117, 23); + this.label20.Size = new System.Drawing.Size(93, 13); this.label20.TabIndex = 74; this.label20.Text = "UNSV Arguments:"; // // unsvArguments // + this.unsvArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.unsvArguments.Location = new System.Drawing.Point(129, 301); this.unsvArguments.Name = "unsvArguments"; this.unsvArguments.Size = new System.Drawing.Size(256, 20); @@ -92,14 +95,17 @@ // // label19 // + this.label19.AutoSize = true; this.label19.Location = new System.Drawing.Point(6, 278); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(117, 23); + this.label19.Size = new System.Drawing.Size(86, 13); this.label19.TabIndex = 72; this.label19.Text = "UDP Arguments:"; // // udpArguments // + this.udpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.udpArguments.Location = new System.Drawing.Point(129, 275); this.udpArguments.Name = "udpArguments"; this.udpArguments.Size = new System.Drawing.Size(256, 20); @@ -107,14 +113,17 @@ // // label18 // + this.label18.AutoSize = true; this.label18.Location = new System.Drawing.Point(6, 252); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(117, 23); + this.label18.Size = new System.Drawing.Size(85, 13); this.label18.TabIndex = 70; this.label18.Text = "SDP Arguments:"; // // sdpArguments // + this.sdpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.sdpArguments.Location = new System.Drawing.Point(129, 249); this.sdpArguments.Name = "sdpArguments"; this.sdpArguments.Size = new System.Drawing.Size(256, 20); @@ -122,14 +131,17 @@ // // label17 // + this.label17.AutoSize = true; this.label17.Location = new System.Drawing.Point(6, 226); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(117, 23); + this.label17.Size = new System.Drawing.Size(98, 13); this.label17.TabIndex = 68; this.label17.Text = "RT(S)P Arguments:"; // // rtspArguments // + this.rtspArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.rtspArguments.Location = new System.Drawing.Point(129, 223); this.rtspArguments.Name = "rtspArguments"; this.rtspArguments.Size = new System.Drawing.Size(256, 20); @@ -137,14 +149,17 @@ // // label16 // + this.label16.AutoSize = true; this.label16.Location = new System.Drawing.Point(6, 200); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(117, 23); + this.label16.Size = new System.Drawing.Size(93, 13); this.label16.TabIndex = 66; this.label16.Text = "MPST Arguments:"; // // mpstArguments // + this.mpstArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.mpstArguments.Location = new System.Drawing.Point(129, 197); this.mpstArguments.Name = "mpstArguments"; this.mpstArguments.Size = new System.Drawing.Size(256, 20); @@ -152,14 +167,17 @@ // // label15 // + this.label15.AutoSize = true; this.label15.Location = new System.Drawing.Point(6, 174); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(117, 23); + this.label15.Size = new System.Drawing.Size(101, 13); this.label15.TabIndex = 64; this.label15.Text = "MMS(T) Arguments:"; // // mmsArguments // + this.mmsArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.mmsArguments.Location = new System.Drawing.Point(129, 171); this.mmsArguments.Name = "mmsArguments"; this.mmsArguments.Size = new System.Drawing.Size(256, 20); @@ -167,14 +185,17 @@ // // label14 // + this.label14.AutoSize = true; this.label14.Location = new System.Drawing.Point(6, 148); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(117, 23); + this.label14.Size = new System.Drawing.Size(92, 13); this.label14.TabIndex = 62; this.label14.Text = "HTTP Arguments:"; // // httpArguments // + this.httpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.httpArguments.Location = new System.Drawing.Point(129, 145); this.httpArguments.Name = "httpArguments"; this.httpArguments.Size = new System.Drawing.Size(256, 20); @@ -182,14 +203,17 @@ // // label13 // + this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(6, 122); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(117, 23); + this.label13.Size = new System.Drawing.Size(83, 13); this.label13.TabIndex = 60; this.label13.Text = "FTP Arguments:"; // // ftpArguments // + this.ftpArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.ftpArguments.Location = new System.Drawing.Point(129, 119); this.ftpArguments.Name = "ftpArguments"; this.ftpArguments.Size = new System.Drawing.Size(256, 20); @@ -197,14 +221,17 @@ // // label12 // + this.label12.AutoSize = true; this.label12.Location = new System.Drawing.Point(6, 96); this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(117, 23); + this.label12.Size = new System.Drawing.Size(85, 13); this.label12.TabIndex = 58; this.label12.Text = "CUE Arguments:"; // // cueArguments // + this.cueArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.cueArguments.Location = new System.Drawing.Point(129, 93); this.cueArguments.Name = "cueArguments"; this.cueArguments.Size = new System.Drawing.Size(256, 20); @@ -212,14 +239,17 @@ // // label11 // + this.label11.AutoSize = true; this.label11.Location = new System.Drawing.Point(6, 70); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(117, 23); + this.label11.Size = new System.Drawing.Size(92, 13); this.label11.TabIndex = 56; this.label11.Text = "SVCD Arguments:"; // // svcdArguments // + this.svcdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.svcdArguments.Location = new System.Drawing.Point(129, 67); this.svcdArguments.Name = "svcdArguments"; this.svcdArguments.Size = new System.Drawing.Size(256, 20); @@ -227,14 +257,17 @@ // // label10 // + this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(6, 44); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(117, 23); + this.label10.Size = new System.Drawing.Size(85, 13); this.label10.TabIndex = 54; this.label10.Text = "VCD Arguments:"; // // vcdArguments // + this.vcdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.vcdArguments.Location = new System.Drawing.Point(129, 41); this.vcdArguments.Name = "vcdArguments"; this.vcdArguments.Size = new System.Drawing.Size(256, 20); @@ -242,14 +275,17 @@ // // label9 // + this.label9.AutoSize = true; this.label9.Location = new System.Drawing.Point(6, 18); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(117, 23); + this.label9.Size = new System.Drawing.Size(86, 13); this.label9.TabIndex = 52; this.label9.Text = "DVD Arguments:"; // // dvdArguments // + this.dvdArguments.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.dvdArguments.Location = new System.Drawing.Point(129, 15); this.dvdArguments.Name = "dvdArguments"; this.dvdArguments.Size = new System.Drawing.Size(256, 20); Modified: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-11-27 20:39:23 UTC (rev 1095) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/ConfigurationPanel/SubtitleSection.Designer.cs 2007-11-27 21:02:33 UTC (rev 1096) @@ -67,33 +67,38 @@ // // label22 // + this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(6, 18); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(117, 23); + this.label22.Size = new System.Drawing.Size(66, 13); this.label22.TabIndex = 81; this.label22.Text = "Subtitle font:"; this.toolTip.SetToolTip(this.label22, "Defines the subtitle font, which will also\r\nbe used for the internal OSD.\r\n"); // // subtitleFont // + this.subtitleFont.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.subtitleFont.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.subtitleFont.FormattingEnabled = true; - this.subtitleFont.Location = new System.Drawing.Point(129, 15); + this.subtitleFont.Location = new System.Drawing.Point(146, 15); this.subtitleFont.Name = "subtitleFont"; - this.subtitleFont.Size = new System.Drawing.Size(260, 21); + this.subtitleFont.Size = new System.Drawing.Size(243, 21); this.subtitleFont.TabIndex = 80; this.toolTip.SetToolTip(this.subtitleFont, "Defines the subtitle font, which will also\r\nbe used for the internal OSD."); // // subtitleDelayStep // - this.subtitleDelayStep.Location = new System.Drawing.Point(129, 94); + this.subtitleDelayStep.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.subtitleDelayStep.Location = new System.Drawing.Point(146, 94); this.subtitleDelayStep.Maximum = new decimal(new int[] { 10000, 0, 0, 0}); this.subtitleDelayStep.Name = "subtitleDelayStep"; - this.subtitleDelayStep.Size = new System.Drawing.Size(260, 20); + this.subtitleDelayStep.Size = new System.Drawing.Size(243, 20); this.subtitleDelayStep.TabIndex = 79; this.toolTip.... [truncated message content] |
From: <ts...@us...> - 2007-11-27 20:39:31
|
Revision: 1095 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1095&view=rev Author: tsmotw Date: 2007-11-27 12:39:23 -0800 (Tue, 27 Nov 2007) Log Message: ----------- TV-series done. Modified Paths: -------------- trunk/skins/Xephyr/Media/TVSeries/selectbar2.png trunk/skins/Xephyr/Media/TVSeries/selectbarNo2.png trunk/skins/Xephyr/TVSeries.xml Modified: trunk/skins/Xephyr/Media/TVSeries/selectbar2.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/Media/TVSeries/selectbarNo2.png =================================================================== (Binary files differ) Modified: trunk/skins/Xephyr/TVSeries.xml =================================================================== --- trunk/skins/Xephyr/TVSeries.xml 2007-11-27 16:12:49 UTC (rev 1094) +++ trunk/skins/Xephyr/TVSeries.xml 2007-11-27 20:39:23 UTC (rev 1095) @@ -84,7 +84,7 @@ <width>1280</width> <height>720</height> <imagepath>tv</imagepath> - <timeperimage>6000</timeperimage> + <timeperimage>60000</timeperimage> <fadetime>800</fadetime> <loop>yes</loop> <randomize>false</randomize> @@ -100,6 +100,11 @@ <visible>!Control.IsVisible(1235)</visible> </control> + + + + + <control> <description>Fan Art Image</description> <type>image</type> @@ -109,74 +114,33 @@ <width>1280</width> <height>720</height> <texture>-</texture> - <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> + <posX>640</posX> + <posY>90</posY> + <texture>1glassback.png</texture> <visible>Control.IsVisible(1235)</visible> + <animation effect="slide" time="5000" start="640,0">WindowOpen</animation> + <animation effect="slide" time="5000" end="640,0">WindowClose</animation> </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> + <posX>640</posX> + <posY>90</posY> + <texture>1glassback.png</texture> <visible>Control.IsVisible(1235)+Control.IsVisible(1234)</visible> + <animation effect="slide" time="5000" start="640,0">WindowOpen</animation> + <animation effect="slide" time="5000" end="640,0">WindowClose</animation> </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> @@ -522,8 +486,8 @@ <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> + <width>580</width> + <height>140</height> <centered>yes</centered> <keepaspectratio>yes</keepaspectratio> <texture flipY="true" diffuse="Thumb_Mask_non2.png">#TVSeries.SeriesBanner</texture> @@ -622,11 +586,11 @@ <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>740</posX> - <posY>668</posY> + <posY>605</posY> <width>200</width> <label>#TVSeries.LastView</label> <align>right</align> - <textcolor>333333</textcolor> + <textcolor>d4d2d2</textcolor> <font>font16</font> <visible>Control.IsVisible(1234)</visible> </control> @@ -640,14 +604,13 @@ <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>760</posX> - <posY>685</posY> + <posY>620</posY> <width>200</width> <label>#TVSeries.CurrentView</label> <align>center</align> - <textcolor>333333</textcolor> - <font>font18</font> + <textcolor>d4d2d2</textcolor> + <font>font16</font> <shadow>10</shadow> - <visible>Control.IsVisible(1234)</visible> </control> <control> @@ -659,12 +622,13 @@ <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>970</posX> - <posY>668</posY> + <posY>605</posY> <width>200</width> <label>#TVSeries.NextView</label> <align>left</align> - <textcolor>333333</textcolor> + <textcolor>d4d2d2</textcolor> <font>font16</font> + <textcolor>d4d2d2</textcolor> <visible>Control.IsVisible(1234)</visible> </control> @@ -677,9 +641,8 @@ <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>760</posX> - <posY>668</posY> + <posY>605</posY> <texture>tvseries\ArrowLeft.png</texture> - <colordiffuse>ff000000</colordiffuse> <visible>Control.IsVisible(1234)</visible> </control> @@ -692,8 +655,7 @@ <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>940</posX> - <posY>668</posY> - <colordiffuse>ff000000</colordiffuse> + <posY>603</posY> <texture>tvseries\ArrowRight.png</texture> <visible>Control.IsVisible(1234)</visible> </control> @@ -904,10 +866,10 @@ <IconYOff>12</IconYOff> <posX>665</posX> <posY>240</posY> - <width>500</width> + <width>590</width> <height>400</height> - <textXOff2>610</textXOff2> <!-- 635 --> - <textYOff2>27</textYOff2> + <textXOff2>580</textXOff2> <!-- 635 --> + <textYOff2>23</textYOff2> <textYOff>23</textYOff> <textXOff>25</textXOff> <spaceBetweenItems>-13</spaceBetweenItems> @@ -916,15 +878,19 @@ <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>615</spinPosY> + <spinWidth>20</spinWidth> + <spinHeight>20</spinHeight> + <spinPosX>1160</spinPosX> + <spinPosY>610</spinPosY> + <spinAlign>Right</spinAlign> + <spinColor>ffffffff</spinColor> + <textureUp>1scroll-up.png</textureUp> + <textureDown>1scroll-down.png</textureDown> + <textureUpFocus>1scroll-up-focus.png</textureUpFocus> + <textureDownFocus>1scroll-down-focus.png</textureDownFocus> <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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-11-27 16:13:03
|
Revision: 1094 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1094&view=rev Author: and-81 Date: 2007-11-27 08:12:49 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite.nsi trunk/plugins/MCEReplacement/MCE Replacement Plugin.nsi Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-11-27 16:00:51 UTC (rev 1093) +++ trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-11-27 16:12:49 UTC (rev 1094) @@ -25,10 +25,6 @@ ; Set the compression method SetCompressor /SOLID /FINAL lzma -SetDateSave on - -XPStyle on - !include "x64.nsh" ;-------------------------------- @@ -82,7 +78,7 @@ CreateDirectory "$APPDATA\IR Server Suite\Set Top Boxes" SetOutPath "$APPDATA\IR Server Suite\Set Top Boxes" SetOverwrite ifnewer - File /r "Set Top Boxes\*.*" + File /r /x .svn "Set Top Boxes\*.*" ; Set output path to install dir SetOutPath "$INSTDIR" @@ -183,7 +179,7 @@ CreateDirectory "$APPDATA\IR Server Suite\MP Control Plugin" SetOutPath "$APPDATA\IR Server Suite\MP Control Plugin" SetOverwrite ifnewer - File /r "MediaPortal Plugins\MP Control Plugin\AppData\*.*" + File /r /x .svn "MediaPortal Plugins\MP Control Plugin\AppData\*.*" ; Create Macro folder CreateDirectory "$APPDATA\IR Server Suite\MP Control Plugin\Macro" @@ -216,11 +212,11 @@ ; Write skin files SetOutPath "$PROGRAMFILES\Team MediaPortal\MediaPortal\Skin\BlueTwo" SetOverwrite on - File /r "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*" + File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*" SetOutPath "$PROGRAMFILES\Team MediaPortal\MediaPortal\Skin\BlueTwo wide" SetOverwrite on - File /r "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*" + File /r /x .svn "MediaPortal Plugins\MP Blast Zone Plugin\Skin\*.*" ; Create Macro folder CreateDirectory "$APPDATA\IR Server Suite\MP Blast Zone Plugin\Macro" Modified: trunk/plugins/MCEReplacement/MCE Replacement Plugin.nsi =================================================================== --- trunk/plugins/MCEReplacement/MCE Replacement Plugin.nsi 2007-11-27 16:00:51 UTC (rev 1093) +++ trunk/plugins/MCEReplacement/MCE Replacement Plugin.nsi 2007-11-27 16:12:49 UTC (rev 1094) @@ -18,8 +18,9 @@ ; Registry key to check for directory (so if you install again, it will overwrite the old one automatically) InstallDirRegKey HKLM "Software\MediaPortal MCE Replacement Plugin" "Install_Dir" -; Show the installation steps to the user +; Show the installation/uninstallation steps to the user ShowInstDetails show +ShowUninstDetails show ; Set the compression method SetCompressor /SOLID /FINAL lzma @@ -67,7 +68,7 @@ CreateDirectory "$APPDATA\MediaPortal MCE Replacement Plugin\STB" SetOutPath "$APPDATA\MediaPortal MCE Replacement Plugin\STB" SetOverwrite on - File /r "..\IR Server Suite\Set Top Boxes\*.*" + File /r /x .svn "..\IR Server Suite\Set Top Boxes\*.*" ; Write the installation path into the registry WriteRegStr HKLM "Software\MediaPortal MCE Replacement Plugin" "Install_Dir" "$INSTDIR" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-11-27 16:00:58
|
Revision: 1093 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1093&view=rev Author: and-81 Date: 2007-11-27 08:00:51 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/IR Server Suite.nsi Added Paths: ----------- trunk/plugins/MCEReplacement/AppData/ trunk/plugins/MCEReplacement/AppData/DifferentRemote.xml trunk/plugins/MCEReplacement/AppData/EventMapping.xml trunk/plugins/MCEReplacement/AppData/MCERemote.xml trunk/plugins/MCEReplacement/AppData/MultiMapping.xml trunk/plugins/MCEReplacement/Docs/ trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhc trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhp trunk/plugins/MCEReplacement/Docs/RemoteButton.txt trunk/plugins/MCEReplacement/Docs/configuration.png trunk/plugins/MCEReplacement/Docs/configure.html trunk/plugins/MCEReplacement/Docs/different.html trunk/plugins/MCEReplacement/Docs/event.html trunk/plugins/MCEReplacement/Docs/event_mapper.png trunk/plugins/MCEReplacement/Docs/external_channel.png trunk/plugins/MCEReplacement/Docs/external_program.png trunk/plugins/MCEReplacement/Docs/ffdshow_control.png trunk/plugins/MCEReplacement/Docs/goto_screen.PNG trunk/plugins/MCEReplacement/Docs/index.html trunk/plugins/MCEReplacement/Docs/install.html trunk/plugins/MCEReplacement/Docs/introduction.html trunk/plugins/MCEReplacement/Docs/ir_commands.png trunk/plugins/MCEReplacement/Docs/issues.html trunk/plugins/MCEReplacement/Docs/keystrokes.html trunk/plugins/MCEReplacement/Docs/keystrokes.png trunk/plugins/MCEReplacement/Docs/learn_ir.png trunk/plugins/MCEReplacement/Docs/macro_editor.png trunk/plugins/MCEReplacement/Docs/macros.png trunk/plugins/MCEReplacement/Docs/map_different.png trunk/plugins/MCEReplacement/Docs/mapping.png trunk/plugins/MCEReplacement/Docs/message.html trunk/plugins/MCEReplacement/Docs/message_command.png trunk/plugins/MCEReplacement/Docs/mouse.html trunk/plugins/MCEReplacement/Docs/mouse_mode.png trunk/plugins/MCEReplacement/Docs/multi.html trunk/plugins/MCEReplacement/Docs/multi_mapping.png trunk/plugins/MCEReplacement/Docs/new.html trunk/plugins/MCEReplacement/Docs/new_button.png trunk/plugins/MCEReplacement/Docs/new_multi_mapping.png trunk/plugins/MCEReplacement/Docs/notes.html trunk/plugins/MCEReplacement/Docs/pause_time.png trunk/plugins/MCEReplacement/Docs/pronto.html trunk/plugins/MCEReplacement/Docs/removal.html trunk/plugins/MCEReplacement/Docs/serial_command.png trunk/plugins/MCEReplacement/Docs/stb.html trunk/plugins/MCEReplacement/Docs/tray.html trunk/plugins/MCEReplacement/InputMapping/ trunk/plugins/MCEReplacement/InputMapping/MCE Replacement.xml trunk/plugins/MCEReplacement/MCE Replacement Plugin.nsi trunk/plugins/MCEReplacement/MessageMode/ trunk/plugins/MCEReplacement/MessageMode/MCE Replacement (original driver).hip trunk/plugins/MCEReplacement/MessageMode/MCE Replacement (replacement driver).hip trunk/plugins/MCEReplacement/MessageMode/MCE Replacement.gir Modified: trunk/plugins/IR Server Suite/IR Server Suite.nsi =================================================================== --- trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-11-27 15:53:02 UTC (rev 1092) +++ trunk/plugins/IR Server Suite/IR Server Suite.nsi 2007-11-27 16:00:51 UTC (rev 1093) @@ -18,12 +18,15 @@ ; Registry key to check for directory (so if you install again, it will overwrite the old one automatically) InstallDirRegKey HKLM "Software\IR Server Suite" "Install_Dir" -; Show the installation steps to the user +; Show the installation/uninstallation steps to the user ShowInstDetails show +ShowUninstDetails show ; Set the compression method SetCompressor /SOLID /FINAL lzma +SetDateSave on + XPStyle on !include "x64.nsh" Added: trunk/plugins/MCEReplacement/AppData/DifferentRemote.xml =================================================================== --- trunk/plugins/MCEReplacement/AppData/DifferentRemote.xml (rev 0) +++ trunk/plugins/MCEReplacement/AppData/DifferentRemote.xml 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,115 @@ +<?xml version="1.0" encoding="utf-8"?> +<profile> + <section name="MCEReplacement"> + <entry name="NumPad0"> + </entry> + <entry name="NumPad1"> + </entry> + <entry name="NumPad2"> + </entry> + <entry name="NumPad3"> + </entry> + <entry name="NumPad4"> + </entry> + <entry name="NumPad5"> + </entry> + <entry name="NumPad6"> + </entry> + <entry name="NumPad7"> + </entry> + <entry name="NumPad8"> + </entry> + <entry name="NumPad9"> + </entry> + <entry name="Clear"> + </entry> + <entry name="Enter"> + </entry> + <entry name="Power2"> + </entry> + <entry name="Start"> + </entry> + <entry name="Mute"> + </entry> + <entry name="Info"> + </entry> + <entry name="VolumeUp"> + </entry> + <entry name="VolumeDown"> + </entry> + <entry name="ChannelUp"> + </entry> + <entry name="ChannelDown"> + </entry> + <entry name="Forward"> + </entry> + <entry name="Rewind"> + </entry> + <entry name="Play"> + </entry> + <entry name="Record"> + </entry> + <entry name="Pause"> + </entry> + <entry name="Stop"> + </entry> + <entry name="Skip"> + </entry> + <entry name="Replay"> + </entry> + <entry name="OemGate"> + </entry> + <entry name="Oem8"> + </entry> + <entry name="Up"> + </entry> + <entry name="Down"> + </entry> + <entry name="Left"> + </entry> + <entry name="Right"> + </entry> + <entry name="Ok"> + </entry> + <entry name="Back"> + </entry> + <entry name="DVDMenu"> + </entry> + <entry name="LiveTV"> + </entry> + <entry name="Guide"> + </entry> + <entry name="AspectRatio"> + </entry> + <entry name="MyTV"> + </entry> + <entry name="MyMusic"> + </entry> + <entry name="RecordedTV"> + </entry> + <entry name="MyPictures"> + </entry> + <entry name="MyVideos"> + </entry> + <entry name="Print"> + </entry> + <entry name="MyRadio"> + </entry> + <entry name="Teletext"> + </entry> + <entry name="Red"> + </entry> + <entry name="Green"> + </entry> + <entry name="Yellow"> + </entry> + <entry name="Blue"> + </entry> + <entry name="PowerTV"> + </entry> + <entry name="Messenger"> + </entry> + <entry name="Power1"> + </entry> + </section> +</profile> \ No newline at end of file Added: trunk/plugins/MCEReplacement/AppData/EventMapping.xml =================================================================== --- trunk/plugins/MCEReplacement/AppData/EventMapping.xml (rev 0) +++ trunk/plugins/MCEReplacement/AppData/EventMapping.xml 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<events /> \ No newline at end of file Added: trunk/plugins/MCEReplacement/AppData/MCERemote.xml =================================================================== --- trunk/plugins/MCEReplacement/AppData/MCERemote.xml (rev 0) +++ trunk/plugins/MCEReplacement/AppData/MCERemote.xml 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<profile> + <section name="MCEReplacement"> + <entry name="PowerTV">31642</entry> + <entry name="Blue">31649</entry> + <entry name="Yellow">31650</entry> + <entry name="Green">31651</entry> + <entry name="Red">31652</entry> + <entry name="Teletext">31653</entry> + <entry name="MyRadio">31663</entry> + <entry name="Print">31665</entry> + <entry name="MyVideos">31669</entry> + <entry name="MyPictures">31670</entry> + <entry name="RecordedTV">31671</entry> + <entry name="MyMusic">31672</entry> + <entry name="MyTV">31673</entry> + <entry name="AspectRatio">31704</entry> + <entry name="Guide">31705</entry> + <entry name="LiveTV">31706</entry> + <entry name="DVDMenu">31707</entry> + <entry name="Back">31708</entry> + <entry name="Ok">31709</entry> + <entry name="Right">31710</entry> + <entry name="Left">31711</entry> + <entry name="Down">31712</entry> + <entry name="Up">31713</entry> + <entry name="Oem8">31714</entry> + <entry name="OemGate">31715</entry> + <entry name="Replay">31716</entry> + <entry name="Skip">31717</entry> + <entry name="Stop">31718</entry> + <entry name="Pause">31719</entry> + <entry name="Record">31720</entry> + <entry name="Play">31721</entry> + <entry name="Rewind">31722</entry> + <entry name="Forward">31723</entry> + <entry name="ChannelDown">31724</entry> + <entry name="ChannelUp">31725</entry> + <entry name="VolumeDown">31726</entry> + <entry name="VolumeUp">31727</entry> + <entry name="Info">31728</entry> + <entry name="Mute">31729</entry> + <entry name="Start">31730</entry> + <entry name="Power1"> + </entry> + <entry name="Power2">31731</entry> + <entry name="Enter">31732</entry> + <entry name="Clear">31733</entry> + <entry name="NumPad9">31734</entry> + <entry name="NumPad8">31735</entry> + <entry name="NumPad7">31736</entry> + <entry name="NumPad6">31737</entry> + <entry name="NumPad5">31738</entry> + <entry name="NumPad4">31739</entry> + <entry name="NumPad3">31740</entry> + <entry name="NumPad2">31741</entry> + <entry name="NumPad1">31742</entry> + <entry name="NumPad0">31743</entry> + </section> +</profile> \ No newline at end of file Added: trunk/plugins/MCEReplacement/AppData/MultiMapping.xml =================================================================== --- trunk/plugins/MCEReplacement/AppData/MultiMapping.xml (rev 0) +++ trunk/plugins/MCEReplacement/AppData/MultiMapping.xml 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes"?> +<mappings> + <map name="MCE Replacement" /> +</mappings> \ No newline at end of file Added: trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhc =================================================================== --- trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhc (rev 0) +++ trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhc 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,79 @@ +<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> +<HTML> +<HEAD> +<meta name="GENERATOR" content="Microsoft® HTML Help Workshop 4.1"> +<!-- Sitemap 1.0 --> +</HEAD><BODY> +<OBJECT type="text/site properties"> + <param name="Window Styles" value="0x800025"> +<param name="Font" value="Arial,8,0"> +</OBJECT> +<UL> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="MCE Replacement Plugin"> + <param name="Local" value="index.html"> + </OBJECT> + <UL> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Introduction"> + <param name="Local" value="introduction.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Configuring the Plugin"> + <param name="Local" value="configure.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Installing the Replacement Driver (optional)"> + <param name="Local" value="install.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Replacement Driver removal instructions"> + <param name="Local" value="removal.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is Mouse Mode?"> + <param name="Local" value="mouse.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is Different Remote?"> + <param name="Local" value="different.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is Message Mode?"> + <param name="Local" value="message.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is Multi-Mapping?"> + <param name="Local" value="multi.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is Event Mapper?"> + <param name="Local" value="event.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What is MCE Replacement Tray?"> + <param name="Local" value="tray.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Using Philips Pronto CCF files"> + <param name="Local" value="pronto.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Known Set Top Boxes"> + <param name="Local" value="stb.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="What's new?"> + <param name="Local" value="new.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Known issues"> + <param name="Local" value="issues.html"> + </OBJECT> + <LI> <OBJECT type="text/sitemap"> + <param name="Name" value="Other notes"> + <param name="Local" value="notes.html"> + </OBJECT> + </UL> +</UL> +</BODY></HTML> Added: trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhp =================================================================== --- trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhp (rev 0) +++ trunk/plugins/MCEReplacement/Docs/MCE Replacement Plugin.hhp 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,34 @@ +[OPTIONS] +Auto Index=Yes +Compatibility=1.1 or later +Compiled file=MCE Replacement Plugin.chm +Contents file=MCE Replacement Plugin.hhc +Default Font=Arial,8,0 +Default topic=index.html +Display compile progress=No +Full-text search=Yes +Language=0xc09 English (Australia) +Title=MCE Replacement Plugin + + +[FILES] +configure.html +different.html +event.html +index.html +install.html +introduction.html +issues.html +message.html +multi.html +new.html +notes.html +pronto.html +removal.html +stb.html +tray.html +mouse.html +keystrokes.html + +[INFOTYPES] + Added: trunk/plugins/MCEReplacement/Docs/RemoteButton.txt =================================================================== --- trunk/plugins/MCEReplacement/Docs/RemoteButton.txt (rev 0) +++ trunk/plugins/MCEReplacement/Docs/RemoteButton.txt 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,55 @@ +NumPad0 = 0 +NumPad1 = 1 +NumPad2 = 2 +NumPad3 = 3 +NumPad4 = 4 +NumPad5 = 5 +NumPad6 = 6 +NumPad7 = 7 +NumPad8 = 8 +NumPad9 = 9 +Clear = 10 +Enter = 11 +Power2 = 12 +Start = 13 +Mute = 14 +Info = 15 +VolumeUp = 16 +VolumeDown = 17 +ChannelUp = 18 +ChannelDown = 19 +Forward = 20 +Rewind = 21 +Play = 22 +Record = 23 +Pause = 24 +Stop = 25 +Skip = 26 +Replay = 27 +OemGate = 28 +Oem8 = 29 +Up = 30 +Down = 31 +Left = 32 +Right = 33 +Ok = 34 +Back = 35 +DVDMenu = 36 +LiveTV = 37 +Guide = 38 +AspectRatio = 39 +MyTV = 70 +MyMusic = 71 +RecordedTV = 72 +MyPictures = 73 +MyVideos = 74 +Print = 78 +MyRadio = 80 +Teletext = 90 +Red = 91 +Green = 92 +Yellow = 93 +Blue = 94 +PowerTV = 101 +Messenger = 105 +Power1 = 165 \ No newline at end of file Added: trunk/plugins/MCEReplacement/Docs/configuration.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/configuration.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/configure.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/configure.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/configure.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,217 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>Configuring the Plugin</TITLE> +</HEAD> +<BODY> + +<H2>Configuring the Plugin<BR><HR COLOR="RED"></H2> + +<IMG SRC="configuration.png"><BR> +This is the plugin configuration window.<BR> + +<P><B>Common buttons:</B><BR> +These buttons are located at the bottom of the configuration window no matter what tab you are veiwing.<BR> +<UL> +<LI><B>Map MCE Buttons</B> - Click here to set up mappings for MCE remote button presses. More details below.</LI> +<LI><B>External Channels</B> - Click here to set up mappings for external channel changing. More details below.</LI> +<LI><B>Help</B> - Click here to load this help file.</LI> +<LI><B>OK</B> - Click here to accept any configuration changes and exit.</LI> +<LI><B>Cancel</B> - Click here to cancel any configuration changes and exit.</LI> +</UL> +</P> + +<P><B>Plugin Options:</B><BR> +These settings effect basic plugin operations.<BR> +<UL> +<LI><B>Extended logging</B> - Same as the native MCE remote support. With this enabled there is more detailed logging of the plugins actions inside your MediaPortal log files.</LI> +<LI><B>Require focus</B> - Tell the plugin if you want it to respond to MCE remote button presses only when MediaPortal has focus.</LI> +<LI><B>Tune external channels</B> - Tell the plugin if you want it to act on external channel change events. That is, if you'd like it to blast commands to your set top box.</LI> +<LI><B>Enable MCE remote</B> - Enables the handling of MCE remote control inputs.</LI> +<LI><B>Enable message mode</B> - Message mode let's you use HIP or Girder to pass on button presses that the plugin will map through it's input handler. More information on Message Mode is included in the section <A HREF="message.html">What Is Message Mode?</A></LI> +</UL> +</P> + +<P><B>Blaster Setup:</B><BR> +These settings effect how the MCE blasters operate.<BR> +<UL> +<LI><B>Manufacturer</B> - Set the manufacturer of the MCE remote transceiver unit.</LI> +<LI><B>Blaster port</B> - Set the blaster port on the MCE remote transceiver unit to send IR commands from.</LI> +<LI><B>Speed</B> - Set the blasting speed to either Fast, Medium, Slow or None. None does not specify a speed and relies on the units default. However, if you use a speed setting and then revert to None the IR unit will continue to use the last speed set until it's power is cycled (unplugged/re-plugged in, or the pc is rebooted).</LI> +</UL> +</P> + +<P><B>Time (in milliseconds):</B><BR> +These settings effect times and delays surrounding button presses and learning IR commands.<BR> +<UL> +<LI><B>Learn IR timeout</B> - This is how long you are given to learn an IR command before the receiver times out.</LI> +<LI><B>Button repeat delay</B> - This is how long from once you press a button on the MCE remote to when it will repeatLI +<LI><B>Button held delay</B> - When you press a button on the MCE remote and hold it down this is how long between subsequent repeats.</LI> +</UL> +</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="ir_commands.png"><BR> +<P>In this tab you can teach the plugin all the commands you want to be able to blast back to your equipment. Use NEW, EDIT, DELETE and TEST to learn, re-learn, remove and test IR commands. Double click an IR command to re-learn.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="macros.png"><BR> +<P>In this tab you can set up macros, which are lists of commands to execute. Macros include blasting IR commands, pausing, running external programs, popup messages, jumping to MediaPortal screens, sending serial port commands, simulating keystrokes, and sending window messages to other programs. You can also change the blaster port and blaster speed inside a macro, multiple times if you wish.</P> + +<P>You can map a macro to a button press on your MCE remote, or even as a channel "Select" command for external channel changing. Macros can also contain commands to run other programs. Macros are usefull when you need to blast multiple button presses to your equipment to get the desired results. Use NEW, EDIT, DELETE and TEST to create, modify, remove and test Macros. Double click a macro to edit.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="multi_mapping.png"><BR> +This tab is for setting up "Multi-Mapping".<BR> +<P><B>Mapping change button:</B><BR>This is the button on your remote that will cycle through the different remote button mappings.</P> +<P><B>Mappings:</B><BR>This is where you lay out the different button mappings you want to cycle through. Use the New, Remove, Up, Down, and Edit buttons to place your mappings in the list. The list will cycle through from top to bottom and back to the top when you press the Mapping set change button inside MediaPortal.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="event_mapper.png"><BR> +This tab is for setting up "Event Mapper".<BR> +<P><B>Event List:</B><BR>This list shows events and their associated command.</P> +<P><B>Event:</B><BR>Select an event you want to map and press "Add".</P> +<P><B>Parameter:</B><BR>You can as an option choose to match a message parameter for this event.</P> +<P><B>Value:</B><BR>The value of the parameter to match.</P> +<P><B>Command:</B><BR>After selecting an event in the "Event List" choose a command to map and click "Set".</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="map_different.png"><BR> +This tab is for mapping different remotes to act like an MCE remote.<BR> +<P><B>Button Mappings:</B><BR>This list shows you remote buttons that MediaPortal understands listed on the left and a number representing an IR code on the right.</P> +<P><B>Clear button:</B><BR>This button will clear the IR Code mapping for the currently selected MCE Button.</P> +<P><B>Clear All button:</B><BR>This button will clear all the IR Code mappings.</P> + +<P>To teach remote buttons to the plugin select a button from the "MCE Button" column of the Button Mappings list and then press the button on your remote while pointing it at the MCE receiver. Do this for each additional button you want to map.</P> + +<P>While there is no MCE button selected in the list you can press a button on a remote to test if the plugin will recognise your remote.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="mouse_mode.png"><BR> +This tab is for setting up mouse mode.<BR> +<P><B>Mouse mode toggle button:</B><BR>This is the button on your remote that will toggle Mouse Mode on and off.</P> +<P><B>Mouse step distance:</B><BR>This is the distance the mouse will move for each press of a remote button.</P> + +<P>For more information on Mouse Mode refer to "<A HREF="mouse.html">What is Mouse Mode?</A>"</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="mapping.png"><BR> +This window is for mapping button presses to commands, IR blasting, and macros. It is almost identical to the normal input mapping window used by the MCE remote support that is built in to MediaPortal. The only differences are as follows:<BR> +<P><B>Replacement Driver Buttons:</B><BR>This section in the tree view on the left side of the window has all the new buttons that this plugin enables mapping for if you have installed the replacement MCE remote driver.</P> +<P><B>Action - Blast IR:</B><BR>There is a new action possibility when mapping a button (Blast IR). When the Blast IR radio button is selected you can choose from a drop down list of IR commands you have already taught the plugin as well as any Macros you have defined.</P> +<P><B>Remove Replacement Driver Mappings:</B><BR>Clicking this button will remove any button mappings that are associated with the replacement driver. If you did not install the replacement driver then you will need to remove the default button mappings for it otherwise you will likely experience unexpected double-presses for those buttons.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="learn_ir.png"><BR> +When you create a new IR or re-learn an IR command from the plugin configuration window this window will appear.<BR> +<UL> +<LI>If you're teaching a new IR command, then you will need to specify a name. This name will be used to create a file, so make sure the name supplied doesn't break any of the windows file name conventions. That is, don't use / ? < > \ : * | "</LI> +<LI>Click "Learn" to teach the plugin your IR command. After clicking "Learn" you point your remote at the MCE transceiver and press the button to learn. Follow all the usual procedures for teaching IR commands. That is, avoid direct sunlight on the receiver, stay away from plasma tv's, and turn off any fluerescent lights. All these things can interfere with the InfraRed signals. Place your remote within a couple of centimeters (within an inch) of the receiver to ensure good reception of the signal.</LI> +</UL> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="external_channel.png"><BR> +This window will appear when you click "External Channels"<BR> +<P><B>TV Card Buttons:</B><BR>You can setup each TV card with a different set top box.</P> +<P><B>Quick Setup:</B><BR>Select your set top box from the list of know boxes and click "Set" to get configured quickly. Or select "Clear all" to reset all commands. Please note that all set top box configurations in Quick Setup are untested. If you find an error, please report it. If you have a set top box that is not on the list please send me the details and IR files for inclusion in the next release.</P> +<P><B>Commands:</B><BR>Select the external command you want to map in the list, then the IR command or Macro you want to map to it from the combo box. Then click "Set". You can also map an external program, serial port command, simulated keystrokes or window messages by selecting them in the list and clicking "Set".</P> +<P><B>Options:</B><BR> +<UL> +<LI>Wait between digits - Select this to put a pause between each digit IR blasting. (Recommended)</LI> +<LI>Wait x milliseconds - This is how long to wait between each digit IR blasting. There are 1000 milliseconds in a second. (default: 500 = one half of a second)</LI> +<LI>Use pre-change command - This option will execute a command before it starts the channel change, this can be used to get your STB out of a menu it might be in, or back to a selection menu if that is needed.</LI> +<LI>Send select command - Select this if your set top box requires a "select" (enter, ok, etc...) button to be pressed after keying in channel numbers, you can also use this to execute a program that requires the whole channel number as a command line paramater.</LI> +<LI>Send select twice - If you have chosen to send a "select" code, this can be used to make it send twice (this is a precaution to ensure the set top box received the command, some set top boxes are more sensitive than others)</LI> +<LI>Ch. Digits - Use this to pad out the channel number with leading 0's. "Simple" leaves the number unchanged, other options will add zero's to the start of the channel number to make up the number of digits.</LI> +<LI>Blaster port - This is the MCE remote transceiver blaster port you wish to control your set top box from. This setting is seperate from the blaster port setting on the main plugin configuration window.</LI> +<LI>Repeat count - Use this to repeat channel change commands as many times as you'd like to decrease the chances of the set top box failing to recognise the blasted commands. 0 = no repeats, it only gets sent once. 1 = 1 repeat, that is a total of two times. etc ...</LI> +<LI>Repeat delay - This is the time to wait between repeating the channel change commands.</LI> +</UL> +</P> +<P><B>Test:</B><BR>Select a channel number and click "Test" to check the setup.</P> +<P><B>Copy from:</B><BR>This lets you copy the configuration for one TV card/STB to another (SVN users only).</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="macro_editor.png"><BR> +This window is for setting up and modifying Macros.<BR> +<P><B>Name:</B><BR>Just as the case is with IR commands, Macros must have a name that conforms to windows file name conventions.</P> +<P><B>Macro:</B><BR>In this group of controls you lay out the order of commands in the macro. The macro is executed from top to bottom. Click Up / Down to move a command within the list. Click Remove to take a command out of the list.</P> +<P><B>Commands:</B><BR>This is a list of available commands, including learned IR commands, "Pause", "Run Program" and "Go To Screen". Either select an IR command you wish to add to the Macro, "Pause" to add a time delay, "Run Program" to setup launching an external program, "Go To Screen" to jump to another window module within MediaPortal, or "Popup Message" to display a popup text message to the user in MediaPortal. Click "Add" to add the selected command to the macro.</P> +<P>You can click Test at any time to test your macro so far. When you are done click OK.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="external_program.png"><BR> +This window is for setting up the "Run" command to launch applications.<BR> +<P><B>Program:</B><BR>Type in the file path to the application you want to run, or select the executable by clicking the "..." button.</P> +<P><B>Start in folder:</B><BR>This is the folder the program will be launched from, this will affect software that then tries to access other files through the use of relative paths. By default, when you select the program executable the plugin will automatically fill in the start folder and you should only need to change this in special circumstances. You will know when.</P> +<P><B>Parameters:</B><BR>Type in any command line parameters you wish to pass to the application. You will need to put in special command line parameters if you are using this program for channel changing on a set top box. If you have set up the program from the External Channel Changing dialog you will see a "?" button to the right of the parameters field. Clicking this button will show a list of special parameters for external channel changing, they are:<BR> +<UL> +<LI>%1 = Current channel number digit (-1 for Select/Pre-Change)</LI> +<LI>%2 = Full channel number string</LI> +<LI>%3 = Blaster port (0 = Both, 1 = Port 1, 2 = Port 2)</LI> +</UL> +</P> +<P><B>Window Style:</B><BR>Choose how the external program should appear, this can be either in a normal window, maximised window, minimised window or hidden.</P> +<P><B>No Window:</B><BR>Set this option to stop the program from creating a window when run.</P> +<P><B>Start using ShellExecute:</B><BR>This option determines if the program should be launched by the "ShellExecute" command. ShellExecute lets you specify non-executable file types, like .txt or .html, or even shell recognised commands like web addresses or "mailto:" commands. These types of commands are then executed using the program that is associated to them. For example, specifying a .html file as the program will launch your default web browser and load that file.</P> +<P><B>Wait for exit:</B><BR>This will make MediaPortal wait until the program has finished before moving on.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="serial_command.png"><BR> +This is the Serial Command configuration window.<BR> +<P><B>Command</B><BR>Enter the command text here, using escape codes for special characters as follows:<BR> +<UL> +<LI>\a = Alert (ascii 7)</LI> +<LI>\b = Backspace (ascii 8)</LI> +<LI>\f = Form Feed (ascii 12)</LI> +<LI>\n = Line Feed (ascii 10)</LI> +<LI>\r = Carriage Return (ascii 13)</LI> +<LI>\t = Tab (ascii 9)</LI> +<LI>\v = Vertical Tab (ascii 11)</LI> +<LI>\x = Hex Value (\x0Fh = ascii char 15, \x8h = ascii char 8)</LI> +<LI>\0 = Null (ascii 0)</LI> +</UL> +You can use normal text inside the command, and if it is for an external channel change there are additional parameters that can be discovered by clicking the "?" button. The above escape codes let you put in special characters that can't be typed. For example, if your STB (or whatever you're connecting) needs the ascii code for escape you would use \x1Bh where 1B (27 decimal) is hex for the ascii code for the escape button.</P> +<P><B>Com port</B><BR>Choose the COM port to use.</P> +<P><B>Baud rate</B><BR>Choose the baud rate to use.</P> +<P><B>Parity</B><BR>Choose the parity to use.</P> +<P><B>Data bits</B><BR>Choose the data bits setting to use.</P> +<P><B>Stop bits</B><BR>Choose the stop bits setting to use.</P> +<P><B>Test</B><BR>Click Test to try your serial command out.</P> + +<P>Click OK to save your Serial Command and return, or Cancel to discard your changes and return.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="message_command.png"><BR> +This window is for setting up and modifying Windows Message commands.<BR> +<P><B>Application:</B><BR>Set this to the full path of the application you want to send Window Messages to. Click the "..." button to locate the application with an "Open File Dialog".</P> +<P><B>Send to active window:</B><BR>With this option selected the Application will be ignored and the Window Message will be sent to the active (foreground) window.</P> +<P><B>Message:</B><BR>Set the message value here, right-click for common options.</P> +<P><B>Word Param:</B><BR>Set the WParam value here.</P> +<P><B>Long Param:</B><BR>Set the LParam value here.</P> + +<P>Click OK to save your Message Command and return, or Cancel to discard your changes and return.</P> + +<HR COLOR="GREEN" SIZE="1"> + +<IMG SRC="keystrokes.png"><BR> +This window is for setting up and modifying Keystroke commands.<BR> +<P>Simply enter the keystroke combinations you'd like to send in the large text box. Click OK to save your Keystroke Command and return, or Cancel to discard your changes and return.</P> + +<P>For more information on simulating special keystrokes, such as ALT, CTRL, Backspace, etc ... <A HREF="keystrokes.html">click here</A></P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/different.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/different.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/different.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,15 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>What is Different Remote?</TITLE> +</HEAD> +<BODY> + +<H2>What is Different Remote?<BR><HR COLOR="RED"></H2> + +<P>The Different Remote feature lets you map a compatible (RC6) remote to act as a surrogate MCE remote, this could be the remote that came with your TV tuner card, a universal or learning remote, or even some spare buttons on a multifunction remote. If the remote uses the RC6 protocol then it should work.</P> + +<P>You assign buttons on your "Different Remote" to simulate a button press on an MCE remote. The mapping that button has on the MCE remote is then executed whenever you press that button on the "Different Remote".</P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/event.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/event.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/event.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,36 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>What is Event Mapper?</TITLE> +</HEAD> +<BODY> + +<H2>What is Event Mapper?<BR><HR COLOR="RED"></H2> + +<P>Event Mapper lets you assign any command the plugin has to events that MediaPortal either generates or listens for. For example, with this feature you can send a command to turn on your tv and set the right input source every time your HTPC comes out of a suspended state. Or you could just use it to make MediaPortal move into the TV module when it starts. There are many possibilities.</P> + +<P><B>Tutorial: Using event mapper to catch MediaPortal on-screen buttons</B><BR> +With the event mapper you can now match a parameter of a GUI Message and only execute the mapping if the message type and parameter match. One of the many things this lets us do is create new buttons in a skin and then have them blast ir codes. Here's a quick example:</P> + +<IMG SRC="new_button.png"><BR> + +<P>Place this code in your skins "myvideos.xml" to add a new button:<BR> +<control><br> +<description>Blast IR</description><br> +<type>button</type><br> +<id>818181</id><br> +<label>818181</label><br> +</control> +</P> + +<P>Place this code in your "strings.xml" to add the label for the button:<BR> +<string><br> +<id>818181</id><br> +<value>Blast IR</value><br> +</string> +</P> + +<P>Now, set up the event mapper to watch for "Clicked" events and match the "Sender Control ID" parameter to "818181". With this in place you will now have a fully programmable button in your skin. It can blast IR, send serial commands, launch external apps, etc ...</P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/event_mapper.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/event_mapper.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/external_channel.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/external_channel.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/external_program.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/external_program.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/ffdshow_control.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/ffdshow_control.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/goto_screen.PNG =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/goto_screen.PNG ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/index.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/index.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/index.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,30 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>MCE Replacement Plugin - v1.0.3.1</TITLE> +</HEAD> +<BODY> +<H1>MCE Replacement Plugin v1.0.3.1<BR><HR COLOR="BLUE"></H1> +A MediaPortal 0.2.2.0 plugin by and-81<BR> + +<H2>Contents<BR><HR COLOR="RED"></H2> +<OL> +<LI><A HREF="introduction.html">Introduction</A></LI> +<LI><A HREF="configure.html">Configuring the Plugin</A></LI> +<LI><A HREF="install.html">Installing the Replacement Driver (optional)</A></LI> +<LI><A HREF="removal.html">Replacement Driver removal instructions</A></LI> +<LI><A HREF="mouse.html">What is Mouse Mode?</A></LI> +<LI><A HREF="different.html">What is Different Remote?</A></LI> +<LI><A HREF="message.html">What is Message Mode?</A></LI> +<LI><A HREF="multi.html">What is Multi-Mapping?</A></LI> +<LI><A HREF="event.html">What is Event Mapper?</A></LI> +<LI><A HREF="tray.html">What is MCE Replacement Tray?</A></LI> +<LI><A HREF="pronto.html">Using Philips Pronto CCF files</A></LI> +<LI><A HREF="stb.html">Known Set Top Boxes</A></LI> +<LI><A HREF="new.html">What's new?</A></LI> +<LI><A HREF="issues.html">Known issues</A></LI> +<LI><A HREF="notes.html">Other notes</A></LI> +</OL> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/install.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/install.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/install.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,23 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>Installing the Replacement Driver (optional)</TITLE> +</HEAD> +<BODY> + +<H2>Installing the Replacement Driver (optional)<BR><HR COLOR="RED"></H2> +<P>The plugin will work with or without the replacement driver. With the replacement driver you get full control over the mapping of buttons. Without the replacement driver you'll get the default system mappings (same as MediaPortal's native MCE support) and you'll need to remove the new replacement driver mappings in the plugin configuration.</P> +<P>Either way, blasting and external channel tuning should work.</P> +<OL> +<LI>Open the windows Control Panel, go to System, and select "Device Manager" from the "Hardware" tab.</LI> +<LI>Under "Universal Serial Bus Controllers" find "eHome Infrared Receiver", right click it and select "Update Driver"</LI> +<LI>When prompted to use Windows Update select "No, not this time"</LI> +<LI>Choose "Install from a list or specific location"</LI> +<LI>Choose "Don't search. I will choose the driver to install"</LI> +<LI>Select "Have Disk" and locate the driver folder (eg. "C:\Program Files\MCE Replacement Driver\")</LI> +<LI>Select the "MCE Infrared Remote Control"</LI> +<LI>From here you may be required to accept the unsigned driver, but apart from that it's all very straight forward.</LI> +</OL> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/introduction.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/introduction.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/introduction.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,31 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>Introduction</TITLE> +</HEAD> +<BODY> + +<H2>Introduction<BR><HR COLOR="RED"></H2> +<P>This plugin serves as a replacement for MediaPortal's built in support for the MCE remote. The reason for developing this plugin was to support a replacement driver for the MCE remote and to add complex IR blasting capabilities to MediaPortal. From those humble beginings the plugin has grown to do a lot more than that.</P> +<P>MCE Replacement Plugin adds support for the replacement MCE remote driver created by Bruno Fleurette (BurningZeRoad). The replacement driver allows you to map all the buttons on the MCE remote. However, you don't need to install the replacement driver to use this plugin.</P> +<P>With the replacement driver the plugin gives you the ability to re-map all the MCE remote buttons, but even without the replacement driver you can assign complex IR blasting sequences to buttons on the MCE remote and give MediaPortal the ability to control your set top box to tune external channels.</P> +<P>It's also able to receive remote control commands while MediaPortal is out of focus or even minimized. And you can map any programmable universal remote (and some other remotes) to function as if it is the MCE remote.</P> +<P>So even without the replacement driver it offers improvements over the native MCE remote handling.</P> +<P>So what exactly can this plugin do? +<UL> +<LI>Set complex IR blasting commands to any button on the MCE remote, and the mapping can be context sensitive, this means you can control your surround sound while watching a DVD with the same remote buttons that control your TV set when watching TV.</LI> +<LI>You can re-map buttons that until now have had a fixed function, like the arrows, the PC Power and others.</LI> +<LI>Control your set top box (or boxes) to tune external channels. Use either Infra-Red blasting, external programs, or Serial Port comms. And if your set top box is on the list you can set it up automatically without having to teach the plugin any of your set top box codes.</LI> +<LI>Minimize MediaPortal and still control it, handy for listening to music.</LI> +<LI>Control the mouse across your whole computer with "Mouse Mode".</LI> +<LI>"Different Remote" lets you configure a different (compatible) remote to function as an MCE remote. This means you can configure a programmable universal remote (or even just some spare buttons on another compatible remote) to act as if it was the MCE remote.</LI> +<LI>Map a button on your remote to launch an external program.</LI> +<LI>Send Windows Messages to other running programs.</LI> +<LI>Send simulated Keystrokes.</LI> +<LI>"Message Mode" lets you use HIP or Girder to send commands to MediaPortal, the plugin will make MediaPortal think it was receiving the actual remote button presses itself. This means you can get the same level of control over MediaPortal as you would if you were using the native MCE remote support while still being able to use HIP or Girder for all your other remote control needs.</LI> +<LI>"Multi-Mapping" lets you cycle through multiple sets of button mappings, effectively giving you an unlimitted number of buttons on your remote.</LI> +<LI>"Event Mapper" can assign an IR code or macro to a MediaPortal event. For example, you could have have it turn on your tv and enter the tv module when it starts or resumes from standby and turn it off again when it shuts down or goes into standby. You can even create new buttons in a skin and map them to any of the functions this plugin provides.</LI> +</UL></P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/ir_commands.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/ir_commands.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/issues.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/issues.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/issues.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,23 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>Known issues</TITLE> +</HEAD> +<BODY> + +<H2>Known issues<BR><HR COLOR="RED"></H2> + +<P>Some MCE Transceivers will only work with Blaster Port 2, if you're having problems then check. UPDATE! If you are experiencing this problem then please try changing your Blaster Manufacturer setting to SMK.</P> + +<P>When you try to learn a new IR command it will sometimes come back with "Learned IR" even though you haven't pressed a button yet. This is sometimes caused by environmental interferance, for example, overhead lighting and plasma screens can confuse the IR learning process. Use the test button to make sure codes have been learned correctly.</P> + +<P>When using the replacement driver the remote will not bring the computer out of S4 Hibernate. It will bring the computer out of S3 Standby though.</P> + +<P>Not all remotes can be used as a "different" MCE remote. This can be easily tested by entering the "Map Different Remote" configuration screen and pressing buttons on the remote you want to use as a "different remote". If the MCE receiver recognises the button presses you will see "Received: xxxx" in the text box at the bottom of the window where xxxx is a number representing the button pressed. It is my understanding that only remotes that conform to the RC6 protocol can be used as compatible remotes.</P> + +<P>The MceIrApi developed by Bruno Fleurette does not allow multiple instances of the MceIr.dll to access the driver at the same time. This means that two plugins (or programs) cannot share the MceIrApi's connection to the driver. For example, If you run my TV Server plugin (TV3 MCE Blaster) on the same PC that is running the MediaPortal client with this plugin the two will conflict with each other. I'm working on a number of ways to overcome this problem but it seems it is a limitiation of the driver (not Bruno's code). Update: I have a working solution that also allows the sharing of one MCE remote transceiver over a LAN. I'm still testing and improving it, but I'll release something in the next month or so for testing by the community.</P> + +<P>Mouse Mode only works on the Primary screen. I'm looking at ways to improve this so it supports moving the mouse across all monitors and should have a solution soon.</P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/keystrokes.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/keystrokes.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/keystrokes.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,74 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>Simulating Keystrokes</TITLE> +</HEAD> +<BODY> + +<H2>Simulating Keystrokes<BR><HR COLOR="RED"></H2> + +<P>To specify characters that aren't displayed when you press a key, such as ENTER or TAB, and keys that represent actions rather than characters, use the codes in the following table.</P> + +<TABLE BORDER="0"> +<TR><TD><B>Key</B></TD><TD><B>Code</B></TD></TR> +<TR><TD>BACKSPACE</TD><TD>{BACKSPACE}, {BS}, or {BKSP}</TD></TR> +<TR><TD>BREAK</TD><TD>{BREAK}</TD></TR> +<TR><TD>CAPS LOCK</TD><TD>{CAPSLOCK}</TD></TR> +<TR><TD>DEL or DELETE</TD><TD>{DELETE} or {DEL}</TD></TR> +<TR><TD>DOWN ARROW</TD><TD>{DOWN}</TD></TR> +<TR><TD>END</TD><TD>{END}</TD></TR> +<TR><TD>ENTER</TD><TD>{ENTER} or ~</TD></TR> +<TR><TD>ESC</TD><TD>{ESC}</TD></TR> +<TR><TD>HELP</TD><TD>{HELP}</TD></TR> +<TR><TD>HOME</TD><TD>{HOME}</TD></TR> +<TR><TD>INS or INSERT</TD><TD>{INSERT} or {INS}</TD></TR> +<TR><TD>LEFT ARROW</TD><TD>{LEFT}</TD></TR> +<TR><TD>NUM LOCK</TD><TD>{NUMLOCK}</TD></TR> +<TR><TD>PAGE DOWN</TD><TD>{PGDN}</TD></TR> +<TR><TD>PAGE UP</TD><TD>{PGUP}</TD></TR> +<TR><TD>PRINT SCREEN</TD><TD>{PRTSC} (reserved for future use)</TD></TR> +<TR><TD>RIGHT ARROW</TD><TD>{RIGHT}</TD></TR> +<TR><TD>SCROLL LOCK</TD><TD>{SCROLLLOCK}</TD></TR> +<TR><TD>TAB</TD><TD>{TAB}</TD></TR> +<TR><TD>UP ARROW</TD><TD>{UP}</TD></TR> +<TR><TD>F1</TD><TD>{F1}</TD></TR> +<TR><TD>F2</TD><TD>{F2}</TD></TR> +<TR><TD>F3</TD><TD>{F3}</TD></TR> +<TR><TD>F4</TD><TD>{F4}</TD></TR> +<TR><TD>F5</TD><TD>{F5}</TD></TR> +<TR><TD>F6</TD><TD>{F6}</TD></TR> +<TR><TD>F7</TD><TD>{F7}</TD></TR> +<TR><TD>F8</TD><TD>{F8}</TD></TR> +<TR><TD>F9</TD><TD>{F9}</TD></TR> +<TR><TD>F10</TD><TD>{F10}</TD></TR> +<TR><TD>F11</TD><TD>{F11}</TD></TR> +<TR><TD>F12</TD><TD>{F12}</TD></TR> +<TR><TD>F13</TD><TD>{F13}</TD></TR> +<TR><TD>F14</TD><TD>{F14}</TD></TR> +<TR><TD>F15</TD><TD>{F15}</TD></TR> +<TR><TD>F16</TD><TD>{F16}</TD></TR> +<TR><TD>Keypad add</TD><TD>{ADD}</TD></TR> +<TR><TD>Keypad subtract</TD><TD>{SUBTRACT}</TD></TR> +<TR><TD>Keypad multiply</TD><TD>{MULTIPLY}</TD></TR> +<TR><TD>Keypad divide</TD><TD>{DIVIDE}</TD></TR> +</TABLE> + +<P>To specify keys combined with any combination of the SHIFT, CTRL, and ALT keys, precede the key code with one or more of the following codes.</P> + +<TABLE BORDER="0"> +<TR><TD><B>Key</B></TD><TD><B>Code</B></TD></TR> +<TR><TD>SHIFT</TD><TD>+</TD></TR> +<TR><TD>CTRL</TD><TD>^</TD></TR> +<TR><TD>ALT</TD><TD>%</TD></TR> +</TABLE> + +<P>To specify that any combination of SHIFT, CTRL, and ALT should be held down while several other keys are pressed, enclose the code for those keys in parentheses. For example, to specify to hold down SHIFT while E and C are pressed, use "+(EC)". To specify to hold down SHIFT while E is pressed, followed by C without SHIFT, use "+EC".</P> + +<P>To specify repeating keys, use the form {key number}. You must put a space between key and number. For example, {LEFT 42} means press the LEFT ARROW key 42 times; {h 10} means press H 10 times.</P> + +<P>The plus sign (+), caret (^), percent sign (%), tilde (~), and parentheses () have special meanings. To specify one of these characters, enclose it within braces ({}). For example, to specify the plus sign, use "{+}". To specify brace characters, use "{{}" and "{}}". Brackets ([ ]) have no special meaning, but you must enclose them in braces also.</P> + +<P>The information in this document was taken from <A HREF="http://msdn2.microsoft.com/en-us/library/system.windows.forms.sendkeys.aspx">http://msdn2.microsoft.com/en-us/library/system.windows.forms.sendkeys.aspx</A></P> + +</BODY> +</HTML> \ No newline at end of file Added: trunk/plugins/MCEReplacement/Docs/keystrokes.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/keystrokes.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/learn_ir.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/learn_ir.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/macro_editor.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/macro_editor.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/macros.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/macros.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/map_different.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/map_different.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/mapping.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/mapping.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/message.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/message.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/message.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,35 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>What is Message Mode?</TITLE> +</HEAD> +<BODY> + +<H2>What is Message Mode?<BR><HR COLOR="RED"></H2> + +<P>Message mode lets HIP and Girder users get the same level of control in MediaPortal that people using native remote control support have always enjoyed. Most people continue to use HIP/Girder because they have other programs on thier PC they want to control with a remote, in the past they have had to map remote buttons to key presses in MediaPortal. But with Message Mode you can now post messages to the plugin so that MediaPortal thinks it's receiving button presses straight from the remote itself. This means you get the context sensitive mapping that MediaPortal allows as well as all the extra functions this plugin provides.</P> + +<P>By using HIP or Girder you can now map ANY remote or alternate input method that is recognised by either of those programs to appear to MediaPortal as if it was an MCE remote. Through this plugin you can continue to control other applications on your PC, but with the added bonus of getting native style remote support inside MediaPortal.</P> + +<P>There are configuration files for HIP and Girder included (in "C:\Documents and Settings\All Users\Application Data\MediaPortal MCE Replacement Plugin\" or the equivalent folder on your PC) that will get you started.</P> + +<P><B>So how does it work?</B><BR> +Simple, HIP or Girder recieve a button press and then posts a message to MediaPortal in the following format:<BR> +Message: 32768 Decimal or 8000 Hex (this is the WM_APP value)<BR> +WParam: 24 Decimal or 18 Hex (24 is my lucky number, there's no other reason)<BR> +LParam: xxx (Where xxx is the RemoteButton enumeration value of the equivalent MCE remote button, see below for more details)<BR> +<BR> +The plugin listens for messages that meet the Message and WParam values, it then passes the LParam straight into its input handler which processes the input just like a nativly supported MCE remote button press.<BR> +<BR> +Told you it was simple!</P> + +<P><B>Notes</B> +<UL> +<LI>When in Message Mode the plugin no longer listens for MCE remote or "different remote" buttons, it only responds to posted messages. This is so it will not interfere with HIP or Girder.</LI> +<LI>Values for the LParam of posted messages can be found in the included <A HREF="RemoteButton.txt">RemoteButton.txt</A> file.</LI> +<LI>There is no MCE remote button attributed to three values in the supplied HIP configuration file, they are: AspectRatio, Messenger, and Power1. I don't know the MCE remote code for these buttons so I haven't included them. When I know I will update the configuration file, until then you can set them yourself.</LI> +<LI>If this is the only part of the plugin that interests you then you should just download and use my Message Plugin. Find it <A HREF="http://www.team-mediaportal.com/files/Download/Plugins/Input/MessagePlugin/">here</A>.</LI> +</UL></P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/message_command.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/message_command.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MCEReplacement/Docs/mouse.html =================================================================== --- trunk/plugins/MCEReplacement/Docs/mouse.html (rev 0) +++ trunk/plugins/MCEReplacement/Docs/mouse.html 2007-11-27 16:00:51 UTC (rev 1093) @@ -0,0 +1,26 @@ +<HTML> +<HEAD> + <META NAME="author" CONTENT="and-81"> + <TITLE>What is Mouse Mode?</TITLE> +</HEAD> +<BODY> + +<H2>What is Mouse Mode?<BR><HR COLOR="RED"></H2> + +<P>Mouse Mode feature lets you use your remote control to move and click with your mouse. Not only does this let you control MediaPortal with the mouse, but it also lets you control other windows applications with the mouse while MediaPortal is running. This means you now have full mouse control from your remote control.</P> + +<P>With Mouse Mode enabled you set up a remote button to toggle the function on and off. While mouse mode is on all other remote functions are ignored. Mouse Mode is really only usable in conjunction with the replacement driver. It is highly recommended that you use the replacement driver.</P> + +<P>With Mouse Mode activated the remote control has the following functions:<BR> +<UL> +<LI>Up, Down, Left and Right buttons control mouse movement in user-defined steps. Holding a direction button down will apply acceleration to the mouse's movement.</LI> +<LI>Replay, Play, and Skip buttons simulate a left, middle, or right mouse button clicks respectively.</LI> +<LI>OK button simulates a left mouse button double-click.</LI> +<LI>Back, Stop, and More buttons simulate holding down a left, middle, or right mouse button respectively until the button is pressed again to release the mouse button.</LI> +<LI>Channel Up/Down simulates the mouse scroll wheel.</LI> +<LI>All other buttons are passed through to the normal input handling routines, including different remote and multi-mapping handling.</LI> +</UL> +</P> + +</BODY> +</HTML> Added: trunk/plugins/MCEReplacement/Docs/mouse_mode.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MCEReplacement/Docs/mouse_mode.png ___________________________________________________________________ ... [truncated message content] |
From: <an...@us...> - 2007-11-27 15:53:10
|
Revision: 1092 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1092&view=rev Author: and-81 Date: 2007-11-27 07:53:02 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs trunk/plugins/MCEReplacement/Forms/MacroEditor.cs trunk/plugins/MCEReplacement/Forms/SetupForm.cs trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs trunk/plugins/MCEReplacement/MCEReplacement.cs Modified: trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs 2007-11-27 15:50:44 UTC (rev 1091) +++ trunk/plugins/MCEReplacement/Forms/ExternalChannels.cs 2007-11-27 15:53:02 UTC (rev 1092) @@ -153,7 +153,7 @@ else if (setup.PreChangeCommand.StartsWith(Common.CmdPrefixSerial)) ProcessSerialCommand(setup.PreChangeCommand.Substring(Common.CmdPrefixSerial.Length), -1, channel); else - MCEReplacement.ProcessCommand(setup.PreChangeCommand); + MCEReplacement.ProcessCommand(setup.PreChangeCommand, false); if (setup.PauseTime > 0) Thread.Sleep(setup.PauseTime); @@ -171,7 +171,7 @@ else if (command.StartsWith(Common.CmdPrefixSerial)) ProcessSerialCommand(command.Substring(Common.CmdPrefixSerial.Length), charVal, channel); else - MCEReplacement.ProcessCommand(command); + MCEReplacement.ProcessCommand(command, false); if (setup.PauseTime > 0) Thread.Sleep(setup.PauseTime); @@ -206,14 +206,14 @@ } else { - MCEReplacement.ProcessCommand(setup.SelectCommand); + MCEReplacement.ProcessCommand(setup.SelectCommand, false); if (setup.DoubleChannelSelect) { if (setup.PauseTime > 0) Thread.Sleep(setup.PauseTime); - MCEReplacement.ProcessCommand(setup.SelectCommand); + MCEReplacement.ProcessCommand(setup.SelectCommand, false); } } } Modified: trunk/plugins/MCEReplacement/Forms/MacroEditor.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-11-27 15:50:44 UTC (rev 1091) +++ trunk/plugins/MCEReplacement/Forms/MacroEditor.cs 2007-11-27 15:53:02 UTC (rev 1092) @@ -543,7 +543,7 @@ try { - MCEReplacement.ProcessMacro(fileName); + MCEReplacement.ProcessCommand(Common.CmdPrefixMacro + name, false); } catch (Exception ex) { Modified: trunk/plugins/MCEReplacement/Forms/SetupForm.cs =================================================================== --- trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-11-27 15:50:44 UTC (rev 1091) +++ trunk/plugins/MCEReplacement/Forms/SetupForm.cs 2007-11-27 15:53:02 UTC (rev 1092) @@ -440,9 +440,7 @@ try { - string fileName = MCEReplacement.MacroFolder + listViewMacro.SelectedItems[0].Text + Common.FileExtensionMacro; - - MCEReplacement.ProcessMacro(fileName); + MCEReplacement.ProcessCommand(Common.CmdPrefixMacro + listViewMacro.SelectedItems[0].Text, false); } catch (Exception ex) { Modified: trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs =================================================================== --- trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-11-27 15:50:44 UTC (rev 1091) +++ trunk/plugins/MCEReplacement/InputMapper/InputHandler.cs 2007-11-27 15:53:02 UTC (rev 1092) @@ -413,7 +413,7 @@ } break; case "BLAST": - MCEReplacement.ProcessCommand(map.CmdProperty); + MCEReplacement.ProcessCommand(map.CmdProperty, true); break; default: return false; Modified: trunk/plugins/MCEReplacement/MCEReplacement.cs =================================================================== --- trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-11-27 15:50:44 UTC (rev 1091) +++ trunk/plugins/MCEReplacement/MCEReplacement.cs 2007-11-27 15:53:02 UTC (rev 1092) @@ -108,7 +108,7 @@ static int[] _mceRemoteMap; static int[] _differentRemoteMap; - static List<string> _macroStack; + static Hashtable _macroStacks; #endregion Variables @@ -340,6 +340,9 @@ Log.Info("MCEReplacement: Starting ({0})", PluginVersion); + // Hashtable for storing active macro stacks in. + _macroStacks = new Hashtable(); + // Load basic settings LoadSettings(); @@ -1137,7 +1140,7 @@ try { - ProcessCommand(mappedEvent.Command); + ProcessCommand(mappedEvent.Command, false); } catch (Exception ex) { @@ -1165,7 +1168,7 @@ try { - ProcessCommand(mappedEvent.Command); + ProcessCommand(mappedEvent.Command, false); } catch (Exception ex) { @@ -1241,7 +1244,7 @@ else if (command.StartsWith(Common.CmdPrefixSerial)) ProcessExternalSerialCommand(command.Substring(Common.CmdPrefixSerial.Length), -1, channel.ToString()); else - ProcessCommand(command); + ProcessCommand(command, false); if (config.PauseTime > 0) Thread.Sleep(config.PauseTime); @@ -1260,7 +1263,7 @@ else if (command.StartsWith(Common.CmdPrefixSerial)) ProcessExternalSerialCommand(command.Substring(Common.CmdPrefixSerial.Length), charVal, channel.ToString()); else - ProcessCommand(command); + ProcessCommand(command, false); if (config.PauseTime > 0) Thread.Sleep(config.PauseTime); @@ -1298,14 +1301,14 @@ } else { - ProcessCommand(command); + ProcessCommand(command, false); if (config.DoubleChannelSelect) { if (config.PauseTime > 0) Thread.Sleep(config.PauseTime); - ProcessCommand(command); + ProcessCommand(command, false); } } } @@ -1416,118 +1419,199 @@ MapEvent(MappedEvent.MappingEvent.PC_Resume); } - static void Hibernate() + /// <summary> + /// Learn an IR command. + /// </summary> + /// <param name="fileName">File to place learned IR command in (absolute path).</param> + /// <returns>true if successful, otherwise false.</returns> + internal static IRServerPluginInterface.LearnStatus LearnIR(string fileName) { - if (InConfiguration) - return; + IRServerPluginInterface.LearnStatus status = IRServerPluginInterface.LearnStatus.Failure; - GUIGraphicsContext.ResetLastActivity(); - // Stop all media before hibernating - g_Player.Stop(); + try + { + byte[] data; + status = _mceTransceiver.Learn(out data); - GUIMessage msg; + if (status == IRServerPluginInterface.LearnStatus.Success) + { + if (data == null || data.Length == 0) + throw new ApplicationException("No data learned"); - if (_mpBasicHome) - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); - else - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); + using (FileStream file = File.Create(fileName)) + file.Write(data, 0, data.Length); + } + } + catch (Exception ex) + { + Log.Error("MCEReplacement: LearnIRCommand() {0}", ex.ToString()); + } - GUIWindowManager.SendThreadMessage(msg); - - OnSuspend(); - WindowsController.ExitWindows(RestartOptions.Hibernate, false); + return status; } - static void Standby() + /// <summary> + /// Blast an IR command. + /// </summary> + /// <param name="fileName">File to blast (absolute path).</param> + /// <param name="port">Port to blast to.</param> + internal static void BlastIR(string fileName, string port) { - if (InConfiguration) - return; + try + { + using (FileStream file = File.OpenRead(fileName)) + { + if (file.Length == 0) + { + Log.Error("MCEReplacement: IR file \"{0}\" has no data, possible IR learn failure", fileName); + return; + } - GUIGraphicsContext.ResetLastActivity(); - // Stop all media before suspending - g_Player.Stop(); + byte[] bytes = new byte[file.Length]; + file.Read(bytes, 0, (int)file.Length); - GUIMessage msg; + if (_mceTransceiver.Transmit(port, bytes)) + { + if (LogVerbose) + Log.Info("MCEReplacement: Blast successful"); - if (_mpBasicHome) - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_SECOND_HOME, 0, null); - else - msg = new GUIMessage(GUIMessage.MessageType.GUI_MSG_GOTO_WINDOW, 0, 0, 0, (int)GUIWindow.Window.WINDOW_HOME, 0, null); + return; + } + } + } + catch (Exception ex) + { + Log.Error("MCEReplacement: BlastIR() {0}", ex.ToString()); + } - GUIWindowManager.SendThreadMessage(msg); - - OnSuspend(); - WindowsController.ExitWindows(RestartOptions.Suspend, false); + Log.Error("MCEReplacement: Failed to blast IR file \"{0}\"", fileName); } - static void Reboot() - { - if (!InConfiguration) - GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_SHUTDOWN, 0, 0)); - } - - static void ShutDown() - { - if (!InConfiguration) - GUIGraphicsContext.OnAction(new Action(Action.ActionType.ACTION_REBOOT, 0, 0)); - } - /// <summary> - /// Adds to the Macro Stack. + /// Given a command this method processes the request accordingly. /// </summary> - /// <param name="fileName">Name of the macro file.</param> - static void MacroStackAdd(string fileName) + /// <param name="command">Command to process.</param> + /// <param name="async">Process command asynchronously?</param> + internal static void ProcessCommand(string command, bool async) { - string upperCasedFileName = fileName.ToUpperInvariant(); + if (String.IsNullOrEmpty(command)) + throw new ArgumentNullException("command"); - if (_macroStack == null) + if (async) { - _macroStack = new List<string>(); + Thread newThread = new Thread(new ParameterizedThreadStart(ProcCommand)); + newThread.Name = "ProcessCommand"; + newThread.Priority = ThreadPriority.BelowNormal; + newThread.Start(command); } - else if (_macroStack.Contains(upperCasedFileName)) + else { - StringBuilder macroStackTrace = new StringBuilder(); - macroStackTrace.AppendLine("Macro infinite loop detected!"); - macroStackTrace.AppendLine(); - macroStackTrace.AppendLine("Stack trace:"); - - foreach (string macro in _macroStack) - { - if (macro.Equals(upperCasedFileName)) - macroStackTrace.AppendLine(String.Format("--> {0}", macro)); - else - macroStackTrace.AppendLine(macro); - } - - macroStackTrace.AppendLine(String.Format("--> {0}", upperCasedFileName)); - - throw new ApplicationException(macroStackTrace.ToString()); + ProcCommand(command); } + } - _macroStack.Add(upperCasedFileName); - } /// <summary> - /// Removes from the Macro Stack. + /// Used by ProcessCommand to actually handle the command. + /// Can be called Synchronously or as a Parameterized Thread. /// </summary> - /// <param name="fileName">Name of the macro file.</param> - static void MacroStackRemove(string fileName) + /// <param name="commandObj">Command string to process.</param> + static void ProcCommand(object commandObj) { - string upperCasedFileName = fileName.ToUpperInvariant(); + string command = commandObj as string; - if (_macroStack.Contains(upperCasedFileName)) - _macroStack.Remove(upperCasedFileName); - - if (_macroStack.Count == 0) - _macroStack = null; + if (command.StartsWith(Common.CmdPrefixMacro, StringComparison.OrdinalIgnoreCase)) + { + string fileName = MacroFolder + command.Substring(Common.CmdPrefixMacro.Length) + Common.FileExtensionMacro; + ProcMacro(fileName); + } + else if (command.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase)) + { + string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); + BlastIR(IRFolder + commands[0] + Common.FileExtensionIR, commands[1]); + } + else if (command.StartsWith(Common.CmdPrefixSTB, StringComparison.OrdinalIgnoreCase)) + { + string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length)); + BlastIR(STBFolder + commands[0] + Common.FileExtensionIR, commands[1]); + } + else if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase)) + { + string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length)); + Common.ProcessRunCommand(commands); + } + else if (command.StartsWith(Common.CmdPrefixSerial, StringComparison.OrdinalIgnoreCase)) + { + string[] commands = Common.SplitSerialCommand(command.Substring(Common.CmdPrefixSerial.Length)); + Common.ProcessSerialCommand(commands); + } + else if (command.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.OrdinalIgnoreCase)) + { + string[] commands = Common.SplitWindowMessageCommand(command.Substring(Common.CmdPrefixWindowMsg.Length)); + Common.ProcessWindowMessageCommand(commands); + } + else if (command.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase)) + { + string keyCommand = command.Substring(Common.CmdPrefixKeys.Length); + if (InConfiguration) + MessageBox.Show(keyCommand, Common.UITextKeys, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + Common.ProcessKeyCommand(keyCommand); + } + else if (command.StartsWith(Common.CmdPrefixMouse, StringComparison.OrdinalIgnoreCase)) + { + string mouseCommand = command.Substring(Common.CmdPrefixMouse.Length); + Common.ProcessMouseCommand(mouseCommand); + } + else if (command.StartsWith(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase)) + { + string ejectCommand = command.Substring(Common.CmdPrefixEject.Length); + Common.ProcessEjectCommand(ejectCommand); + } + else if (command.StartsWith(Common.CmdPrefixHibernate, StringComparison.OrdinalIgnoreCase)) + { + if (InConfiguration) + MessageBox.Show("Cannot Hibernate in configuration", Common.UITextHibernate, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Hibernate(); + } + else if (command.StartsWith(Common.CmdPrefixReboot, StringComparison.OrdinalIgnoreCase)) + { + if (InConfiguration) + MessageBox.Show("Cannot Reboot in configuration", Common.UITextReboot, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Reboot(); + } + else if (command.StartsWith(Common.CmdPrefixShutdown, StringComparison.OrdinalIgnoreCase)) + { + if (InConfiguration) + MessageBox.Show("Cannot Shutdown in configuration", Common.UITextShutdown, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.ShutDown(); + } + else if (command.StartsWith(Common.CmdPrefixStandby, StringComparison.OrdinalIgnoreCase)) + { + if (InConfiguration) + MessageBox.Show("Cannot enter Standby in configuration", Common.UITextStandby, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Standby(); + } + else if (command.StartsWith(Common.CmdPrefixGoto, StringComparison.OrdinalIgnoreCase)) + { + MPCommon.ProcessGoTo(command.Substring(Common.CmdPrefixGoto.Length), MP_BasicHome); + } + else + { + throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command"); + } } /// <summary> /// Process the supplied Macro file. /// </summary> /// <param name="fileName">Macro file to process (absolute path).</param> - internal static void ProcessMacro(string fileName) + static void ProcMacro(string fileName) { - MacroStackAdd(fileName); + MacroStackAdd(Thread.CurrentThread.ManagedThreadId, fileName); try { @@ -1545,7 +1629,7 @@ { case Common.XmlTagMacro: { - ProcessMacro(MacroFolder + commandProperty + Common.FileExtensionMacro); + ProcMacro(MacroFolder + commandProperty + Common.FileExtensionMacro); break; } @@ -1758,25 +1842,37 @@ case Common.XmlTagStandby: { - Standby(); + if (InConfiguration) + MessageBox.Show("Cannot enter Standby in configuration", Common.UITextStandby, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Standby(); break; } case Common.XmlTagHibernate: { - Hibernate(); + if (InConfiguration) + MessageBox.Show("Cannot Hibernate in configuration", Common.UITextHibernate, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Hibernate(); break; } case Common.XmlTagShutdown: { - ShutDown(); + if (InConfiguration) + MessageBox.Show("Cannot ShutDown in configuration", Common.UITextShutdown, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.ShutDown(); break; } case Common.XmlTagReboot: { - Reboot(); + if (InConfiguration) + MessageBox.Show("Cannot Reboot in configuration", Common.UITextReboot, MessageBoxButtons.OK, MessageBoxIcon.Information); + else + MPCommon.Reboot(); break; } } @@ -1784,161 +1880,81 @@ } finally { - MacroStackRemove(fileName); + MacroStackRemove(Thread.CurrentThread.ManagedThreadId, fileName); } } - + /// <summary> - /// Learn an IR command. + /// Retreives the required Macro Stack from the Hashtable. /// </summary> - /// <param name="fileName">File to place learned IR command in (absolute path).</param> - /// <returns>true if successful, otherwise false.</returns> - internal static IRServerPluginInterface.LearnStatus LearnIR(string fileName) + /// <param name="hash">Hash table lookup value.</param> + /// <returns>Macro Stack.</returns> + static List<string> GetMacroStack(int hash) { - IRServerPluginInterface.LearnStatus status = IRServerPluginInterface.LearnStatus.Failure; - - try + if (_macroStacks.ContainsKey(hash)) { - byte[] data; - status = _mceTransceiver.Learn(out data); - - if (status == IRServerPluginInterface.LearnStatus.Success) - { - if (data == null || data.Length == 0) - throw new ApplicationException("No data learned"); - - using (FileStream file = File.Create(fileName)) - file.Write(data, 0, data.Length); - } + return (List<string>)_macroStacks[hash]; } - catch (Exception ex) + else { - Log.Error("MCEReplacement: LearnIRCommand() {0}", ex.ToString()); + List<string> newStack = new List<string>(); + _macroStacks.Add(hash, newStack); + return newStack; } - - return status; } /// <summary> - /// Blast an IR command. + /// Adds to the Macro Stack. /// </summary> - /// <param name="fileName">File to blast (absolute path).</param> - /// <param name="port">Port to blast to.</param> - internal static void BlastIR(string fileName, string port) + /// <param name="hash">Hash table lookup value.</param> + /// <param name="fileName">Name of the macro file.</param> + static void MacroStackAdd(int hash, string fileName) { - try + List<string> stack = GetMacroStack(hash); + + string upperCasedFileName = fileName.ToUpperInvariant(); + + if (stack.Contains(upperCasedFileName)) { - using (FileStream file = File.OpenRead(fileName)) + StringBuilder macroStackTrace = new StringBuilder(); + macroStackTrace.AppendLine("Macro infinite loop detected!"); + macroStackTrace.AppendLine(); + macroStackTrace.AppendLine("Stack trace:"); + + foreach (string macro in stack) { - if (file.Length == 0) - { - Log.Error("MCEReplacement: IR file \"{0}\" has no data, possible IR learn failure", fileName); - return; - } + if (macro.Equals(upperCasedFileName)) + macroStackTrace.AppendLine(String.Format("--> {0}", macro)); + else + macroStackTrace.AppendLine(macro); + } - byte[] bytes = new byte[file.Length]; - file.Read(bytes, 0, (int)file.Length); + macroStackTrace.AppendLine(String.Format("--> {0}", upperCasedFileName)); - if (_mceTransceiver.Transmit(port, bytes)) - { - if (LogVerbose) - Log.Info("MCEReplacement: Blast successful"); - - return; - } - } + throw new ApplicationException(macroStackTrace.ToString()); } - catch (Exception ex) - { - Log.Error("MCEReplacement: BlastIR() {0}", ex.ToString()); - } - Log.Error("MCEReplacement: Failed to blast IR file \"{0}\"", fileName); + stack.Add(upperCasedFileName); } /// <summary> - /// Given a command this method processes the request accordingly. + /// Removes from the Macro Stack. /// </summary> - /// <param name="command">Command to process.</param> - internal static void ProcessCommand(string command) + /// <param name="hash">Hash table lookup value.</param> + /// <param name="fileName">Name of the macro file.</param> + static void MacroStackRemove(int hash, string fileName) { - if (String.IsNullOrEmpty(command)) - throw new ArgumentNullException("command"); + List<string> stack = GetMacroStack(hash); - if (command.StartsWith(Common.CmdPrefixMacro, StringComparison.OrdinalIgnoreCase)) // Macro - { - string fileName = MacroFolder + command.Substring(Common.CmdPrefixMacro.Length) + Common.FileExtensionMacro; - ProcessMacro(fileName); - } - else if (command.StartsWith(Common.CmdPrefixBlast, StringComparison.OrdinalIgnoreCase)) // IR Code - { - string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixBlast.Length)); - BlastIR(IRFolder + commands[0] + Common.FileExtensionIR, commands[1]); - } - else if (command.StartsWith(Common.CmdPrefixSTB, StringComparison.OrdinalIgnoreCase)) // STB IR Code - { - string[] commands = Common.SplitBlastCommand(command.Substring(Common.CmdPrefixSTB.Length)); - BlastIR(STBFolder + commands[0] + Common.FileExtensionIR, commands[1]); - } - else if (command.StartsWith(Common.CmdPrefixRun, StringComparison.OrdinalIgnoreCase)) // External Program - { - string[] commands = Common.SplitRunCommand(command.Substring(Common.CmdPrefixRun.Length)); - Common.ProcessRunCommand(commands); - } - else if (command.StartsWith(Common.CmdPrefixSerial, StringComparison.OrdinalIgnoreCase)) // Serial Port Command - { - string[] commands = Common.SplitSerialCommand(command.Substring(Common.CmdPrefixSerial.Length)); - Common.ProcessSerialCommand(commands); - } - else if (command.StartsWith(Common.CmdPrefixWindowMsg, StringComparison.OrdinalIgnoreCase)) // Message Command - { - string[] commands = Common.SplitWindowMessageCommand(command.Substring(Common.CmdPrefixWindowMsg.Length)); - Common.ProcessWindowMessageCommand(commands); - } - else if (command.StartsWith(Common.CmdPrefixKeys, StringComparison.OrdinalIgnoreCase)) // Keystroke Command - { - string keyCommand = command.Substring(Common.CmdPrefixKeys.Length); - if (InConfiguration) - MessageBox.Show(keyCommand, Common.UITextKeys, MessageBoxButtons.OK, MessageBoxIcon.Information); - else - Common.ProcessKeyCommand(keyCommand); - } - else if (command.StartsWith(Common.CmdPrefixMouse, StringComparison.OrdinalIgnoreCase)) // Mouse Command - { - string mouseCommand = command.Substring(Common.CmdPrefixMouse.Length); - Common.ProcessMouseCommand(mouseCommand); - } - else if (command.StartsWith(Common.CmdPrefixEject, StringComparison.OrdinalIgnoreCase)) // Eject Command - { - string ejectCommand = command.Substring(Common.CmdPrefixEject.Length); - Common.ProcessEjectCommand(ejectCommand); - } - else if (command.StartsWith(Common.CmdPrefixHibernate, StringComparison.OrdinalIgnoreCase)) // Hibernate Command - { - Hibernate(); - } - else if (command.StartsWith(Common.CmdPrefixReboot, StringComparison.OrdinalIgnoreCase)) // Reboot Command - { - Reboot(); - } - else if (command.StartsWith(Common.CmdPrefixShutdown, StringComparison.OrdinalIgnoreCase)) // Shutdown Command - { - ShutDown(); - } - else if (command.StartsWith(Common.CmdPrefixStandby, StringComparison.OrdinalIgnoreCase)) // Standby Command - { - Standby(); - } - else if (command.StartsWith(Common.CmdPrefixGoto, StringComparison.OrdinalIgnoreCase)) // Go To Screen - { - MPCommon.ProcessGoTo(command.Substring(Common.CmdPrefixGoto.Length), MP_BasicHome); - } - else - { - throw new ArgumentException(String.Format("Cannot process unrecognized command \"{0}\"", command), "command"); - } + string upperCasedFileName = fileName.ToUpperInvariant(); + + if (stack.Contains(upperCasedFileName)) + stack.Remove(upperCasedFileName); + + if (stack.Count == 0) + _macroStacks.Remove(hash); } - + /// <summary> /// Returns a list of IR Commands /// </summary> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2007-11-27 15:50:50
|
Revision: 1091 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1091&view=rev Author: and-81 Date: 2007-11-27 07:50:44 -0800 (Tue, 27 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 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/IR Server.csproj trunk/plugins/IR Server Suite/Applications/IR Server/IRServer.cs trunk/plugins/IR Server Suite/Applications/IR Server/Properties/Resources.Designer.cs trunk/plugins/IR Server Suite/Applications/SageSetup/Sage Setup.csproj trunk/plugins/IR Server Suite/Applications/Translator/CopyDataWM.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/ButtonMappingForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/EditProgramForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MainForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Forms/MenuForm.cs trunk/plugins/IR Server Suite/Applications/Translator/Program.cs trunk/plugins/IR Server Suite/Applications/Translator/ProgramSettings.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/Tray Launcher/Tray.cs trunk/plugins/IR Server Suite/Applications/Virtual Remote/Virtual Remote.csproj trunk/plugins/IR Server Suite/Applications/Virtual Remote Skin Editor/Virtual Remote Skin Editor.csproj trunk/plugins/IR Server Suite/Common/IrssComms/GenericPCQueue.cs trunk/plugins/IR Server Suite/Common/IrssComms/IrssComms.csproj trunk/plugins/IR Server Suite/Common/IrssUtils/Common.cs trunk/plugins/IR Server Suite/Common/IrssUtils/Forms/ExternalProgram.cs trunk/plugins/IR Server Suite/Common/IrssUtils/IrssUtils.csproj trunk/plugins/IR Server Suite/Common/MPUtils/MPCommon.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/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/XBCDRC Receiver/XBCDRC Receiver.cs trunk/plugins/IR Server Suite/Input Service/Input Service/Input Service.csproj trunk/plugins/IR Server Suite/Input Service/Input Service Configuration/Configuration.csproj 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/Forms/SetupForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MP Blast Zone Plugin.csproj trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/MPBlastZonePlugin.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/MacroEditor.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/Forms/SetupForm.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapper/InputHandler.cs trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/MPControlPlugin.cs Added Paths: ----------- trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/ trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/FusionREMOTE Tiger.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/FusionREMOTE.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/FusionREMOTE.xml trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/MCE Dark.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/MCE Gold.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/MCE Grass.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/MCE.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/MCE.xml trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/Xbox Blue Plasma.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/Xbox Orange.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/Xbox.png trunk/plugins/IR Server Suite/Applications/Virtual Remote/Skins/Xbox.xml trunk/plugins/IR Server Suite/Documentation/ trunk/plugins/IR Server Suite/Documentation/Common/ trunk/plugins/IR Server Suite/Documentation/Common/debug_client.png trunk/plugins/IR Server Suite/Documentation/Common/external_program.html trunk/plugins/IR Server Suite/Documentation/Common/external_program.png trunk/plugins/IR Server Suite/Documentation/Common/ffdshow.html trunk/plugins/IR Server Suite/Documentation/Common/ffdshow.png trunk/plugins/IR Server Suite/Documentation/Common/ffdshow_constants.h.txt trunk/plugins/IR Server Suite/Documentation/Common/goto_command.png trunk/plugins/IR Server Suite/Documentation/Common/keystrokes.html trunk/plugins/IR Server Suite/Documentation/Common/keystrokes.png trunk/plugins/IR Server Suite/Documentation/Common/keystrokes_info.html trunk/plugins/IR Server Suite/Documentation/Common/learn_ir.html trunk/plugins/IR Server Suite/Documentation/Common/learn_ir.png trunk/plugins/IR Server Suite/Documentation/Common/macro_editor.html trunk/plugins/IR Server Suite/Documentation/Common/macro_editor.png trunk/plugins/IR Server Suite/Documentation/Common/message_command.html trunk/plugins/IR Server Suite/Documentation/Common/message_command.png trunk/plugins/IR Server Suite/Documentation/Common/pause_command.png trunk/plugins/IR Server Suite/Documentation/Common/serial_command.html trunk/plugins/IR Server Suite/Documentation/Common/serial_command.png trunk/plugins/IR Server Suite/Documentation/Common/set_server.png trunk/plugins/IR Server Suite/Documentation/IR Server/ trunk/plugins/IR Server Suite/Documentation/IR Server/configuration.png trunk/plugins/IR Server Suite/Documentation/IR Server/index.html trunk/plugins/IR Server Suite/Documentation/IR Server Suite.hhc trunk/plugins/IR Server Suite/Documentation/IR Server Suite.hhp trunk/plugins/IR Server Suite/Documentation/Plugins/ trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/ trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/Delete.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/DeleteAll.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/Edit.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/MoveBottom.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/MoveDown.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/MoveTop.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/MoveUp.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/Plus.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/index.html trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/ir_commands.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/macros.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Blast Zone Plugin/menu_setup.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/ trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/event_mapper.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/event_tutorial.html trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/ffdshow_control.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/index.html trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/ir_commands.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/macros.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/mapping.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/mouse_mode.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/multi_mapping.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/new_button.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/new_multi_mapping.png trunk/plugins/IR Server Suite/Documentation/Plugins/MP Control Plugin/remote_controls.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/ trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/configuration.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/external_channel.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/index.html trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/ir_commands.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV2 Blaster Plugin/macros.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/ trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/configuration.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/external_channel.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/index.html trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/ir_commands.png trunk/plugins/IR Server Suite/Documentation/Plugins/TV3 Blaster Plugin/macros.png trunk/plugins/IR Server Suite/Documentation/Plugins/index.html trunk/plugins/IR Server Suite/Documentation/Plugins/stb.html trunk/plugins/IR Server Suite/Documentation/Sage Setup/ trunk/plugins/IR Server Suite/Documentation/Sage Setup/SageSetup.png trunk/plugins/IR Server Suite/Documentation/Translator/ trunk/plugins/IR Server Suite/Documentation/Translator/button_mapping.png trunk/plugins/IR Server Suite/Documentation/Translator/events.png trunk/plugins/IR Server Suite/Documentation/Translator/index.html trunk/plugins/IR Server Suite/Documentation/Translator/ir_commands.png trunk/plugins/IR Server Suite/Documentation/Translator/macros.png trunk/plugins/IR Server Suite/Documentation/Translator/programs.png trunk/plugins/IR Server Suite/Documentation/Tray Launcher/ trunk/plugins/IR Server Suite/Documentation/Tray Launcher/index.html trunk/plugins/IR Server Suite/Documentation/Tray Launcher/setup.png trunk/plugins/IR Server Suite/Documentation/Virtual Remote/ trunk/plugins/IR Server Suite/Documentation/Virtual Remote/Skin Editor/ trunk/plugins/IR Server Suite/Documentation/Virtual Remote/Skin Editor/index.html trunk/plugins/IR Server Suite/Documentation/Virtual Remote/Skin Editor/skin_editor.png trunk/plugins/IR Server Suite/Documentation/Virtual Remote/index.html trunk/plugins/IR Server Suite/Documentation/Virtual Remote/virtual_remote.png trunk/plugins/IR Server Suite/Documentation/ehome_driver.html trunk/plugins/IR Server Suite/Documentation/introduction.html trunk/plugins/IR Server Suite/Documentation/irblast.html trunk/plugins/IR Server Suite/Documentation/new.html trunk/plugins/IR Server Suite/Documentation/pronto.html trunk/plugins/IR Server Suite/IR Server Suite.nsi trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/AppData/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Blast Zone Plugin/AppData/Menu.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/EventMapping.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/MultiMapping.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/FusionREMOTE.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Microsoft MCE (basic).xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Microsoft MCE (full).xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Template.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/Windows Messages.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remote Presets/XBCDRC - Xbox Remote.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/AppData/Remotes.xml trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapping/ trunk/plugins/IR Server Suite/MediaPortal Plugins/MP Control Plugin/InputMapping/MPControlPlugin.xml trunk/plugins/IR Server Suite/Set Top Boxes/ trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/ trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB 3100.xml trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/ trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/ADB ABQ-1H4G.xml trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/ trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Amstrad DRX-300.xml trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/ trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Coolsat.xml trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/ trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/D-Box.xml trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/ trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dilog DT-355.xml trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/ trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10/ENTER.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10-100 (Serial).xml trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10-200 (Serial).xml trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV D10.xml trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/ trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV HR10-250.xml trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/ trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/DirecTV R15.xml trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/ trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301/ENTER.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 301.xml trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/ trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811/GO.IR trunk/plugins/IR Server Suite/Set Top Boxes/Dish 811.xml trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/ trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/OK.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000/Power.ir trunk/plugins/IR Server Suite/Set Top Boxes/DreamBox 7000.xml trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/ trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/EXIT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536/POWER.IR trunk/plugins/IR Server Suite/Set Top Boxes/Force 536.xml trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/ trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel Digital DC420NF.xml trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/ trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Foxtel STU100.xml trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/ trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/EXIT.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/OK.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000/Power.ir trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2000.xml trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/ trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/General Instruments DCT2224.xml trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/ trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/BACK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/CH_DN.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/CH_UP.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Israel HOT.xml trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/ trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/JVC TU-4700.xml trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/ trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/Exit.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/Menu.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/OK.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660/Power.ir trunk/plugins/IR Server Suite/Set Top Boxes/MultiChoice DSD660.xml trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/ trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 221T.xml trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/ trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s/OK.ir trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s and 9902s (Serial).xml trunk/plugins/IR Server Suite/Set Top Boxes/Nokia 9800s.xml trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/ trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/ trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital DTR730.xml trunk/plugins/IR Server Suite/Set Top Boxes/OnDigital.xml trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/ trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pace 4100.xml trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/ trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Panasat IRD624DSTV.xml trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/ trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BCT-1540.xml trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/ trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100/exit.ir trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer BD-V1100.xml trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/ trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Pioneer DBR-TF100GB.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/ trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem D-Box II.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/ trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sagem ICD-503.xml trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/ trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/#.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C/Prechange.IR trunk/plugins/IR Server Suite/Set Top Boxes/Samsung SMT 2100C.xml trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/ trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 2100.xml trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/ trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/ENTER.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250/LAST.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 3250.xml trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/ trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 4000DVB.xml trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/ trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/BACK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/ENTER.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/EXIT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Scientific Atlanta Explorer 8300.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox 2500N.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox Amstrad.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB20.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB30.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31/OK.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB31.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky DigiBox TU-DSB40.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith/SELECT.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky Zenith.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/ trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/Sky+ BSKYB 2200.xml trunk/plugins/IR Server Suite/Set Top Boxes/Sky.xml trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/ trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/0.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/1.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/2.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/3.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/4.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/5.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/6.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/7.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/8.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/9.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/CHANNEL DOWN.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/CHANNEL UP.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/DOWN.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/LEFT.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/MUTE.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/OBUTTON.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/PLUSBUTTON.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/QUESTIONMARK.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/RIGHT.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/UP.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/VOLUME DOWN.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000/VOLUME UP.IR trunk/plugins/IR Server Suite/Set Top Boxes/SkyNZ Pace DSR6000.xml trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/ trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/0.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/1.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/2.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/3.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/4.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/5.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/6.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/7.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/8.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/9.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/OK.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410/Power.ir trunk/plugins/IR Server Suite/Set Top Boxes/Xsat CDTV-410.xml Modified: trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-11-26 18:17:30 UTC (rev 1090) +++ trunk/plugins/IR Server Suite/Applications/Debug Client/Debug Client.csproj 2007-11-27 15:50:44 UTC (rev 1091) @@ -22,7 +22,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DocumentationFile>bin\Debug\DebugClient.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> Modified: trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-26 18:17:30 UTC (rev 1090) +++ trunk/plugins/IR Server Suite/Applications/IR Blast/IR Blast.csproj 2007-11-27 15:50:44 UTC (rev 1091) @@ -23,7 +23,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DocumentationFile>bin\Debug\IRBlast.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> 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-11-26 18:17:30 UTC (rev 1090) +++ trunk/plugins/IR Server Suite/Applications/IR Blast (No Window)/IR Blast (No Window).csproj 2007-11-27 15:50:44 UTC (rev 1091) @@ -23,7 +23,8 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <DocumentationFile>bin\Debug\IRBlast-NoWindow.XML</DocumentationFile> + <DocumentationFile> + </DocumentationFile> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>none</DebugType> Modified: trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj =================================================================== --- trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-11-26 18:17:30 UTC (rev 1090) +++ trunk/plugins/IR Server Suite/Applications/IR Server/IR Server.csproj 2007-11-27 15:50:44 UTC (rev 1091) @@ -39,7 +39,8 @@ <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>true</TreatWarningsAsErrors> <UseVSHostingProcess>true</UseVSHostingProcess> - <DocumentationFile>bin\Debug\IRServer.XML</DocumentationFile> + <DocumentationFile> + </Document... [truncated message content] |
From: <mis...@us...> - 2007-11-26 18:17:47
|
Revision: 1090 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1090&view=rev Author: misterd_sf Date: 2007-11-26 10:17:30 -0800 (Mon, 26 Nov 2007) Log Message: ----------- New italian language. Thx Ettore Added Paths: ----------- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml Added: trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml =================================================================== --- trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml (rev 0) +++ trunk/plugins/My MPlayer/MPlayer_ExtPlayer/Language/strings_it.xml 2007-11-26 18:17:30 UTC (rev 1090) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<Language name="Italiano" characters="255"> + <Section name="unmapped"> + <String id="0">Speed</String> + <String id="1">Audio</String> + <String id="2">Sottotitoli</String> + <String id="3">attivato</String> + <String id="4">distattivato</String> + <String id="5">cerca</String> + <String id="6">Vai a</String> + <String id="7">Posizione sottotitoli</String> + <String id="8">Dimensione sottotitoli</String> + <String id="9">Ritardo sottotitoli</String> + <String id="10">Ritardo Audio</String> + <String id="11">Aspect ratio</String> + <String id="12">Mute</String> + <String id="13">Volume</String> + <String id="14">Riproduci Stream</String> + <String id="15">Riproduci Disc</String> + <String id="16">Cancella</String> + <String id="17">Inizializzazione</String> + </Section> +</Language> \ 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: <fer...@us...> - 2007-11-26 02:52:55
|
Revision: 1089 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1089&view=rev Author: fergusod Date: 2007-11-25 18:52:54 -0800 (Sun, 25 Nov 2007) Log Message: ----------- Playnow menu was updated to include browsing by genre. Configuration was modified to allow users to add their own genre feeds to the watchnow menu. Modified Paths: -------------- trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs trunk/plugins/Netflix manager/GUIConfiguration.cs trunk/plugins/Netflix manager/NetflixManager.suo trunk/plugins/Netflix manager/Netflixmanager.cs Added Paths: ----------- trunk/plugins/Netflix manager/obj/ trunk/plugins/Netflix manager/obj/Release/ trunk/plugins/Netflix manager/obj/Release/NetflixManager.dll Modified: trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs =================================================================== --- trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs 2007-11-25 18:51:06 UTC (rev 1088) +++ trunk/plugins/Netflix manager/GUIConfiguration.Designer.cs 2007-11-26 02:52:54 UTC (rev 1089) @@ -45,11 +45,18 @@ this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.label5 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); + this.listGenreURL = new System.Windows.Forms.ListView(); + this.columnHeader3 = new System.Windows.Forms.ColumnHeader(); + this.columnHeader4 = new System.Windows.Forms.ColumnHeader(); + this.remove_genre = new System.Windows.Forms.Button(); + this.add_genre = new System.Windows.Forms.Button(); + this.genreURLAdd = new System.Windows.Forms.TextBox(); + this.genreNameAdd = new System.Windows.Forms.TextBox(); this.SuspendLayout(); // // btnOK // - this.btnOK.Location = new System.Drawing.Point(227, 324); + this.btnOK.Location = new System.Drawing.Point(437, 416); this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 0; @@ -91,30 +98,31 @@ // // btnRemoveFeed // - this.btnRemoveFeed.Location = new System.Drawing.Point(513, 248); + this.btnRemoveFeed.Location = new System.Drawing.Point(513, 149); this.btnRemoveFeed.Name = "btnRemoveFeed"; this.btnRemoveFeed.Size = new System.Drawing.Size(75, 23); this.btnRemoveFeed.TabIndex = 19; this.btnRemoveFeed.Text = "Remove"; this.btnRemoveFeed.UseVisualStyleBackColor = true; + this.btnRemoveFeed.Click += new System.EventHandler(this.btnRemoveFeed_Click); // // txtAddURL // - this.txtAddURL.Location = new System.Drawing.Point(163, 280); + this.txtAddURL.Location = new System.Drawing.Point(163, 205); this.txtAddURL.Name = "txtAddURL"; this.txtAddURL.Size = new System.Drawing.Size(344, 20); this.txtAddURL.TabIndex = 18; // // txtAddName // - this.txtAddName.Location = new System.Drawing.Point(15, 280); + this.txtAddName.Location = new System.Drawing.Point(15, 205); this.txtAddName.Name = "txtAddName"; this.txtAddName.Size = new System.Drawing.Size(142, 20); this.txtAddName.TabIndex = 17; // // btnAddFeed // - this.btnAddFeed.Location = new System.Drawing.Point(513, 277); + this.btnAddFeed.Location = new System.Drawing.Point(513, 205); this.btnAddFeed.Name = "btnAddFeed"; this.btnAddFeed.Size = new System.Drawing.Size(75, 23); this.btnAddFeed.TabIndex = 16; @@ -125,7 +133,7 @@ // btnCancel // this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.btnCancel.Location = new System.Drawing.Point(308, 324); + this.btnCancel.Location = new System.Drawing.Point(518, 416); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 15; @@ -141,7 +149,7 @@ this.listRSSFeeds.Location = new System.Drawing.Point(15, 111); this.listRSSFeeds.MultiSelect = false; this.listRSSFeeds.Name = "listRSSFeeds"; - this.listRSSFeeds.Size = new System.Drawing.Size(492, 160); + this.listRSSFeeds.Size = new System.Drawing.Size(492, 88); this.listRSSFeeds.TabIndex = 20; this.listRSSFeeds.UseCompatibleStateImageBehavior = false; this.listRSSFeeds.View = System.Windows.Forms.View.Details; @@ -193,11 +201,73 @@ this.label6.TabIndex = 25; this.label6.Text = "(found in cookie as NetflixShopperID)"; // + // listGenreURL + // + this.listGenreURL.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.columnHeader3, + this.columnHeader4}); + this.listGenreURL.Location = new System.Drawing.Point(20, 267); + this.listGenreURL.MultiSelect = false; + this.listGenreURL.Name = "listGenreURL"; + this.listGenreURL.Size = new System.Drawing.Size(487, 88); + this.listGenreURL.TabIndex = 26; + this.listGenreURL.UseCompatibleStateImageBehavior = false; + this.listGenreURL.View = System.Windows.Forms.View.Details; + // + // columnHeader3 + // + this.columnHeader3.Text = "Genre"; + this.columnHeader3.Width = 150; + // + // columnHeader4 + // + this.columnHeader4.Text = "Browse URL"; + this.columnHeader4.Width = 306; + // + // remove_genre + // + this.remove_genre.Location = new System.Drawing.Point(513, 304); + this.remove_genre.Name = "remove_genre"; + this.remove_genre.Size = new System.Drawing.Size(75, 23); + this.remove_genre.TabIndex = 28; + this.remove_genre.Text = "Remove"; + this.remove_genre.UseVisualStyleBackColor = true; + this.remove_genre.Click += new System.EventHandler(this.remove_genre_Click); + // + // add_genre + // + this.add_genre.Location = new System.Drawing.Point(513, 369); + this.add_genre.Name = "add_genre"; + this.add_genre.Size = new System.Drawing.Size(75, 23); + this.add_genre.TabIndex = 27; + this.add_genre.Text = "Add"; + this.add_genre.UseVisualStyleBackColor = true; + this.add_genre.Click += new System.EventHandler(this.add_genre_Click); + // + // genreURLAdd + // + this.genreURLAdd.Location = new System.Drawing.Point(163, 369); + this.genreURLAdd.Name = "genreURLAdd"; + this.genreURLAdd.Size = new System.Drawing.Size(344, 20); + this.genreURLAdd.TabIndex = 30; + // + // genreNameAdd + // + this.genreNameAdd.Location = new System.Drawing.Point(20, 368); + this.genreNameAdd.Name = "genreNameAdd"; + this.genreNameAdd.Size = new System.Drawing.Size(137, 20); + this.genreNameAdd.TabIndex = 29; + // // GUIConfiguration // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(611, 369); + this.ClientSize = new System.Drawing.Size(663, 460); + this.Controls.Add(this.genreURLAdd); + this.Controls.Add(this.genreNameAdd); + this.Controls.Add(this.remove_genre); + this.Controls.Add(this.add_genre); + this.Controls.Add(this.listGenreURL); this.Controls.Add(this.label6); this.Controls.Add(this.label5); this.Controls.Add(this.linkLabel1); @@ -239,5 +309,12 @@ private System.Windows.Forms.LinkLabel linkLabel1; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label6; + private System.Windows.Forms.ListView listGenreURL; + private System.Windows.Forms.ColumnHeader columnHeader3; + private System.Windows.Forms.ColumnHeader columnHeader4; + private System.Windows.Forms.Button remove_genre; + private System.Windows.Forms.Button add_genre; + private System.Windows.Forms.TextBox genreURLAdd; + private System.Windows.Forms.TextBox genreNameAdd; } } \ No newline at end of file Modified: trunk/plugins/Netflix manager/GUIConfiguration.cs =================================================================== --- trunk/plugins/Netflix manager/GUIConfiguration.cs 2007-11-25 18:51:06 UTC (rev 1088) +++ trunk/plugins/Netflix manager/GUIConfiguration.cs 2007-11-26 02:52:54 UTC (rev 1089) @@ -19,13 +19,10 @@ shopperID.Text = xmlreader.GetValueAsString("netflixManager", "shopperid", ""); cookieID.Text = xmlreader.GetValueAsString("netflixManager", "cookieid", ""); - int numFeeds = xmlreader.GetValueAsInt("netflixManager", "numFeeds", 0); String[] temp1 = new String[numFeeds]; String[] temp2 = new String[numFeeds]; - - for (int i = 0; i < numFeeds; i++) { temp1[i] = xmlreader.GetValueAsString("netflixManager", "name" + i, ""); @@ -35,8 +32,21 @@ item.SubItems.Add(temp2[i]); listRSSFeeds.Items.Add(item); } - + int numGenre = xmlreader.GetValueAsInt("netflixManager", "numGenre", 0); + + String[] genreNames = new String[numGenre]; + String[] genreURLs = new String[numGenre]; + + for (int i = 0; i < numGenre; i++) + { + genreNames[i] = xmlreader.GetValueAsString("netflixManager", "genreName" + i, ""); + genreURLs[i] = xmlreader.GetValueAsString("netflixManager", "genreURL" + i, ""); + + ListViewItem item = new ListViewItem(genreNames[i]); + item.SubItems.Add(genreURLs[i]); + listGenreURL.Items.Add(item); + } } } @@ -62,23 +72,57 @@ private bool saveChanges() { - using (MediaPortal.Profile.Settings xmlwriter = new MediaPortal.Profile.Settings("MediaPortal.xml")) { //MessageBox.Show(shopperID.Text); xmlwriter.SetValue("netflixManager", "shopperid", shopperID.Text); xmlwriter.SetValue("netflixManager", "cookieid", cookieID.Text); - for (int index = 0; index < listRSSFeeds.Items.Count; index++) + int index; + for (index = 0; index < listRSSFeeds.Items.Count; index++) { xmlwriter.SetValue("netflixManager", "name" + index, listRSSFeeds.Items[index].Text.Trim()); xmlwriter.SetValue("netflixManager", "feed" + index, listRSSFeeds.Items[index].SubItems[1].Text.Trim()); - xmlwriter.SetValue("netflixManager", "numFeeds", index + 1); } + xmlwriter.SetValue("netflixManager", "numFeeds", index); + + for (index = 0; index < listGenreURL.Items.Count; index++) + { + xmlwriter.SetValue("netflixManager", "genreName" + index, listGenreURL.Items[index].Text.Trim()); + xmlwriter.SetValue("netflixManager", "genreURL" + index, listGenreURL.Items[index].SubItems[1].Text.Trim()); + } + xmlwriter.SetValue("netflixManager", "numGenre", index); } return true; } - + private void add_genre_Click(object sender, EventArgs e) + { + ListViewItem item = new ListViewItem(genreNameAdd.Text); + item.SubItems.Add(genreURLAdd.Text); + listGenreURL.Items.Add(item); + genreNameAdd.Clear(); + genreURLAdd.Clear(); + } + + private void btnRemoveFeed_Click(object sender, EventArgs e) + { + if (listRSSFeeds.SelectedItems.Count > 0) + { + ListView.SelectedListViewItemCollection items = listRSSFeeds.SelectedItems; + listRSSFeeds.Items.Remove(items[0]); + } + } + + private void remove_genre_Click(object sender, EventArgs e) + { + if (listGenreURL.SelectedItems.Count > 0) + { + ListView.SelectedListViewItemCollection items = listGenreURL.SelectedItems; + listGenreURL.Items.Remove(items[0]); + } + } + + } } \ No newline at end of file Modified: trunk/plugins/Netflix manager/NetflixManager.suo =================================================================== (Binary files differ) Modified: trunk/plugins/Netflix manager/Netflixmanager.cs =================================================================== --- trunk/plugins/Netflix manager/Netflixmanager.cs 2007-11-25 18:51:06 UTC (rev 1088) +++ trunk/plugins/Netflix manager/Netflixmanager.cs 2007-11-26 02:52:54 UTC (rev 1089) @@ -102,8 +102,11 @@ String shopperID = ""; String cookieID = ""; int numFeeds; + int numPlayNowGenre; String[] feedName; String[] feedAddress; + String[] playNowGenre; + String[] playNowGenreAddress; private CookieContainer m_CC = new CookieContainer(); @@ -248,15 +251,14 @@ { using (MediaPortal.Profile.Settings xmlreader = new MediaPortal.Profile.Settings("MediaPortal.xml")) { - - shopperID = xmlreader.GetValueAsString("netflixManager", "shopperid", ""); cookieID = xmlreader.GetValueAsString("netflixManager", "cookieid", ""); numFeeds = xmlreader.GetValueAsInt("netflixManager", "numFeeds", 0); + numPlayNowGenre = xmlreader.GetValueAsInt("netflixManager", "numGenre", 0); + String[] temp1 = new String[numFeeds]; String[] temp2 = new String[numFeeds]; - for(int i = 0; i < numFeeds; i++) { temp1[i] = xmlreader.GetValueAsString("netflixManager", "name" + i, ""); @@ -265,6 +267,17 @@ feedAddress = temp2; feedName = temp1; + String[] temp3 = new String[numPlayNowGenre]; + String[] temp4 = new String[numPlayNowGenre]; + + for (int i = 0; i < numPlayNowGenre; i++) + { + temp3[i] = xmlreader.GetValueAsString("netflixManager", "genreName" + i, ""); + temp4[i] = xmlreader.GetValueAsString("netflixManager", "genreURL" + i, ""); + } + playNowGenre = temp3; + playNowGenreAddress = temp4; + } } override protected void OnPageDestroy(int newWindowId) @@ -503,17 +516,22 @@ private String PlayNowMenu() { - String [] startpage = new String[]{ - "http://www.netflix.com/WatchNowFromQueue", - "http://www.netflix.com/WatchNowRecentAdditions", - "http://www.netflix.com/WatchNowTopPicks", - "http://www.netflix.com/WatchNowGenre?genreId=296"}; + String[] startpage = new String[numPlayNowGenre+3]; + String[] startpage_menu = new String[numPlayNowGenre+3]; + + startpage[0] = "http://www.netflix.com/WatchNowFromQueue"; + startpage[1] = "http://www.netflix.com/WatchNowRecentAdditions"; + startpage[2] = "http://www.netflix.com/WatchNowTopPicks"; + + startpage_menu[0] = "DVD Queue"; + startpage_menu[1] = "Recent Additions"; + startpage_menu[2] = "Top 50"; - String[] startpage_menu = new String[] { - "DVD Queue", - "Recent Additions", - "Top 50", - "Action & Adventure" }; + for (int genre = 0; genre < numPlayNowGenre; genre++) + { + startpage[genre + 3] = playNowGenreAddress[genre]; + startpage_menu[genre + 3] = playNowGenre[genre]; + } MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU); Added: trunk/plugins/Netflix manager/obj/Release/NetflixManager.dll =================================================================== (Binary files differ) Property changes on: trunk/plugins/Netflix manager/obj/Release/NetflixManager.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-11-25 18:51:11
|
Revision: 1088 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1088&view=rev Author: zebons Date: 2007-11-25 10:51:06 -0800 (Sun, 25 Nov 2007) Log Message: ----------- Some minor corrections on search by actors Skins modified Modified Paths: -------------- trunk/plugins/MyFilms/BaseMesFilms.cs trunk/plugins/MyFilms/MesFilms.cs trunk/plugins/MyFilms/MesFilmsSetup.cs trunk/plugins/MyFilms/skin/BlackMyst/MesFilms.xml trunk/plugins/MyFilms/skin/BlackMyst/MesFilmsDetail.xml trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.xml trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilmsDetail.xml trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms.xml trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilmsDetail.xml Added Paths: ----------- trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/ trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/ trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_DD.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_focus.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_nofocus.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_focus.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_nofocus.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_focus.PNG trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_nofocus.PNG trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_focus.PNG trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_nofocus.PNG trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/amclogo.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/hover_my films.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.common.facade.xml trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.xml trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilmsDetail.xml trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms_Visible.xml trunk/plugins/MyFilms/skin/BlackMyst/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/BlackMyst/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/BlackMyst/MesFilms_Visible.xml trunk/plugins/MyFilms/skin/BlueTwo/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/BlueTwo wide/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/BlueTwo wide/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms.common.facade.xml trunk/plugins/MyFilms/skin/Project Mayhem 3/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/Project Mayhem 3/Media/starhalf.png trunk/plugins/MyFilms/skin/Project Mayhem 3/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/Project Mayhem 3/MesFilms_Visible.xml trunk/plugins/MyFilms/skin/SpinSafe Revolve/ trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/ trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_DD.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_first_focus.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_first_nofocus.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_last_focus.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_last_nofocus.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_next_focus.PNG trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_next_nofocus.PNG trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_prior_focus.PNG trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/Films_prior_nofocus.PNG trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/amclogo.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/hover_my films.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/starhalf.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms.xml trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilmsDetail.xml trunk/plugins/MyFilms/skin/SpinSafe Revolve/MesFilms_Visible.xml trunk/plugins/MyFilms/skin/Xface/ trunk/plugins/MyFilms/skin/Xface/Media/ trunk/plugins/MyFilms/skin/Xface/Media/Films_DD.png trunk/plugins/MyFilms/skin/Xface/Media/Films_first_focus.png trunk/plugins/MyFilms/skin/Xface/Media/Films_first_nofocus.png trunk/plugins/MyFilms/skin/Xface/Media/Films_last_focus.png trunk/plugins/MyFilms/skin/Xface/Media/Films_last_nofocus.png trunk/plugins/MyFilms/skin/Xface/Media/Films_next_focus.PNG trunk/plugins/MyFilms/skin/Xface/Media/Films_next_nofocus.PNG trunk/plugins/MyFilms/skin/Xface/Media/Films_prior_focus.PNG trunk/plugins/MyFilms/skin/Xface/Media/Films_prior_nofocus.PNG trunk/plugins/MyFilms/skin/Xface/Media/amclogo.png trunk/plugins/MyFilms/skin/Xface/Media/defaultDVDEmptyBig.png trunk/plugins/MyFilms/skin/Xface/Media/hover_my films.png trunk/plugins/MyFilms/skin/Xface/Media/starhalf.png trunk/plugins/MyFilms/skin/Xface/Media/starhalf_horz.png trunk/plugins/MyFilms/skin/Xface/MesFilms.xml trunk/plugins/MyFilms/skin/Xface/MesFilmsDetail.xml trunk/plugins/MyFilms/skin/Xface/MesFilms_Visible.xml Modified: trunk/plugins/MyFilms/BaseMesFilms.cs =================================================================== --- trunk/plugins/MyFilms/BaseMesFilms.cs 2007-11-23 22:44:32 UTC (rev 1087) +++ trunk/plugins/MyFilms/BaseMesFilms.cs 2007-11-25 18:51:06 UTC (rev 1088) @@ -58,23 +58,14 @@ 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 DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens) + //{ + // if (data == null) + // { + // initData(); + // } + // return movies = data.Tables["Movie"].Select(StrFilmSelect, StrSort + StrSortSens); + //} public static void LoadFilm(string StrFileXml) { if (!System.IO.File.Exists(StrFileXml)) Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-11-23 22:44:32 UTC (rev 1087) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-11-25 18:51:06 UTC (rev 1088) @@ -645,7 +645,14 @@ item.IconImage = conf.FileImage; // item.IconImageBig = conf.FileImage; item.ItemId = number; - + try + { + item.Rating = (float)Convert.ToDecimal(r["Rating"]); + } + catch + { + item.Rating = 0; + } item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); facadeView.Add(item); @@ -781,7 +788,6 @@ //------------------------------------------------------------------------------------------- private bool control_searchText(string stext) { - //Regex maRegexp = new Regex("^[a-zA-Z0-9 ():-_\\[\\]$&%'\xA7=#\\/.<>!+\"+]+$"); Regex maRegexp = new Regex("^[^*]+$"); bool regOK = maRegexp.IsMatch(stext); return regOK; @@ -798,7 +804,8 @@ if (!conf.Boolselect) GetFilmList(); else - getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", conf.WStrSort, conf.StrSortSens, "*", true, ""); + //getSelectFromDivx(conf.StrTitle1.ToString() + " not like ''", conf.WStrSort, conf.StrSortSens, "*", true, ""); + getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.StrSortSens, conf.Wstar, true, ""); return; } @@ -888,7 +895,7 @@ { GUIListItem item = new GUIListItem(); string champselect = ""; - string wchampselect = "$"; + string wchampselect = ""; ArrayList w_tableau = new ArrayList(); string[] arSplit; int Wnb_enr = 0; @@ -902,8 +909,11 @@ //conf.StrActors = ""; // boolreturn = true; if (ClearIndex) conf.StrIndex = 0; + //facadeView.FreeResources(); + Change_LayOut(0); facadeView.Clear(); + //foreach (DataRow enr in LectureDonn\xE9es(WstrSelect, WStrSort, WStrSortSens)) foreach (DataRow enr in BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, WstrSelect, WStrSort, WStrSortSens)) { @@ -944,7 +954,7 @@ { if (conf.Wstar == "*" || champselect.ToUpper().Contains(conf.Wstar.ToUpper())) { - if (Wnb_enr > 0) + if ((Wnb_enr > 0) && (wchampselect.Length > 0)) { item = new GUIListItem(); item.Label = wchampselect.ToString(); @@ -955,19 +965,30 @@ Wnb_enr = 1; wchampselect = champselect.ToString(); } - else - if (Wnb_enr > 0) - { - item = new GUIListItem(); - item.Label = wchampselect.ToString(); - item.Label2 = Wnb_enr.ToString(); - facadeView.Add(item); - if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select - Wnb_enr = 0; - } - + //else + //{ + // if ((Wnb_enr > 0) && (wchampselect.Length > 0)) + // { + // item = new GUIListItem(); + // item.Label = wchampselect.ToString(); + // item.Label2 = Wnb_enr.ToString(); + // facadeView.Add(item); + // if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select + // Wnb_enr = 0; + // } + //} } } + + if ((Wnb_enr > 0) && (wchampselect.Length > 0)) + { + item = new GUIListItem(); + item.Label = wchampselect.ToString(); + item.Label2 = Wnb_enr.ToString(); + facadeView.Add(item); + if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select + Wnb_enr = 0; + } conf.StrTxtSelect = "Selection"; if (conf.Wstar != "*") conf.StrTxtSelect += " " + GUILocalizeStrings.Get(344) + " [*" + conf.Wstar + "*]"; TxtSelect.Label = conf.StrTxtSelect; @@ -977,7 +998,6 @@ if ((conf.StrIndex > facadeView.Count - 1) || (conf.StrIndex < 0)) //check index within bounds, will be unless xml file heavily edited conf.StrIndex = 0; GUIControl.ShowControl(GetID, 34); - Change_LayOut(0); GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127)); GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)conf.StrIndex); } @@ -1035,6 +1055,7 @@ getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.StrSortSens, conf.Wstar, false, ""); // preserve index from last time } else + { Change_LayOut(Layout); if (!(LoadDfltSlct)) GetFilmList(conf.StrIndex); @@ -1085,7 +1106,7 @@ } } } - + } if (conf.LastID == ID_MesFilmsDetail) { GUIWindowManager.ActivateWindow(ID_MesFilmsDetail); // if last window in use was detailed one display that one again @@ -1115,7 +1136,7 @@ facadeView.View = GUIFacadeControl.ViewMode.List; break; } - GUIControl.FocusControl(GetID, facadeView.GetID); + //GUIControl.FocusControl(GetID, facadeView.GetID); } //-------------------------------------------------------------------------------------------- // Change View Response Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-23 22:44:32 UTC (rev 1087) +++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-25 18:51:06 UTC (rev 1088) @@ -371,6 +371,7 @@ { MyFilms_xmlwriter.SetValue("MyFilms", "Default_Config", ""); } + MyFilms_xmlwriter.SetValueAsBool("MyFilms", "Menu_Config", Config_Menu.Checked); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "CatalogType", CatalogType.SelectedIndex.ToString()); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "AntCatalog", MesFilmsCat.Text.ToString()); @@ -630,59 +631,7 @@ MessageBoxIcon.Question); if (dialogResult == DialogResult.Yes) { - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CatalogType"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntCatalog"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "PathStorage"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SearchFileName"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ItemSearchFileName"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AlwaysDefaultView"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentItem"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentLabel"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntSort"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTSort"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterItem1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterSign1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterText1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterItem2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterSign2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterText2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterComb"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewItem1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewText1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewItem2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewText2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdItem1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdText1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdDflT1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdItem2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdText2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdDflT2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem1"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem3"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel2"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ViewDfltItem"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ViewDfltText"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSelect"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrDfltSelect"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Selection"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSort"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CurrentSortMethod"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSortSens"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "IndexItem"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleDelim"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LayOut"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SortTitle"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DVDPTagField"); - MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DefaultCover"); + Remove_Config(); if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", "")) MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config"); if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Current_Config", "")) @@ -693,6 +642,72 @@ } } + private void Remove_Config() + { + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CatalogType"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntCatalog"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "PathStorage"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SearchFileName"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ItemSearchFileName"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AlwaysDefaultView"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentItem"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentLabel"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntSort"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTSort"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterItem1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterSign1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterText1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterItem2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterSign2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterText2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntFilterComb"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewItem1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewText1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewItem2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntViewText2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdItem1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdText1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdDflT1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdItem2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdText2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntUpdDflT2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem1"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntItem3"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntLabel2"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ViewDfltItem"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ViewDfltText"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSelect"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrDfltSelect"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrTitleSelect"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrFilmSelect"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Selection"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrActors"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSort"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "WStrSort"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "CurrentSortMethod"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "StrSortSens"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "IndexItem"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleDelim"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "TitleItem"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "WSelectedLabel"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LayOut"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "WLayOut"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Wstar"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "LastID"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SortTitle"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DVDPTagField"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DefaultCover"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Boolselect"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Boolreturn"); + } private void MesFilmsSetup_Quit(object sender, FormClosedEventArgs e) { // MyFilms_xmlwriter.SetValue("MyFilms", "Current_Config", ""); Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_DD.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_DD.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_No_Cover.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_No_Cover.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_focus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_first_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_focus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_nofocus.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_last_nofocus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_focus.PNG =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_focus.PNG ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_nofocus.PNG =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_next_nofocus.PNG ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_focus.PNG =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_focus.PNG ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_nofocus.PNG =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/Films_prior_nofocus.PNG ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/amclogo.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/amclogo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/hover_my films.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/hover_my films.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf_horz.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/Media/starhalf_horz.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.common.facade.xml =================================================================== --- trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.common.facade.xml (rev 0) +++ trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.common.facade.xml 2007-11-25 18:51:06 UTC (rev 1088) @@ -0,0 +1,205 @@ +<?xml version="1.0" standalone="yes"?> +<window> + <controls> + <control> + <type>group</type> + <description>group element</description> + <control> + <visible>Control.HasFocus(1026)</visible> + <animation effect="slide" time="350" end="210,0">Hidden</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <description>composite control consisting of a list control and a thumbnail panel</description> + <type>facadeview</type> + <id>1026</id> + <control> + <description>listcontrol</description> + <type>listcontrol</type> + <posX>80</posX> + <posY>95</posY> + <width>600</width> + <height>330</height> + <onup>6</onup> + <onleft>6</onleft> + <spinWidth>34</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>6500</spinPosX> + <spinPosY>530</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> + <textureFocus>list_sub_focus.png</textureFocus> + <textureNoFocus>list_sub_nofocus.png</textureNoFocus> + <textureHeight>30</textureHeight> + <image>folder_focus.png</image> + <font>font14</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>42</textXOff> + <textYOff>4</textYOff> + <textXOff2>600</textXOff2> + <textYOff2>4</textYOff2> + <itemWidth>20</itemWidth> + <itemHeight>28</itemHeight> + <IconXOff>24</IconXOff> + <IconYOff>2</IconYOff> + <suffix>|</suffix> + <scrollOffset>2</scrollOffset> + </control> + <control> + <description>Thumbnail Panel</description> + <type>thumbnailpanel</type> + <posX>90</posX> + <posY>89</posY> + <width>620</width> + <height>450</height> + <onup>6</onup> + <onleft>6</onleft> + <spinWidth>34</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>590</spinPosX> + <spinPosY>530</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>88</itemWidth> + <itemHeight>115</itemHeight> + <textureWidth>73</textureWidth> + <textureHeight>100</textureHeight> + <thumbWidth>72</thumbWidth> + <thumbHeight>76</thumbHeight> + <thumbPosX>0</thumbPosX> + <thumbPosY>9</thumbPosY> + <thumbZoom>yes</thumbZoom> + <imageFolder>icon_empty_nofocus.png</imageFolder> + <imageFolderFocus>cover DVD panel.png</imageFolderFocus> + <font>font12</font> + <selectedColor>00ffffff</selectedColor> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <remoteColor>ffFFA075</remoteColor> + <downloadColor>ff80ff80</downloadColor> + <suffix>|</suffix> + <textureWidthBig>85</textureWidthBig> + <textureHeightBig>122</textureHeightBig> + <itemWidthBig>112</itemWidthBig> + <itemHeightBig>142</itemHeightBig> + <thumbWidthBig>66</thumbWidthBig> + <thumbHeightBig>92</thumbHeightBig> + <thumbPosXBig>9</thumbPosXBig> + <thumbPosYBig>10</thumbPosYBig> + <thumbZoom>no</thumbZoom> + <textXOff>8</textXOff> + <textYOff>-5</textYOff> + <enableFocusZoom>yes</enableFocusZoom> + </control> + <control> + <description>Filmstrip view</description> + <type>filmstrip</type> + <posX>75</posX> + <posY>180</posY> + <width>690</width> + <height>133</height> + <onup>6</onup> + <onleft>6</onleft> + <ondown>6</ondown> + <spinWidth>34</spinWidth> + <spinHeight>36</spinHeight> + <spinPosX>590</spinPosX> + <spinPosY>530</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> + <thumbWidth>146</thumbWidth> + <thumbHeight>216</thumbHeight> + <thumbPosX>10</thumbPosX> + <thumbPosY>6</thumbPosY> + <imageFolder>cover DVD.png</imageFolder> + <imageFolderFocus>cover DVD focus.png</imageFolderFocus> + <frame>cover DVD.png</frame> + <frameFocus>cover DVD focus.png</frameFocus> + <itemWidth>203</itemWidth> + <itemHeight>208</itemHeight> + <textureWidth>173</textureWidth> + <textureHeight>220</textureHeight> + <font>-</font> + <selectedColor>00ffffff</selectedColor> + <textcolor>ffffffff</textcolor> + <colordiffuse>ffffffff</colordiffuse> + <remoteColor>ffFFA075</remoteColor> + <downloadColor>ff80ff80</downloadColor> + <suffix>|</suffix> + <background>Cover_dvd.png</background> + <backgroundx>400</backgroundx> + <backgroundy>126</backgroundy> + <backgroundwidth>312</backgroundwidth> + <backgroundheight>555</backgroundheight> + <backgrounddiffuse>ffffffff</backgrounddiffuse> + <InfoImagex>444</InfoImagex> + <InfoImagey>140</InfoImagey> + <InfoImagewidth>250</InfoImagewidth> + <InfoImageheight>250</InfoImageheight> + <thumbs flipY="true" diffuse="Thumb_Mask.png"/> + <InfoImage flipY="true" diffuse="Thumb_Mask.png"/> + <showFrame>yes</showFrame> + <showFolder>yes</showFolder> + <showBackGround>no</showBackGround> + <showInfoImage>no</showInfoImage> + <enableFocusZoom>no</enableFocusZoom> + <thumbAnimation effect="zoom" start="100,100" end="125,125" time="300">focus</thumbAnimation> + <thumbAnimation effect="zoom" start="125,125" end="100,100" time="300">unfocus</thumbAnimation> + </control> + </control> + <control> + <type>fadelabel</type> + <description>Title (during Icons and List)</description> + <id>1027</id> + <posX>35</posX> + <posY>530</posY> + <onup>6</onup> + <onleft>6</onleft> + <onright>1026</onright> + <onup>1026</onup> + <ondown>1026</ondown> + <font>font12</font> + <width>250</width> + <height>24</height> + <visible>!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <label>#selecteditem</label> + </control> + <control> + <type>textboxscrollup</type> + <description>Biography value</description> + <id>1025</id> + <posX>165</posX> + <posY>435</posY> + <width>500</width> + <height>80</height> + <onup>6</onup> + <onleft>6</onleft> + <onright>1026</onright> + <onup>1026</onup> + <ondown>1026</ondown> + <colordiffuse>ffffffff</colordiffuse> + <textcolor>FFFFFFFF</textcolor> + <speed>10</speed> + <visible>!facadeview.filmstrip+!facadeview.largeicons+!control.isvisible(34)+control.hasfocus(1026)</visible> + <label>-</label> + <seperator>------------------------------------------------------------------------------------------------------------------------------</seperator> + <font>font12</font> + </control> + </control> + </controls> +</window> \ No newline at end of file Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.xml =================================================================== --- trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.xml (rev 0) +++ trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilms.xml 2007-11-25 18:51:06 UTC (rev 1088) @@ -0,0 +1,367 @@ +<window> + <id>7986</id> + <defaultcontrol>1026</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <define>#header.label:107986</define> + <controls> + <import>common.time.xml</import> + <import>MesFilms_Visible.xml</import> + <control> + <description>BG</description> + <type>image</type> + <id>1</id> + <posX>0</posX> + <posY>0</posY> + <texture>background.png</texture> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>60</posX> + <posY>20</posY> + <texture>videos_logo.png</texture> + </control> + <control> + <description>menu background image</description> + <type>image</type> + <id>1</id> + <posX>18</posX> + <posY>0</posY> + <width>265</width> + <height>720</height> + <animation effect="slide" time="350" end="-300,0">hidden</animation> + <animation effect="slide" time="450" start="-300,0">visible</animation> + <visible>!Control.HasFocus(1026)</visible> + <texture>menu_bar.png</texture> + </control> + <control> + <description>logo</description> + <type>image</type> + <id>1</id> + <posX>75</posX> + <posY>70</posY> + <height>40</height> + <colordiffuse>9Fffffff</colordiffuse> + <keepaspectratio>yes</keepaspectratio> + <visible>!Control.HasFocus(1026)</visible> + <texture>amclogo.png</texture> + </control> + <control> + <type>fadelabel</type> + <id>12</id> + <posX>270</posX> + <posY>70</posY> + <label>My Films</label> + <font>font14</font> + <align>left</align> + <textcolor>ffa9d0f7</textcolor> + </control> + <control> + <type>group</type> + <description>group element</description> + <id>6</id> + <posX>60</posX> + <posY>97</posY> + <visible>!Control.HasFocus(1026)</visible> + <animation effect="slide" time="350" end="-300,0">hidden</animation> + <animation effect="slide" time="450" start="-300,0">visible</animation> + <layout>StackLayout</layout> + <control> + <type>button</type> + <description>Layout</description> + <id>6</id> + <posX>60</posX> + <posY>97</posY> + <onleft>5</onleft> + <onright>1026</onright> + <onup>5</onup> + <ondown>2</ondown> + <animation>unfocus</animation> + <label>101</label> + <textcolor>ff000000</textcolor> + </control> + <control> + <type>sortbutton</type> + <id>2</id> + <onleft>6</onleft> + <onright>1026</onright> + <onup>6</onup> + <ondown>3</ondown> + <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused> + <font>font13</font> + <textureFocus>menu_list_focus.png</textureFocus> + <textYOff>5</textYOff> + <textXOff>10</textXOff> + <disabledcolor>60ffffff</disabledcolor> + <label>103</label> + <offsetSortButtonY>8</offsetSortButtonY> + <offsetSortButtonX>165</offsetSortButtonX> + <textcolor>White</textcolor> + <textureNoFocus>menu_list_nofocus.png</textureNoFocus> + <textureAscending>arrow_round_up_nofocus.png</textureAscending> + <textureDescending>arrow_round_down_nofocus.png</textureDescending> + <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused> + </control> + <control> + <type>button</type> + <description>Switch view</description> + <id>3</id> + <onleft>2</onleft> + <onright>1026</onright> + <onup>2</onup> + <ondown>4</ondown> + <label>457</label> + </control> + <control> + <type>button</type> + <description>Search by Films</description> + <id>4</id> + <onleft>3</onleft> + <onright>1026</onright> + <onup>3</onup> + <ondown>5</ondown> + <label>137</label> + </control> + <control> + <type>button</type> + <description>Search by Actors</description> + <id>5</id> + <onleft>4</onleft> + <onright>1026</onright> + <onup>4</onup> + <ondown>6</ondown> + <label>137</label> + </control> + </control> + <import>MesFilms.common.facade.xml</import> + <control> + <type>image</type> + <id>1065</id> + <posX>340</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>control.isvisible(33)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>star.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1064</id> + <posX>320</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>control.isvisible(31)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>star.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1063</id> + <posX>300</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>control.isvisible(29)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>star.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1062</id> + <posX>280</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>control.isvisible(27)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>star.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1061</id> + <posX>260</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>control.isvisible(25)+!facadeview.filmstrip+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>star.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1060</id> + <posX>340</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>starhalf_horz.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1059</id> + <posX>320</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>starhalf_horz.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1058</id> + <posX>300</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>starhalf_horz.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1057</id> + <posX>280</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>starhalf_horz.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1056</id> + <posX>260</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>starhalf_horz.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1055</id> + <posX>340</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+!control.isvisible(32)+!control.isvisible(33)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>greystar.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1054</id> + <posX>320</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+!control.isvisible(30)+!control.isvisible(31)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>greystar.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1053</id> + <posX>300</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+!control.isvisible(28)+!control.isvisible(29)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>greystar.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1052</id> + <posX>280</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+!control.isvisible(26)+!control.isvisible(27)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>greystar.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1051</id> + <posX>260</posX> + <posY>533</posY> + <width>16</width> + <height>16</height> + <visible>!facadeview.filmstrip+!control.isvisible(24)+!control.isvisible(25)+!control.isvisible(34)+control.hasfocus(1026)</visible> + <texture>greystar.png</texture> + <centered>yes</centered> + </control> + <control> + <type>image</type> + <id>1019</id> + <posX>60</posX> + <posY>300</posY> + <width>100</width> + <height>150</height> + <texture>hover_my films.png</texture> + <visible>!player.hasmedia+!control.hasfocus(1026)</visible> + <keepaspectratio>yes</keepaspectratio> + </control> + <control> + <type>image</type> + <id>1020</id> + <posX>35</posX> + <posY>390</posY> + <width>92</width> + <height>160</height> + <visible>player.hasmedia +facadeview.list+!control.isvisible(34)+control.hasfocus(1026)</visible> + <keepaspectratio>yes</keepaspectratio> + <texture>-</texture> + </control> + <control> + <type>image</type> + <id>1021</id> + <posX>35</posX> + <posY>390</posY> + <width>100</width> + <height>160</height> + <visible>!player.hasmedia +facadeview.list+!control.isvisible(34)+control.hasfocus(1026)</visible> + <keepaspectratio>yes</keepaspectratio> + <texture>-</texture> + </control> + <control> + <type>label</type> + <description>year</description> + <id>1022</id> + <posX>38</posX> + <posY>550</posY> + <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible> + <label>6</label> + <font>font12</font> + </control> + <control> + <type>label</type> + <description>category</description> + <id>1024</id> + <posX>85</posX> + <posY>550</posY> + <visible>!facadeview.filmstrip+!control.isvisible(23)+!control.isvisible(34)+control.hasfocus(1026)+!player.hasmedia</visible> + <align>left</align> + <label>6</label> + <font>font12</font> + </control> + <control> + <type>label</type> + <id>2073</id> + <posX>580</posX> + <posY>392</posY> + <label>#nbobjects</label> + <visible>facadeview.list</visible> + <align>left</align> + <textcolor>7fffffff</textcolor> + </control> + </controls> +</window> \ No newline at end of file Added: trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilmsDetail.xml =================================================================== --- trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilmsDetail.xml (rev 0) +++ trunk/plugins/MyFilms/skin/Aqua 0.2.3.0/MesFilmsDetail.xml 2007-11-25 18:51:06 UTC (rev 1088) @@ -0,0 +1,439 @@ +<window> + <id>7987</id> + <defaultcontrol>101</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> + <description>logo</description> + <type>image</type> + <id>1</id> + <posX>75</posX> + <posY>70</posY> + <height>40</height> + <colordiffuse>9Fffffff</colordiffuse> + <keepaspectratio>yes</keepaspectratio> + <texture>amclogo.png</texture> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>60</posX> + <posY>20</posY> + <texture>videos_logo.png</texture> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>250</posX> + <posY>80</posY> + <width>480</width> + <height>502</height> + <texture>menu_bg.png</texture> + <colordiffuse>7fffffff</colordiffuse> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>273</posX> + <posY>100</posY> + <width>330</width> + <height>50</height> + <texture>album_background_nofocus.png</texture> + <colordiffuse>4fffffff</colordiffuse> + </control> + <control> + <type>group</type> + <description>group element</description> + <id>27</id> + <posX>56</posX> + <posY>97</posY> + <width>198</width> + <height>140</height> + <layout>StackLayout</layout> + <animation effect="slide" time="400" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="400" end="0,-300" >WindowClose</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="fade" time="250">WindowOpen</animation> + <control> + <type>button</type> + <description>Play</description> + <id>101</id> + <onleft>103</onleft> + <onright>102</onright> + <label>208</label> + </control> + <control> + <type>button</type> + <description>Back</description> + <id>102</id> + <onleft>101</onleft> + <onright>107</onright> + <label>712</label> + </control> + <control> + <type>button</type> + <description>Update</description> + <id>107</id> + <onleft>102</onleft> + <onright>103</onright> + <ondown>103</ondown> + <label>79861</label> + </control> + <control> + <type>group</type> + <description>group element</description> + <id>1234</id> + <layout>GridLayout(4,0,0,0)</layout> + <control> + <type>button</type> + <description>first</description> + <id>106</id> + <onleft>107</onleft> + <onright>104</onright> + <ondown>319</ondown> + <onup>107</onup> + <label>-</label> + <height>40</height> + <width>30</width> + <textureFocus>Films_first_focus.png</textureFocus> + <textureNoFocus>Films_first_nofocus.png</textureNoFocus> + </control> + <control> + <type>button</type> + <description>prior</description> + <id>104</id> + <onleft>106</onleft> + <onright>103</onright> + <ondown>319</ondown> + <onup>107</onup> + <label>-</label> + <height>30</height> + <width>30</width> + <textureFocus>Films_prior_focus.png</textureFocus> + <textureNoFocus>Films_prior_nofocus.png</textureNoFocus> + </control> + <control> + <type>button</type> + <description>next</description> + <id>103</id> + <onleft>104</onleft> + <onright>105</onright> + <ondown>319</ondown> + <onup>107</onup> + <label>-</label> + <height>30</height> + <width>30</width> + <textureFocus>Films_next_focus.png</textureFocus> + <textureNoFocus>Films_next_nofocus.png</textureNoFocus> + </control> + <control> + <type>button</type> + <description>last</description> + <id>105</id> + <onleft>103</onleft> + <onright>106</onright> + <ondown>319</ondown> + <onup>107</onup> + <label>-</label> + <height>30</height> + <width>30</width> + <textureFocus>Films_last_focus.png</textureFocus> + <textureNoFocus>Films_last_nofocus.png</textureNoFocus> + </control> + </control> + </control> + <control> + <type>fadelabel</type> + <id>2071</id> + <posX>78</posX> + <posY>528</posY> + <label>#item3</label> + <font>font8</font> + <width>150</width> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>fadelabel</type> + <id>2069</id> + <posX>78</posX> + <posY>513</posY> + <label>#format</label> + <font>font8</font> + <width>150</width> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>fadelabel</type> + <id>2070</id> + <posX>690</posX> + <posY>126</posY> + <label>#support</label> + <font>font10</font> + <align>right</align> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>label</type> + <id>2068</id> + <posX>690</posX> + <posY>150</posY> + <label>#duree</label> + <font>font10</font> + <align>right</align> + <textcolor>ffffffff</textcolor> + </control> + <control> + <type>image</type> + <id>2072</id> + <posX>660</posX> + <posY>170</posY> + <width>35</width> + <height>35</height> + <align>right</align> + <texture>Films_DD.png</texture> + <colordiffuse>7fffffff</colordiffuse> + </control> + <control> + <type>label</type> + <id>2010</id> + <posX>280</posX> + <posY>156</posY> + <label>#label1</label> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>fadelabel</type> + <id>2011</id> + <posX>403</posX> + <posY>156</posY> + <label>#item1</label> + <width>180</width> + <textcolor>ffffffff</textcolor> + <disabledcolor>ffffffff</disabledcolor> + </control> + <control> + <type>fadelabel</type> + <id>2065</id> + <posX>403</posX> + <posY>281</posY> + <label>#item2</label> + <width>200</width> + <textcolor>ffffffff</textcolor> + <disabledcolor>ffffffff</disabledcolor> + </control> + <control> + <type>label</type> + <id>2035</id> + <posX>280</posX> + <posY>281</posY> + <label>#label2</label> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>fadelabel</type> + <description>Actors</description> + <id>2065</id> + <posX>280</posX> + <posY>307</posY> + <label>344</label> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>label</type> + <description>year</description> + <id>2031</id> + <posX>280</posX> + <posY>181</posY> + <label>201</label> + <textcolor>ffc0c0c0</textcolor> + <disabledcolor>ffc0c0c0</disabledcolor> + </control> + <control> + <type>label</type> + <id>2061</id> + <posX>403</posX> + <posY>181</posY> + <label>#year</label> + <textcolor>ffffffff</textcolor> + <disabledcolor>ffffffff</disabledcolor> + </control> + <control> + <type>label</type> + <description>Rating</description> + <id>2030</id> + <posX>602</posX> + <posY>100</posY> + <label>204</label> + <colordiffuse>ffe0e0e0</colordiffuse> + <textcolor>ffc0... [truncated message content] |
From: <ze...@us...> - 2007-11-23 22:44:34
|
Revision: 1087 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1087&view=rev Author: zebons Date: 2007-11-23 14:44:32 -0800 (Fri, 23 Nov 2007) Log Message: ----------- Layout forced at List when selecting (year, category, search by actors or movies...) Modified Paths: -------------- trunk/plugins/MyFilms/MesFilms.cs Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-11-23 18:58:09 UTC (rev 1086) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-11-23 22:44:32 UTC (rev 1087) @@ -251,7 +251,7 @@ if (Configuration.CurrentConfig.Length == 0) GUIWindowManager.ShowPreviousWindow(); - if (conf.AlwaysDefaultView) + if ((conf.AlwaysDefaultView) && (PreviousWindowId != ID_MesFilmsDetail)) Fin_Charge_Init(true); else Fin_Charge_Init(false); @@ -339,7 +339,7 @@ { if (control_searchText(keyboard.Text)) { - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = "ACTORS"; conf.Wselectedlabel = ""; conf.WStrSortSens = " ASC"; @@ -977,6 +977,7 @@ if ((conf.StrIndex > facadeView.Count - 1) || (conf.StrIndex < 0)) //check index within bounds, will be unless xml file heavily edited conf.StrIndex = 0; GUIControl.ShowControl(GetID, 34); + Change_LayOut(0); GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127)); GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)conf.StrIndex); } @@ -1030,7 +1031,7 @@ BtnSrtBy.SortChanged += new SortEventHandler(SortChanged); if (conf.Boolselect) { - Change_LayOut(0); + //Change_LayOut(0); getSelectFromDivx(conf.StrSelect, conf.WStrSort, conf.StrSortSens, conf.Wstar, false, ""); // preserve index from last time } else @@ -1135,7 +1136,7 @@ if (choice_view.ToLower() == "year") { // Change View by Year - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = "YEAR"; conf.WStrSortSens = " DESC"; BtnSrtBy.IsAscending = false; @@ -1145,7 +1146,7 @@ if (choice_view.ToLower() == "category") { // Change View by "Category": - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = "CATEGORY"; conf.WStrSortSens = " ASC"; BtnSrtBy.IsAscending = true; @@ -1155,7 +1156,7 @@ if (choice_view.ToLower() == "country") { // Change View by "Country": - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = "COUNTRY"; conf.WStrSortSens = " ASC"; BtnSrtBy.IsAscending = true; @@ -1182,7 +1183,7 @@ if ((choice_view.ToLower() == "view1") || (choice_view.ToLower() == conf.StrViewItem1.ToLower())) { // Change View by "View1": - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = conf.StrViewItem1; // specific user View1 conf.WStrSortSens = " ASC"; BtnSrtBy.IsAscending = true; @@ -1195,7 +1196,7 @@ if ((choice_view.ToLower() == "view2") || (choice_view.ToLower() == conf.StrViewItem2.ToLower())) { // Change View by "View2": - Change_LayOut(0); + //Change_LayOut(0); conf.WStrSort = conf.StrViewItem2; conf.WStrSortSens = " ASC"; BtnSrtBy.IsAscending = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ze...@us...> - 2007-11-23 18:58:48
|
Revision: 1086 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1086&view=rev Author: zebons Date: 2007-11-23 10:58:09 -0800 (Fri, 23 Nov 2007) Log Message: ----------- Version 4.3.1 add an option to always go to the default view when entering with the specified config. correction of some search bugs Modified Paths: -------------- trunk/plugins/MyFilms/Configuration.cs trunk/plugins/MyFilms/MesFilms.cs trunk/plugins/MyFilms/MesFilmsDetail.cs trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs trunk/plugins/MyFilms/MesFilmsSetup.cs trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml Modified: trunk/plugins/MyFilms/Configuration.cs =================================================================== --- trunk/plugins/MyFilms/Configuration.cs 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/Configuration.cs 2007-11-23 18:58:09 UTC (rev 1086) @@ -89,14 +89,23 @@ Boolselect = xmlreader.GetValueAsBool(CurrentConfig, "Boolselect", false); Boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "Boolreturn", false); WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", ""); - wselectedlabel = xmlreader.GetValueAsString(CurrentConfig, "WSelectedLabel", ""); + 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", "."); DefaultCover = xmlreader.GetValueAsString(CurrentConfig, "DefaultCover", ""); - + AlwaysDefaultView = xmlreader.GetValueAsBool(CurrentConfig, "AlwaysDefaultView", false); + if (AlwaysDefaultView) + { + strIndex = -1; + LastID = -1; + Wstar = ""; + Boolreturn = false; + Boolselect = true; + Wselectedlabel = StrViewDfltText; + } } if (StrSelect == "") StrSelect = StrTitle1.ToString() + " not like ''"; @@ -106,7 +115,6 @@ StrSort = StrTitle1; if (StrSortSens == "") StrSortSens = " ASC"; - } @@ -149,7 +157,12 @@ get { return boolstorage; } set { boolstorage = value; } } - + private bool alwaysDefaultView = false; + public bool AlwaysDefaultView + { + get { return alwaysDefaultView; } + set { alwaysDefaultView = value; } + } // string variables private string strSelect = string.Empty; public string StrSelect @@ -452,8 +465,8 @@ 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.SetValueAsBool(currentConfig, "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); Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-11-23 18:58:09 UTC (rev 1086) @@ -251,7 +251,10 @@ if (Configuration.CurrentConfig.Length == 0) GUIWindowManager.ShowPreviousWindow(); - Fin_Charge_Init(false); + if (conf.AlwaysDefaultView) + Fin_Charge_Init(true); + else + 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 @@ -732,8 +735,8 @@ GUIControl.HideControl(GetID, 34); try { - if (!(conf.FileImage == conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString() || conf.FileImage == r[ItemId]["Picture"].ToString())) - { + //if (!(conf.FileImage == conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString() || conf.FileImage == r[ItemId]["Picture"].ToString())) + //{ //if (conf.FileImage != "9999") // ImgLstFilm.FreeResources(); // ImgLstFilm2.FreeResources(); @@ -745,7 +748,7 @@ conf.FileImage = conf.DefaultCover; ImgLstFilm.SetFileName(conf.FileImage); ImgLstFilm2.SetFileName(conf.FileImage); - } + //} } catch { @@ -778,7 +781,8 @@ //------------------------------------------------------------------------------------------- private bool control_searchText(string stext) { - Regex maRegexp = new Regex("^[a-zA-Z0-9]+$"); + //Regex maRegexp = new Regex("^[a-zA-Z0-9 ():-_\\[\\]$&%'\xA7=#\\/.<>!+\"+]+$"); + Regex maRegexp = new Regex("^[^*]+$"); bool regOK = maRegexp.IsMatch(stext); return regOK; } @@ -938,7 +942,7 @@ Wnb_enr++; else { - if (conf.Wstar == "*" || champselect.ToUpper().Contains(conf.Wstar.ToUpper())) + if (conf.Wstar == "*" || champselect.ToUpper().Contains(conf.Wstar.ToUpper())) { if (Wnb_enr > 0) { @@ -951,9 +955,17 @@ Wnb_enr = 1; wchampselect = champselect.ToString(); } - + else + if (Wnb_enr > 0) + { + item = new GUIListItem(); + item.Label = wchampselect.ToString(); + item.Label2 = Wnb_enr.ToString(); + facadeView.Add(item); + if (SelItem != "" && item.Label == SelItem) conf.StrIndex = facadeView.Count - 1; //test if this item is one to select + Wnb_enr = 0; + } - } } conf.StrTxtSelect = "Selection"; @@ -964,6 +976,7 @@ if ((conf.StrIndex > facadeView.Count - 1) || (conf.StrIndex < 0)) //check index within bounds, will be unless xml file heavily edited conf.StrIndex = 0; + GUIControl.ShowControl(GetID, 34); GUIPropertyManager.SetProperty("#nbobjects", facadeView.Count.ToString() + " " + GUILocalizeStrings.Get(127)); GUIControl.SelectItemControl(GetID, (int)Controls.CTRL_List, (int)conf.StrIndex); } @@ -1056,7 +1069,7 @@ conf.Boolselect = false; conf.Boolreturn = true; conf.WStrSort = conf.StrViewDfltItem; - conf.Wselectedlabel = ""; + //conf.Wselectedlabel = ""; if (conf.StrViewDfltItem == "DateAdded") conf.StrSelect = "Date" + " like '" + DateTime.Parse(conf.StrViewDfltText).ToShortDateString() + "'"; else @@ -1199,12 +1212,12 @@ if (newConfig != "") // if user escapes dialog or bad value leave system unchanged //if (newConfig != "" && newConfig != Configuration.CurrentConfig) // if user escapes dialog or bad value leave system unchanged - { + { //Change "Config": Configuration.SaveConfiguration(Configuration.CurrentConfig, facadeView.SelectedListItem.ItemId, facadeView.SelectedListItem.Label); Configuration.CurrentConfig = newConfig; Load_Config(newConfig, true); - Fin_Charge_Init(false); //need to load current selection as reloaded from myfilms.xml file to remember position + Fin_Charge_Init(conf.AlwaysDefaultView); //need to load default view as asked in setup or load current selection as reloaded from myfilms.xml file to remember position } return; } Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-23 18:58:09 UTC (rev 1086) @@ -321,7 +321,7 @@ if (!(control_searchNum(keyboard.Text) == null)) { r[MesFilms.conf.StrIndex]["Rating"] = keyboard.Text.ToString(); - Update_XML_database(false, ItemID, "Rating"); + Update_XML_database(false, ItemID, "Rating"); } else return; @@ -413,7 +413,8 @@ //------------------------------------------------------------------------------------------- private string control_searchNum(string stext) { - Regex maRegexp = new Regex("^[0-9]{1,2}[\\.,][0-9]{1}$"); + //Regex maRegexp = new Regex("^[0-9]{1,2}[\\.,][0-9]{1}$"); + Regex maRegexp = new Regex("^[0-9]{1,2}[\\.,]?[0-9]?$"); if (!maRegexp.IsMatch(stext)) { GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK); Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-23 18:58:09 UTC (rev 1086) @@ -123,6 +123,9 @@ this.label13 = new System.Windows.Forms.Label(); this.CatalogType = new System.Windows.Forms.ComboBox(); this.groupBox5 = new System.Windows.Forms.GroupBox(); + this.DutDefCov = new System.Windows.Forms.Button(); + this.DefaultCover = new System.Windows.Forms.TextBox(); + this.label19 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); this.TitleDelim = new System.Windows.Forms.TextBox(); this.label9 = new System.Windows.Forms.Label(); @@ -157,6 +160,7 @@ this.AntFilterItem1 = new System.Windows.Forms.ComboBox(); this.AntFilterText1 = new System.Windows.Forms.TextBox(); this.groupBox8 = new System.Windows.Forms.GroupBox(); + this.AlwaysDefaultView = new System.Windows.Forms.CheckBox(); this.label14 = new System.Windows.Forms.Label(); this.LayOut = new System.Windows.Forms.ComboBox(); this.View_Dflt_Item = new System.Windows.Forms.ComboBox(); @@ -186,9 +190,6 @@ this.ButSave = new System.Windows.Forms.Button(); this.Config_Dflt = new System.Windows.Forms.CheckBox(); this.Config_Menu = new System.Windows.Forms.CheckBox(); - this.DutDefCov = new System.Windows.Forms.Button(); - this.DefaultCover = new System.Windows.Forms.TextBox(); - this.label19 = new System.Windows.Forms.Label(); this.General.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox11.SuspendLayout(); @@ -213,7 +214,7 @@ this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(69, 13); this.label10.TabIndex = 34; - this.label10.Text = "Version 4.3.0"; + this.label10.Text = "Version 4.3.1"; // // textBox1 // @@ -259,7 +260,7 @@ this.General.Location = new System.Drawing.Point(12, 66); this.General.Name = "General"; this.General.SelectedIndex = 0; - this.General.Size = new System.Drawing.Size(755, 340); + this.General.Size = new System.Drawing.Size(755, 349); this.General.TabIndex = 46; // // tabPage1 @@ -278,7 +279,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(747, 314); + this.tabPage1.Size = new System.Drawing.Size(747, 323); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "General"; this.tabPage1.UseVisualStyleBackColor = true; @@ -478,6 +479,32 @@ this.groupBox5.TabStop = false; this.groupBox5.Text = "Title Order"; // + // DutDefCov + // + this.DutDefCov.Location = new System.Drawing.Point(401, 66); + this.DutDefCov.Name = "DutDefCov"; + this.DutDefCov.Size = new System.Drawing.Size(32, 22); + this.DutDefCov.TabIndex = 69; + this.DutDefCov.Text = "..."; + this.DutDefCov.UseVisualStyleBackColor = true; + this.DutDefCov.Click += new System.EventHandler(this.DutDefCov_Click); + // + // DefaultCover + // + this.DefaultCover.Location = new System.Drawing.Point(132, 68); + this.DefaultCover.Name = "DefaultCover"; + this.DefaultCover.Size = new System.Drawing.Size(259, 20); + this.DefaultCover.TabIndex = 68; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(8, 71); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(74, 13); + this.label19.TabIndex = 67; + this.label19.Text = "Default Poster"; + // // label17 // this.label17.AutoSize = true; @@ -596,7 +623,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(747, 314); + this.tabPage2.Size = new System.Drawing.Size(747, 323); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Optional"; this.tabPage2.UseVisualStyleBackColor = true; @@ -805,17 +832,28 @@ // // groupBox8 // + this.groupBox8.Controls.Add(this.AlwaysDefaultView); this.groupBox8.Controls.Add(this.label14); this.groupBox8.Controls.Add(this.LayOut); this.groupBox8.Controls.Add(this.View_Dflt_Item); this.groupBox8.Controls.Add(this.View_Dflt_Text); this.groupBox8.Location = new System.Drawing.Point(12, 221); this.groupBox8.Name = "groupBox8"; - this.groupBox8.Size = new System.Drawing.Size(347, 78); + this.groupBox8.Size = new System.Drawing.Size(347, 96); this.groupBox8.TabIndex = 26; this.groupBox8.TabStop = false; this.groupBox8.Text = "Default View"; // + // AlwaysDefaultView + // + this.AlwaysDefaultView.AutoSize = true; + this.AlwaysDefaultView.Location = new System.Drawing.Point(76, 71); + this.AlwaysDefaultView.Name = "AlwaysDefaultView"; + this.AlwaysDefaultView.Size = new System.Drawing.Size(253, 17); + this.AlwaysDefaultView.TabIndex = 75; + this.AlwaysDefaultView.Text = "Display Always that view when using this config"; + this.AlwaysDefaultView.UseVisualStyleBackColor = true; + // // label14 // this.label14.AutoSize = true; @@ -831,7 +869,8 @@ this.LayOut.Items.AddRange(new object[] { "List", "Small Icons", - "Large Icons"}); + "Large Icons", + "Filmstrip"}); this.LayOut.Location = new System.Drawing.Point(166, 44); this.LayOut.Name = "LayOut"; this.LayOut.Size = new System.Drawing.Size(112, 21); @@ -977,7 +1016,7 @@ this.tabPage3.Location = new System.Drawing.Point(4, 22); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(747, 314); + this.tabPage3.Size = new System.Drawing.Size(747, 323); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "DVDProfiler"; this.tabPage3.UseVisualStyleBackColor = true; @@ -1094,32 +1133,6 @@ this.Config_Menu.Text = "Display Always Configuration\'s Menu (if no Default Config)"; this.Config_Menu.UseVisualStyleBackColor = true; // - // DutDefCov - // - this.DutDefCov.Location = new System.Drawing.Point(401, 66); - this.DutDefCov.Name = "DutDefCov"; - this.DutDefCov.Size = new System.Drawing.Size(32, 22); - this.DutDefCov.TabIndex = 69; - this.DutDefCov.Text = "..."; - this.DutDefCov.UseVisualStyleBackColor = true; - this.DutDefCov.Click += new System.EventHandler(this.DutDefCov_Click); - // - // DefaultCover - // - this.DefaultCover.Location = new System.Drawing.Point(132, 68); - this.DefaultCover.Name = "DefaultCover"; - this.DefaultCover.Size = new System.Drawing.Size(259, 20); - this.DefaultCover.TabIndex = 68; - // - // label19 - // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(8, 71); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(74, 13); - this.label19.TabIndex = 67; - this.label19.Text = "Default Poster"; - // // MesFilmsSetup // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1266,6 +1279,7 @@ private Button DutDefCov; private TextBox DefaultCover; private Label label19; + private CheckBox AlwaysDefaultView; } } \ No newline at end of file Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-23 18:58:09 UTC (rev 1086) @@ -354,6 +354,8 @@ WLayOut = 1; if (LayOut.Text == "Large Icons") WLayOut = 2; + if (LayOut.Text == "Filmstrip") + WLayOut = 3; if (AntTitle2.Text.Length == 0) AntTitle2.Text = "(none)"; if (Config_Dflt.Checked) @@ -416,6 +418,7 @@ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "StrDfltSelect", StrDfltSelect); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "Dwp", crypto.Crypter(Dwp.Text)); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SearchFileName", SearchFileName.Checked); + MyFilms_xmlwriter.SetValueAsBool(Config_Name.Text.ToString(), "AlwaysDefaultView", AlwaysDefaultView.Checked); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "ItemSearchFileName", ItemSearchFileName.Text); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "DefaultCover", DefaultCover.Text); if (CatalogType.SelectedIndex == 1) @@ -509,6 +512,7 @@ SearchFileName.Checked = false; radioButton1.Checked = false; radioButton2.Checked = false; + AlwaysDefaultView.Checked = MyFilms_xmlreader.GetValueAsBool(Config_Name.Text.ToString(), "AlwaysDefaultView", false); DVDPTagField.ResetText(); if (MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "DVDPTagField", "") == "Category") radioButton1.Checked = true; @@ -604,6 +608,7 @@ radioButton2.Checked = false; DVDPTagField.ResetText(); SortTitle.Checked = false; + AlwaysDefaultView.Checked = false; } @@ -632,6 +637,7 @@ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "PathStorage"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SearchFileName"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ItemSearchFileName"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AlwaysDefaultView"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentItem"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentLabel"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle1"); Modified: trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml =================================================================== --- trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-22 17:27:30 UTC (rev 1085) +++ trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-23 18:58:09 UTC (rev 1086) @@ -147,7 +147,6 @@ <label>137</label> <textcolor>ff000000</textcolor> </control> - </control> <control> <type>fadelabel</type> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rs...@us...> - 2007-11-22 17:27:40
|
Revision: 1085 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1085&view=rev Author: rsparey Date: 2007-11-22 09:27:30 -0800 (Thu, 22 Nov 2007) Log Message: ----------- work on overlays and home screens Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogAlbumInfo.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogArtistInfo.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogSelect.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberProgress.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberResults.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvprogram.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvscheduler.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myweather.xml Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogAlbumInfo.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogAlbumInfo.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogAlbumInfo.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -4,40 +4,65 @@ <defaultcontrol>5</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <control> - <description>background image</description> + + + <control> <type>image</type> + <decription>mid_strip</decription> <id>1</id> - <width>1366</width> - <height>768</height> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + </control> - <control> + + <control> <type>image</type> + <decription>top-strip</decription> <id>1</id> - <posX>113</posX> - <posY>26</posY> - <texture>info_logo.png</texture> - <animation effect="fade" time="200">WindowOpen</animation> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> + </control> + + <control> <description>Album value</description> <type>label</type> <id>20</id> - <posX>417</posX> - <posY>66</posY> - <label>-</label> - <font>font16</font> - <align>left</align> - <textcolor>FFFFFFFF</textcolor> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <control> + <description>Image Title value</description> + <type>label</type> + <id>20</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posX>250</posX> + <posY>650</posY> + <width>1000</width> + <label>-</label> + <font>wipeout</font> + <align>Left</align> + <textcolor>ffffffff</textcolor> </control> + + + </control> + <control> <description>Artist</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>133</posY> <label>171</label> <font>font13</font> @@ -50,7 +75,7 @@ <description>Date of Release</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>160</posY> <label>201</label> <font>font13</font> @@ -63,7 +88,7 @@ <description>Rating</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>186</posY> <label>173</label> <font>font13</font> @@ -76,7 +101,7 @@ <description>Genre</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>213</posY> <label>174</label> <font>font13</font> @@ -89,7 +114,7 @@ <description>Tones</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>240</posY> <label>175</label> <font>font13</font> @@ -102,7 +127,7 @@ <description>Styles</description> <type>label</type> <id>1</id> - <posX>319</posX> + <posX>600</posX> <posY>266</posY> <label>176</label> <font>font13</font> @@ -115,7 +140,7 @@ <description>Artist value</description> <type>label</type> <id>21</id> - <posX>417</posX> + <posX>608</posX> <posY>133</posY> <label>-</label> <font>font13</font> @@ -127,7 +152,7 @@ <description>Date of Release value</description> <type>label</type> <id>22</id> - <posX>417</posX> + <posX>608</posX> <posY>160</posY> <label>-</label> <font>font13</font> @@ -139,7 +164,7 @@ <description>Rating value</description> <type>label</type> <id>23</id> - <posX>417</posX> + <posX>608</posX> <posY>186</posY> <label>-</label> <font>font13</font> @@ -151,7 +176,7 @@ <description>Genre value</description> <type>label</type> <id>24</id> - <posX>417</posX> + <posX>608</posX> <posY>213</posY> <label>-</label> <font>font13</font> @@ -163,7 +188,7 @@ <description>Tones value</description> <type>fadelabel</type> <id>25</id> - <posX>417</posX> + <posX>608</posX> <posY>240</posY> <width>733</width> <label>-</label> @@ -176,7 +201,7 @@ <description>Styles value</description> <type>fadelabel</type> <id>26</id> - <posX>417</posX> + <posX>608</posX> <posY>266</posY> <width>733</width> <label>-</label> @@ -189,10 +214,10 @@ <description>Album Art</description> <type>image</type> <id>3</id> - <posX>189</posX> - <posY>333</posY> - <width>133</width> - <height>133</height> + <posX>50</posX> + <posY>150</posY> + <width>200</width> + <height>200</height> <texture>-</texture> <colorkey>FFFF00FF</colorkey> <colordiffuse>FFFFFFFF</colordiffuse> @@ -204,8 +229,11 @@ <description>textarea</description> <type>textbox</type> <id>4</id> + <posx>808</posx> <posY>316</posY> - <width>796</width> + <width>500</width> + <height>300</height> + <align>lef</align> <onleft>5</onleft> <onright>5</onright> <onup>5</onup> @@ -218,7 +246,7 @@ <type>button</type> <id>5</id> <posX>189</posX> - <posY>506</posY> + <posY>490</posY> <width>132</width> <label>182</label> <onleft>4</onleft> @@ -233,7 +261,7 @@ <type>button</type> <id>6</id> <posX>189</posX> - <posY>554</posY> + <posY>538</posY> <width>132</width> <label>184</label> <font>font13</font> @@ -244,5 +272,6 @@ <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogArtistInfo.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogArtistInfo.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogArtistInfo.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -4,21 +4,37 @@ <defaultcontrol>5</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <control> - <description>background image</description> + + + + + <control> <type>image</type> + <decription>mid_strip</decription> <id>1</id> - <width>1366</width> - <height>768</height> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + </control> - <control> + + <control> <type>image</type> + <decription>top-strip</decription> <id>1</id> - <posX>113</posX> - <posY>26</posY> - <texture>info_logo.png</texture> - <animation effect="fade" time="200">WindowOpen</animation> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> + </control> <control> <description>Artist</description> @@ -222,6 +238,7 @@ <description>textarea</description> <type>textbox</type> <id>4</id> + <height>280</height> <posY>333</posY> <onleft>5</onleft> <onright>5</onright> @@ -234,8 +251,8 @@ <description>Bio/Albums</description> <type>button</type> <id>5</id> - <posX>189</posX> - <posY>506</posY> + <posX>189</posX> + <posY>490</posY> <width>120</width> <label>689</label> <onleft>4</onleft> @@ -249,8 +266,8 @@ <description>Refresh</description> <type>button</type> <id>6</id> - <posX>189</posX> - <posY>554</posY> + <posX>189</posX> + <posY>538</posY> <width>120</width> <label>184</label> <font>font13</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogSelect.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogSelect.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/DialogSelect.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -5,12 +5,33 @@ <allowoverlay>no</allowoverlay> <controls> <control> - <description>background image</description> <type>image</type> + <decription>mid_strip</decription> <id>1</id> - <width>1366</width> - <height>768</height> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + </control> + + <control> + <type>image</type> + <decription>top-strip</decription> + <id>1</id> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + </control> <control> <type>image</type> <id>1</id> @@ -20,20 +41,8 @@ <animation effect="fade" time="200">WindowOpen</animation> <animation effect="fade" time="200">WindowClose</animation> </control> + <control> - <description>Select text label</description> - <type>label</type> - <id>4</id> - <posX>474</posX> - <posY>93</posY> - <label>181</label> - <font>font16</font> - <align>right</align> - <textcolor>ffffffff</textcolor> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> - </control> - <control> <description>Number of Files Label</description> <type>label</type> <id>1</id> @@ -47,27 +56,62 @@ </control> <control> <description>Selected item Label</description> - <type>label</type> - <id>1</id> - <posX>1252</posX> - <posY>93</posY> - <label>#selecteditem</label> - <font>font13</font> - <align>right</align> - <textcolor>ffffffff</textcolor> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <type>fadelabel</type> + <id>1</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posX>250</posX> + <posY>650</posY> + <width>700</width> + <label>#selecteditem</label> + <font>wipeout</font> + <align>Left</align> + <textcolor>ffffffff</textcolor> </control> <control> <description>albums listcontrol</description> <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> - <id>3</id> - <onleft>5</onleft> - <onright>5</onright> - <onup>5</onup> - <ondown>5</ondown> - <animation effect="fade" time="200">WindowOpen</animation> - <animation effect="fade" time="200">WindowClose</animation> + <description>listcontrol</description> + <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> + <id>3</id> + <onleft>5</onleft> + <onright>5</onright> + <onup>5</onup> + <ondown>5</ondown> + <posX>542</posX> + <posY>140</posY> + <width>800</width> + <height>500</height> + <spinWidth>28</spinWidth> + <spinHeight>28</spinHeight> + <spinPosX>1260</spinPosX> + <spinPosY>592</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> + <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>IMDB</description> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberProgress.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberProgress.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberProgress.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -4,11 +4,32 @@ <defaultcontrol>30</defaultcontrol> <allowoverlay>no</allowoverlay> <controls> - <control> + <control> <type>image</type> - <description>background image</description> + <decription>top-strip</decription> <id>1</id> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + </control> + <control> + <type>image</type> + <decription>mid_strip</decription> + <id>1</id> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + + </control> + <control> <type>image</type> <description>Title image</description> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberResults.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberResults.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/MyMusicCoverArtGrabberResults.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -6,9 +6,52 @@ <controls> <control> <type>image</type> - <description>background image</description> + <decription>top-strip</decription> <id>1</id> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + </control> + + <control> + <type>image</type> + <decription>mid_strip</decription> + <id>1</id> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <animation effect="fade" time="200">WindowOpen</animation> + <animation effect="fade" time="200">WindowClose</animation> + + + </control> + + + + <control> + <id>10</id> + <type>image</type> + <posX>165</posX> + <posY>170</posY> + <width>280</width> + <height>280</height> + <texture flipY="true" diffuse="Thumb_Mask.png">-</texture> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>112</posX> + <posY>150</posY> + <width>360</width> + <height>308</height> + <texture flipY="true" diffuse="Thumb_Mask.png">cd_box.png</texture> + + </control> <control> <type>image</type> <description>Title image</description> @@ -22,7 +65,7 @@ <description>Album Art image</description> <id>10</id> <posX>121</posX> - <posY>138</posY> + <posY>150</posY> <width>168</width> <height>168</height> <texture>-</texture> @@ -44,8 +87,8 @@ <type>label</type> <description>Album Cover Art Label</description> <id>11</id> - <posX>121</posX> - <posY>308</posY> + <posX>201</posX> + <posY>510</posY> <label>4519</label> <font>font10</font> <textcolor>ffb2d4f5</textcolor> @@ -96,40 +139,59 @@ <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> <description>album view listcontrol</description> <id>25</id> - <posX>478</posX> - <posY>309</posY> - <height>452</height> - <onleft>20</onleft> - <onright>25</onright> - <onup>25</onup> - <ondown>25</ondown> - <textcolor>FFFFFFFF</textcolor> - <subtype>album</subtype> - <selectedColor2>FFFF6600</selectedColor2> - <font2>font13</font2> - <textXOff2>677</textXOff2> - <IconYOff>10</IconYOff> - <textYOff>5</textYOff> - <font>font13</font> - <textXOff>11</textXOff> - <itemHeight>94</itemHeight> - <textureHeight>120</textureHeight> - <selectedColor>FFFF6600</selectedColor> - <itemWidth>94</itemWidth> - <IconXOff>18</IconXOff> - <spaceBetweenItems>13</spaceBetweenItems> - <spinPosX>1119</spinPosX> - <suffix> | </suffix> - <textcolor2>FFFFFFFF</textcolor2> - <textYOff2>80</textYOff2> - <unfocusedAlpha>170</unfocusedAlpha> + <posX>542</posX> + <posY>250</posY> + <width>800</width> + <height>300</height> + + <spinWidth>28</spinWidth> + <spinHeight>28</spinHeight> + <spinPosX>1250</spinPosX> + <spinPosY>592</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> + + <onleft>2</onleft> + <onright>11</onright> + <onup>2</onup> + <ondown>2</ondown> + + <font>font14</font> + <font2>font10</font2> + <font3>font10</font3> + <textXOff>12</textXOff> + <textXOff2>800</textXOff2> + <textXOff3>92</textXOff3> + <textYOff>12</textYOff> + <textYOff2>12</textYOff2> + <textYOff3>48</textYOff3> + <IconXOff>10</IconXOff> + <IconYOff>10</IconYOff> + <textcolor2>ffffffff</textcolor2> + <textcolor3>ffccef61</textcolor3> + + <itemHeight>70</itemHeight> + <itemWidth>75</itemWidth> + <textureHeight>132</textureHeight> + <keepaspectratio>yes</keepaspectratio> + + <textureFocus>recording_background_focus.png</textureFocus> + <textureNoFocus>recording_background_nofocus.png</textureNoFocus> + <textureHeight>85</textureHeight> + + <animation effect="fade" time="500" delay="500">WindowOpen</animation> + <animation effect="fade" time="100" delay="0">WindowClose</animation> + <dimColor>0x10ffffff</dimColor> </control> <control> <type>button</type> <description>Skip button</description> <id>20</id> <posX>121</posX> - <posY>554</posY> + <posY>504</posY> <onleft>20</onleft> <onright>25</onright> <onup>20</onup> @@ -142,7 +204,7 @@ <description>Cancel button</description> <id>21</id> <posX>121</posX> - <posY>597</posY> + <posY>547</posY> <onleft>21</onleft> <onright>25</onright> <onup>20</onup> @@ -150,5 +212,7 @@ <label>222</label> <width>168</width> </control> + + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvprogram.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvprogram.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvprogram.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -2,7 +2,7 @@ <window> <id>748</id> <defaultcontrol>2</defaultcontrol> - <allowoverlay>no</allowoverlay> + <allowoverlay>yes</allowoverlay> <controls> <import>common.window.xml</import> @@ -57,148 +57,415 @@ <animation effect="fade" time="500" start="50">WindowClose</animation> </control> + <control> + <type>image</type> + <decription>top-strip</decription> + <id>1</id> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + </control> + <control> + <type>image</type> + <decription>lowbar info block</decription> + <id>1</id> + <posX>12</posX> + <posY>590</posY> + <width>1342</width> + <height>168</height> + <texture>lowbar.png</texture> + </control> + <control> + <description>home BM Radio</description> + <type>button</type> + <id>04081980</id> + <posX>1002</posX> + <posY>635</posY> + <width>50</width> + <height>100</height> + <textureFocus>Radio.png</textureFocus> + <textureNoFocus>Radio.png</textureNoFocus> + <thumbZoom>yes</thumbZoom> + <hyperlink>30</hyperlink> + <label>665</label> + <textcolor>00ffffff</textcolor> + <textcolorNoFocus>00ffffff</textcolorNoFocus> + <onleft>7</onleft> + <onright>05081980</onright> + <onup>10</onup> + <ondown>21</ondown> + <animation effect="fade" time="1000" delay="1000" >WindowOpen</animation> + <animation effect="fade" time="1000">WindowClose</animation> + <animation effect="zoom" start="100,100" end="140,140" center="1027,685" time="300" acceleration ="-1" >Focus</animation> - <control> - <type>group</type> - <layout>StackLayout</layout> - <description>group element</description> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - <posX>113</posX> - <posY>129</posY> - <control> - <description>Record</description> - <type>button</type> - <id>2</id> - <label /> - <onup>17</onup> - <ondown>3</ondown> - <onright>10</onright> - </control> - <control> - <description>Advanced Record</description> - <type>button</type> - <id>3</id> + <animation effect="zoom" start="140,140" end="100,100" center="1027,685" time="300" acceleration ="-1" >Unfocus</animation> + </control> + <control> + <description>home BM Video</description> + <type>button</type> + <id>05081980</id> + <posX>1073</posX> + <posY>635</posY> + <width>50</width> + <height>100</height> + <textureFocus>Video.png</textureFocus> + <textureNoFocus>Video.png</textureNoFocus> + <hyperlink>6</hyperlink> + <hover>-</hover> + <hoverX>502</hoverX> + <hoverY>250</hoverY> + <hoverWidth>272</hoverWidth> + <hoverHeight>306</hoverHeight> + <label>3</label> + <textcolor>00ffffff</textcolor> + <textcolorNoFocus>00ffffff</textcolorNoFocus> + <onleft>04081980</onleft> + <onright>06081980</onright> + <onup>99</onup> + <ondown>21</ondown> + <animation effect="fade" time="1000" delay="750" >WindowOpen</animation> + <animation effect="fade" time="1000" delay="250" >WindowClose</animation> + <animation effect="zoom" start="100,100" end="140,140" center="1098,685" time="300" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="140,140" end="100,100" center="1098,685" time="300" acceleration ="-1" >Unfocus</animation> + </control> + + <control> + <description>home Music</description> + <type>button</type> + <id>06081980</id> + <posX>1143</posX> + <posY>635</posY> + <width>50</width> + <height>100</height> + <textureFocus>Music.png</textureFocus> + <textureNoFocus>Music.png</textureNoFocus> + <hyperlink>501</hyperlink> + <label>605</label> + <textcolor>00ffffff</textcolor> + <textcolorNoFocus>00ffffff</textcolorNoFocus> + <hover>-</hover> + <hoverX>502</hoverX> + <hoverY>250</hoverY> + <hoverWidth>272</hoverWidth> + <hoverHeight>306</hoverHeight> + <onleft>05081980</onleft> + <onright>07081980</onright> + <onup>99</onup> + <ondown>21</ondown> + <animation effect="fade" time="1000" delay="500" >WindowOpen</animation> + <animation effect="fade" time="1000" delay="500">WindowClose</animation> + <animation effect="zoom" start="100,100" end="140,140" center="1168,685" time="300" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="140,140" end="100,100" center="1165,685" time="300" acceleration ="-1" >Unfocus</animation> + </control> + + <control> + <description>home Pictures</description> + <type>button</type> + <id>07081980</id> + <posX>1213</posX> + <posY>635</posY> + <width>50</width> + <height>100</height> + <textureFocus>Pictures.png</textureFocus> + <textureNoFocus>Pictures.png</textureNoFocus> + <hyperlink>2</hyperlink> + <label>1</label> + <textcolor>00ffffff</textcolor> + <textcolorNoFocus>00ffffff</textcolorNoFocus> + <hover>-</hover> + <hoverX>502</hoverX> + <hoverY>250</hoverY> + <hoverWidth>272</hoverWidth> + <hoverHeight>306</hoverHeight> + <onleft>06081980</onleft> + <onright>2</onright> + <onup>99</onup> + <ondown>21</ondown> + <animation effect="fade" time="1000" delay="500" >WindowOpen</animation> + <animation effect="fade" time="1000" delay="500">WindowClose</animation> + <animation effect="zoom" start="100,100" end="140,140" center="1238,685" time="300" acceleration ="-1" >Focus</animation> + <animation effect="zoom" start="140,140" end="100,100" center="1238,685" time="300" acceleration ="-1" >Unfocus</animation> + </control> + + + + <control> + <description>RECORDED TV</description> + <type>button</type> + <id>2</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + <posY>100</posY> + <posX>12</posX> + <height>36</height> + <width>209</width> + <align>left</align> + <textureFocus>tab_left_corner_down.png</textureFocus> + <textureNoFocus>tab_left_corner_up.png</textureNoFocus> + <label /> + + <font>font14</font> + + <onup>41</onup> + <ondown>3</ondown> + <onleft>07081980</onleft> + <onright>5</onright> + </control> + <control> + <description>Advanced Record</description> + <type>button</type> + <id>3</id> <label>1038</label> - <onup>2</onup> - <ondown>4</ondown> - <onright>10</onright> - </control> - <control> - <description>Keep</description> - <type>button</type> - <id>4</id> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>136</posY> + <posX>12</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>07081980</onleft> + <onright>5</onright> + <onup>2</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + + <visible>Control.HasFocus(2)|Control.HasFocus(3)|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>Alert Me</description> + <type>button</type> + <id>5</id> + <label>1040</label> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>221</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>2</onleft> + <onright>6</onright> + <onup>2</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + + + </control> + + + <control> + <description>Keep untill</description> + <type>button</type> + <id>4</id> <label>1042</label> - <onup>2</onup> - <ondown>5</ondown> - <onright>10</onright> - </control> - <control> - <description>Notify</description> - <type>togglebutton</type> - <id>5</id> - <label>1040</label> - <width>253</width> - <font>font13</font> - <textcolor>White</textcolor> - <colordiffuse>White</colordiffuse> - <disabledcolor>#60ffffff</disabledcolor> - <onup>4</onup> - <ondown>6</ondown> - <onright>10</onright> - </control> - <control> - <description>Quality</description> - <type>button</type> - <id>6</id> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>639</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>6</onleft> + <onright>8</onright> + <onup>2</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + + + </control> + + <control> + <description>Quality</description> + <type>button</type> + <id>6</id> <label>882</label> - <onup>5</onup> - <ondown>7</ondown> - <onright>10</onright> - </control> - <control> - <description>Episodes</description> - <type>button</type> - <id>7</id> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>430</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>5</onleft> + <onright>4</onright> + <onup>2</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + + </control> + + <control> + <description>Pre Record</description> + <type>button</type> + <id>8</id> + <label>1444</label> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>848</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>4</onleft> + <onright>7</onright> + <onup>2</onup> + <ondown>9</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + + </control> + <control> + <description>Post Record</description> + <type>button</type> + <id>9</id> + <label>1445</label> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>136</posY> + <posX>848</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>4</onleft> + <onright>7</onright> + <onup>8</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + + <visible>Control.HasFocus(8)|Control.HasFocus(9)</visible> + <animation effect="fade" time="250">visiblechange</animation> + <animation effect="slide" start="0,-36" end="0,0" time="250">visiblechange</animation> + </control> + <control> + <description>Episode Managment</description> + <type>button</type> + <id>7</id> <label>888</label> - <onup>6</onup> - <ondown>8</ondown> - <onright>10</onright> + + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>1057</posX> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>8</onleft> + <onright>04081980</onright> + <onup>2</onup> + <ondown>10</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <animation effect="slide" time="500" start="1000,0" end="0,0" delay="100" acceleration="-1">WindowOpen</animation> + <animation effect="fade" time="400" delay="100">WindowOpen</animation> + + </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>650</posY> + <width>700</width> + <label>#selecteditem</label> + <font>wipeout</font> + <align>Left</align> + <textcolor>ffffffff</textcolor> + </control> + + + <control> + <type>listcontrol</type> + + <description>recordings icon control</description> + <id>10</id> + + <onleft>2</onleft> + <onright>04081980</onright> + <onup>2</onup> + <ondown>04081980</ondown> + <posX>542</posX> + <posY>140</posY> + <width>800</width> + <height>500</height> + + <spinWidth>28</spinWidth> + <spinHeight>28</spinHeight> + <spinPosX>1250</spinPosX> + <spinPosY>592</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> + + <onleft>2</onleft> + <onright>11</onright> + <onup>2</onup> + <ondown>2</ondown> + + <font>font14</font> + <font2>font10</font2> + <font3>font10</font3> + <textXOff>12</textXOff> + <textXOff2>800</textXOff2> + <textXOff3>92</textXOff3> + <textYOff>12</textYOff> + <textYOff2>12</textYOff2> + <textYOff3>48</textYOff3> + <IconXOff>10</IconXOff> + <IconYOff>10</IconYOff> + <textcolor2>ffffffff</textcolor2> + <textcolor3>ffccef61</textcolor3> + + <itemHeight>70</itemHeight> + <itemWidth>75</itemWidth> + <textureHeight>132</textureHeight> + <keepaspectratio>yes</keepaspectratio> + + <textureFocus>recording_background_focus.png</textureFocus> + <textureNoFocus>recording_background_nofocus.png</textureNoFocus> + <textureHeight>85</textureHeight> + + <animation effect="fade" time="500" delay="500">WindowOpen</animation> + <animation effect="fade" time="100" delay="0">WindowClose</animation> + <dimColor>0x10ffffff</dimColor> </control> - <control> - <description>PreRecord</description> - <type>button</type> - <id>8</id> - <label>1444</label> - <onup>7</onup> - <ondown>9</ondown> - <onright>10</onright> - </control> - <control> - <description>PostRecord</description> - <type>button</type> - <id>9</id> - <label>1445</label> - <onup>8</onup> - <ondown>99</ondown> - <onright>10</onright> - </control> - </control> + <control> - <description>upcoming episodes label</description> - <type>label</type> - <id>11</id> - <posX>493</posX> - <posY>373</posY> - <label>1041</label> - <align>left</align> - <font>font13</font> - <textcolor>FFB2D4F5</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <control> - <description>upcoming episodes listcontrol</description> - <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> - <id>10</id> - <posX>493</posX> - <posY>400</posY> - <width>789</width> - <height>333</height> - <textXOff>55</textXOff> - <textYOff>4</textYOff> - <textXOff2>766</textXOff2> - <textYOff2>36</textYOff2> - <textXOff3>189</textXOff3> - <textYOff3>38</textYOff3> - <IconXOff>22</IconXOff> - <IconYOff>10</IconYOff> - <PinIconXOff>45</PinIconXOff> - <PinIconYOff>19</PinIconYOff> - <spinPosX>1100</spinPosX> - <itemWidth>46</itemWidth> - <itemHeight>46</itemHeight> -<!-- <textureFocus>recording_background_focus.png</textureFocus> - <textureNoFocus>recording_background_nofocus.png</textureNoFocus> --> - <spaceBetweenItems>6</spaceBetweenItems> - <textureHeight>66</textureHeight> -<!-- <textureWidth>138</textureWidth> --> - <keepaspectratio>no</keepaspectratio> - <font2>font10</font2> - <font3>font10</font3> - <onleft>2</onleft> - <onright>2</onright> - <onup>2</onup> - <ondown>2</ondown> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <control> <description>Current program title</description> <type>fadelabel</type> - <id>13</id> - <posX>493</posX> - <posY>133</posY> + <id>13</id> + <posX>12</posX> + <posY>175</posY> <width>333</width> <label /> <font>font13</font> @@ -210,8 +477,8 @@ <description>Current program time</description> <type>label</type> <id>14</id> - <posX>493</posX> - <posY>160</posY> + <posX>250</posX> + <posY>175</posY> <label /> <align>left</align> <font>font13</font> @@ -223,10 +490,10 @@ <description>Description1</description> <type>textboxscrollup</type> <id>15</id> - <posX>493</posX> + <posX>12</posX> <posY>195</posY> - <width>789</width> - <height>165</height> + <width>550</width> + <height>500</height> <label>#TV.RecordedTV.Description</label> <font>font13</font> <textcolor>FFFFFFF0</textcolor> @@ -237,8 +504,8 @@ <description>Current program channel</description> <type>fadelabel</type> <id>16</id> - <posX>1271</posX> - <posY>133</posY> + <posX>400</posX> + <posY>140</posY> <width>150</width> <label></label> <align>right</align> @@ -251,29 +518,94 @@ <description>genre</description> <type>label</type> <id>17</id> - <posX>1271</posX> - <posY>160</posY> + <posX>410</posX> + <posY>140</posY> <label /> - <align>right</align> + <align>left</align> <font>font13</font> <textcolor>FFB2D4F5</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> + + + <control> + <type>image</type> + <decription>mid_strip</decription> + <id>1</id> + <posX>12</posX> + <posY>136</posY> + <width>1342</width> + <height>455</height> + <texture>mid_strip.png</texture> + <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + + + + </control> + + + <control> + <type>image</type> + <description> mid selection box</description> + <id>1</id> + <posX>582</posX> + <posY>314</posY> + <width>203</width> + <height>140</height> + <texture>osd_mid box.png</texture> + <visible>Control.HasFocus(04081980)|Control.HasFocus(05081980)|Control.HasFocus(06081980)|Control.HasFocus(07081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> + <type>image</type> + <description> mid selection box - radio</description> + <id>1</id> + <posX>633</posX> + <posY>325</posY> + <width>100</width> + <height>200</height> + <texture>Radio.png</texture> + <visible>Control.HasFocus(04081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> + <type>image</type> + <description> mid selection box - Video</description> + <id>1</id> + <posX>633</posX> + <posY>325</posY> + <width>100</width> + <height>200</height> + <texture>Video.png</texture> + <visible>Control.HasFocus(05081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> + <type>image</type> + <description> mid selection box - music</description> + <id>1</id> + <posX>633</posX> + <posY>325</posY> + <width>100</width> + <height>200</height> + <texture>Music.png</texture> + <visible>Control.HasFocus(06081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> + <type>image</type> + <description> mid selection box - photo</description> + <id>1</id> + <posX>633</posX> + <posY>325</posY> + <width>100</width> + <height>200</height> + <texture>Pictures.png</texture> + <visible>Control.HasFocus(07081980)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> - <control> - <description>TV preview window</description> - <type>videowindow</type> - <id>99</id> - <posX>163</posX> - <posY>574</posY> - <width>180</width> - <height>144</height> - <onup>5</onup> - <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/mytvscheduler.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvscheduler.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvscheduler.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -422,7 +422,7 @@ <posX>20</posX> <posY>170</posY> <width>500</width> - <height>300</height> + <height>170</height> <align>Center</align> <colordiffuse>ffffffff</colordiffuse> <font>font14</font> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvsearch.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -2,7 +2,7 @@ <window> <id>604</id> <defaultcontrol>10</defaultcontrol> - <allowoverlay>no</allowoverlay> + <allowoverlay>yes</allowoverlay> <controls> <import>common.window.xml</import> <import>common.time.xml</import> @@ -73,7 +73,57 @@ <height>168</height> <texture>lowbar.png</texture> </control> + + <control> + <description>Number of Files Label</description> + <type>label</type> + <id>12</id> + <posX>5000</posX> + <posY>706</posY> + <label>#itemcount</label> + <font>font13</font> + <align>left</align> + <textcolor>FFFFFFFF</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> <control> + <description>Selected item Label</description> + <type>fadelabel</type> + <id>1</id> + <posX>1252</posX> + <posY>93</posY> + <width>533</width> + <label>#selecteditem</label> + <font>font13</font> + <align>right</align> + <textcolor>ffffffff</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> + <description>Selected item Label</description> + <type>fadelabel</type> + <id>1</id> + <posX>1252</posX> + <posY>93</posY> + <width>533</width> + <label>#selecteditem</label> + <font>font13</font> + <align>right</align> + <textcolor>ffffffff</textcolor> + <animation effect="fade" time="250">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + <visible>Control.HasFocus(10)|Control.HasFocus(11)</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + + + <control> <description>home BM Radio</description> <type>button</type> <id>04081980</id> @@ -280,12 +330,12 @@ </control> - <control> <type>group</type> <description>group element</description> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> + <visable>yes</visable> <control> <description>listcontrol</description> <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> @@ -321,7 +371,7 @@ <downloadColor>ff80ff80</downloadColor> <textXOff>32</textXOff> <textYOff>7</textYOff> - <textXOff2>1250</textXOff2> + <textXOff2>100</textXOff2> <textYOff2>7</textYOff2> <textXOff3>1300</textXOff3> <textYOff3>7</textYOff3> @@ -333,7 +383,10 @@ <description>scheduler recordings listcontrol</description> <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> <id>11</id> - + <subitems> + <subitem>=370</subitem> + <subitem>=450</subitem> + </subitems> <onleft>2</onleft> <onright>04081980</onright> <onup>2</onup> @@ -352,12 +405,8 @@ <textureDown>page_down_nofocus.png</textureDown> <textureUpFocus>page_up_focus.png</textureUpFocus> <textureDownFocus>page_down_focus.png</textureDownFocus> + - <onleft>2</onleft> - <onright>11</onright> - <onup>2</onup> - <ondown>2</ondown> - <font>font14</font> <font2>font10</font2> <font3>font10</font3> @@ -606,5 +655,11 @@ <animation effect="fade" time="250">visiblechange</animation> </control> + + + + + + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myweather.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myweather.xml 2007-11-22 13:09:44 UTC (rev 1084) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myweather.xml 2007-11-22 17:27:30 UTC (rev 1085) @@ -79,60 +79,106 @@ <texture>lowbar.png</texture> </control> - + <control> + <description>Images Button</description> + <type>button</type> + <id>2</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>12</posX> + <label>716</label> + <font>font14</font> + <onleft>07081980</onleft> + <onright>3</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> + <type>button</type> + <id>3</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>221</posX> + <label>185</label> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>2</onleft> + <onright>6</onright> + <onup>21</onup> + <ondown>50</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + + </control> + + <control> + <description>4 Day forcast</description> + <type>button</type> + <id>4</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>430</posX> + <label>185</label> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>3</onleft> + <onright>8</onright> + <onup>21</onup> + <ondown>50</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <textcolor>white</textcolor> + </control> + <control> + <description>Locaton Button</description> + <type>button</type> + <id>5</id> + <animation effect="fade" time="400">WindowClose</animation> + <animation effect="fade" time="400">WindowOpen</animation> + <posY>100</posY> + <posX>639</posX> + <label>1028</label> + <font>font14</font> + <width>209</width> + <height>36</height> + <onleft>6</onleft> + <onright>9</onright> + <onup>21</onup> + <ondown>50</ondown> + <textureFocus>tab_down.png</textureFocus> + <textureNoFocus>tab_up.png</textureNoFocus> + <textcolor>white</textcolor> + </control> + <control> - <type>group</type> - <animation effect="slide" time="400" start="-300,0">WindowOpen</animation> - <animation effect="slide" time="400" end="0,-300">WindowClose</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - <description>group element</description> - <layout>StackLayout</layout> - <posX>113</posX> - <posY>129</posY> - <control> - <description>Switch Button</description> - <type>button</type> - <id>2</id> - <label>716</label> - <onup>17</onup> - </control> - <control> - <description>Refresh Button</description> - <type>button</type> - <id>3</id> - <label>184</label> - </control> - <control> - <description>View Button</description> - <type>button</type> - <id>4</id> - <label>185</label> - </control> - <control> - <description>weather location select</description> - <type>button</type> - <id>5</id> - <label>1028</label> - <ondown>2</ondown> - </control> - </control> - <control> <description>TWC Logo</description> <type>image</type> <id>101</id> - <posX>120</posX> - <posY>489</posY> - <width>144</width> - <height>165</height> + <posX>1265</posX> + <posY>500</posY> + <width>72</width> + <height>83</height> <texture>weather_channel.png</texture> </control> <control> <description>Current Temp static label</description> <type>label</type> <id>223</id> - <posX>747</posX> - <posY>200</posY> + <posX>12</posX> + <posY>300</posY> <label>Temp</label> <font>font13</font> <textcolor>White</textcolor> @@ -141,8 +187,8 @@ <description>current feels like static label</description> <type>label</type> <id>224</id> - <posX>747</posX> - <posY>233</posY> + <posX>12</posX> + <posY>333</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -151,8 +197,8 @@ <description>current UV Index static label</description> <type>label</type> <id>225</id> - <posX>747</posX> - <posY>266</posY> + <posX>12</posX> + <posY>366</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -161,8 +207,8 @@ <description>current wind static label</description> <type>label</type> <id>226</id> - <posX>747</posX> - <posY>300</posY> + <posX>12</posX> + <posY>400</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -171,8 +217,8 @@ <description>current dew static label</description> <type>label</type> <id>227</id> - <posX>747</posX> - <posY>333</posY> + <posX>12</posX> + <posY>433</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -181,8 +227,8 @@ <description>current humidity static label</description> <type>label</type> <id>228</id> - <posX>747</posX> - <posY>366</posY> + <posX>12</posX> + <posY>466</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -201,7 +247,7 @@ <description>sun rise static label</description> <type>label</type> <id>71</id> - <posX>747</posX> + <posX>12</posX> <posY>400</posY> <label>-</label> <font>font13</font> @@ -221,7 +267,7 @@ <description>sun set static label</description> <type>label</type> <id>73</id> - <posX>747</posX> + <posX>12</posX> <posY>433</posY> <label>-</label> <font>font13</font> @@ -231,19 +277,20 @@ <description>location label</description> <type>label</type> <id>10</id> - <posX>1252</posX> - <posY>93</posY> - <label>-</label> - <font>font13</font> - <align>right</align> - <textcolor>White</textcolor> + <posX>250</posX> + <posY>650</posY> + <width>700</width> + <label>-</label> + <font>wipeout</font> + <align>Left</align> + <textcolor>ffffffff</textcolor> </control> <control> <description>update time label</description> <type>label</type> <id>11</id> - <posX>747</posX> - <posY>153</posY> + <posX>12</posX> + <posY>150</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -252,8 +299,8 @@ <description>current weather icon</description> <type>image</type> <id>21</id> - <posX>474</posX> - <posY>173</posY> + <posX>12</posX> + <posY>160</posY> <texture>-</texture> <colorkey>FFFF00FF</colorkey> <colordiffuse>White:#20</colordiffuse> @@ -262,8 +309,8 @@ <description>current condition label</description> <type>label</type> <id>22</id> - <posX>474</posX> - <posY>366</posY> + <posX>150</posX> + <posY>180</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -272,8 +319,8 @@ <description>current temp label</description> <type>label</type> <id>23</id> - <posX>948</posX> - <posY>200</posY> + <posX>200</posX> + <posY>300</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -282,8 +329,8 @@ <description>current feels like label</description> <type>label</type> <id>24</id> - <posX>948</posX> - <posY>233</posY> + <posX>200</posX> + <posY>333</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -292,8 +339,8 @@ <description>current UV Index label</description> <type>label</type> <id>25</id> - <posX>948</posX> - <posY>266</posY> + <posX>200</posX> + <posY>366</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -302,8 +349,8 @@ <description>current wind label</description> <type>label</type> <id>26</id> - <posX>948</posX> - <posY>300</posY> + <posX>200</posX> + <posY>400</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -312,8 +359,8 @@ <description>current dew label</description> <type>label</type> <id>27</id> - <posX>948</posX> - <posY>333</posY> + <posX>200</posX> + <posY>433</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -322,8 +369,8 @@ <description>current humidity label</description> <type>label</type> <id>28</id> - <posX>948</posX> - <posY>366</posY> + <posX>200</posX> + <posY>466</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -332,8 +379,8 @@ <description>day 0 label</description> <type>label</type> <id>31</id> - <posX>379</posX> - <posY>440</posY> + <posX>500</posX> + <posY>150</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -342,8 +389,8 @@ <description>day 0 Hi label</description> <type>label</type> <id>32</id> - <posX>379</posX> - <posY>473</posY> + <posX>500</posX> + <posY>180</posY> <label>-</label> <font>font13</font> <textcolor>White</textcolor> @@ -352,8 +399,8 @@ <description>day 0 low label</description> <type>label</type> <id>33</id> - <posX>379</posX> - <posY>506</posY> + <posX>50... [truncated message content] |
From: <chr...@us...> - 2007-11-22 13:09:46
|
Revision: 1084 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1084&view=rev Author: chreekar Date: 2007-11-22 05:09:44 -0800 (Thu, 22 Nov 2007) Log Message: ----------- The release version of 1.7 Modified Paths: -------------- trunk/plugins/MyEmulators/output.rar 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: <chr...@us...> - 2007-11-22 13:09:09
|
Revision: 1083 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1083&view=rev Author: chreekar Date: 2007-11-22 05:09:04 -0800 (Thu, 22 Nov 2007) Log Message: ----------- Readme update on version info Modified Paths: -------------- trunk/plugins/MyEmulators/Readme.txt Modified: trunk/plugins/MyEmulators/Readme.txt =================================================================== --- trunk/plugins/MyEmulators/Readme.txt 2007-11-21 21:06:32 UTC (rev 1082) +++ trunk/plugins/MyEmulators/Readme.txt 2007-11-22 13:09:04 UTC (rev 1083) @@ -8,6 +8,8 @@ ------------------------------------------- v1.7 -Built for MP 0.2.3.0 +-Fixed bugs with paths to thumbs and data- + base, fixing error with SQLite: CANTOPEN v1.6 -Solved problem when returning from This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fer...@us...> - 2007-11-21 21:06:38
|
Revision: 1082 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1082&view=rev Author: fergusod Date: 2007-11-21 13:06:32 -0800 (Wed, 21 Nov 2007) Log Message: ----------- Modified regex string for changes in playnowmenu format. Modified Paths: -------------- trunk/plugins/Netflix manager/NetflixManager.suo trunk/plugins/Netflix manager/Netflixmanager.cs Modified: trunk/plugins/Netflix manager/NetflixManager.suo =================================================================== (Binary files differ) Modified: trunk/plugins/Netflix manager/Netflixmanager.cs =================================================================== --- trunk/plugins/Netflix manager/Netflixmanager.cs 2007-11-21 11:29:16 UTC (rev 1081) +++ trunk/plugins/Netflix manager/Netflixmanager.cs 2007-11-21 21:06:32 UTC (rev 1082) @@ -46,9 +46,12 @@ static Regex desc_search = new Regex("<[^<]+class=\"synopsis\"[^>]+>(?<description>[^\t]*)</div>"); static Regex url_search = new Regex("<[^>]*>"); static Regex parse_award = new Regex("href=\"http://www.netflix.com/Movie/[^/]*/(?<movieid>[0-9]+)[^>]*>(?<title>[^<]+)<"); - static Regex playnow_search = new Regex("class=\"title\"[ ]*>[ ]*<[^\t]+?movieid=(?<movieid>[0-9]*)[^>]+>(?<title>[^<]*)<"); - // <span class="pgBtn-next pgBtn"><a href="http://www.netflix.com/WatchNowGenre?genreId=307&pg=2"> + // modified 11/21/2007 to match current Netflix format + //<span class="title"><a href="http://www.netflix.com/WatchNowMovie/True_Lies/60029814?trkid=203113" onmouseover="dB(event, this, 1)" id="b060029814_0">True Lies</a> + static Regex playnow_search = new Regex("class=\"title\"[ ]*>[ ]*<[^/]*http://www.netflix.com/WatchNowMovie/[^\t/]+/(?<movieid>[0-9]*)[^>]+>(?<title>[^<]*)<"); + + //<span class="pgBtn-next pgBtn"><a href="http://www.netflix.com/WatchNowGenre?genreId=307&pg=2"> static Regex page_search = new Regex("<span class=\"pgBtn-next pgBtn\"><a href=\"(?<nextpage>[^\"]*)\""); bool playnow_fullscreen = false; bool playnow_active = false; @@ -503,16 +506,27 @@ String [] startpage = new String[]{ "http://www.netflix.com/WatchNowFromQueue", "http://www.netflix.com/WatchNowRecentAdditions", - "http://www.netflix.com/WatchNowTopPicks"}; - + "http://www.netflix.com/WatchNowTopPicks", + "http://www.netflix.com/WatchNowGenre?genreId=296"}; + + String[] startpage_menu = new String[] { + "DVD Queue", + "Recent Additions", + "Top 50", + "Action & Adventure" }; + MediaPortal.Dialogs.GUIDialogMenu dlgmenu = (GUIDialogMenu)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_MENU); dlgmenu.Reset(); - - dlgmenu.Add("DVD Queue"); - dlgmenu.Add("Recent Additions"); - dlgmenu.Add("Top 50"); - + + int i = 0; + + while (i != startpage_menu.Length) + { + dlgmenu.Add(startpage_menu[i]); + i++; + } + dlgmenu.DoModal(GetID); return startpage[dlgmenu.SelectedLabel]; @@ -1080,9 +1094,9 @@ #region Parsing - /// <summary> + /// <Show Details> /// Shows details of selected movie on screen - /// </summary> + /// </Show Details> /// <param name="movie">MovieDetails Structure</param> private void ShowDetails(MovieDetails movie) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <chr...@us...> - 2007-11-21 11:29:20
|
Revision: 1081 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1081&view=rev Author: chreekar Date: 2007-11-21 03:29:16 -0800 (Wed, 21 Nov 2007) Log Message: ----------- Built for MP 0.2.3.0, and sources set up accordingly Modified Paths: -------------- trunk/plugins/MyEmulators/Readme.txt trunk/plugins/MyEmulators/myEmulators/Properties/AssemblyInfo.cs trunk/plugins/MyEmulators/myEmulators/myEmulators.csproj trunk/plugins/MyEmulators/output.rar Modified: trunk/plugins/MyEmulators/Readme.txt =================================================================== --- trunk/plugins/MyEmulators/Readme.txt 2007-11-20 21:29:57 UTC (rev 1080) +++ trunk/plugins/MyEmulators/Readme.txt 2007-11-21 11:29:16 UTC (rev 1081) @@ -6,6 +6,9 @@ CHANGELOG ------------------------------------------- +v1.7 +-Built for MP 0.2.3.0 + v1.6 -Solved problem when returning from a launched emulator @@ -69,10 +72,9 @@ REQUIREMENTS ------------------------------------------- The plugin has been build from and tested -to work with MediaPortal version 0.2.2.0, +to work with MediaPortal version 0.2.3.0, but it may work just fine for older -versions too (if the animations in the skin -file is commented). No guarantee though. +versions too. No guarantee though. INSTALLATION ------------------------------------------- Modified: trunk/plugins/MyEmulators/myEmulators/Properties/AssemblyInfo.cs =================================================================== --- trunk/plugins/MyEmulators/myEmulators/Properties/AssemblyInfo.cs 2007-11-20 21:29:57 UTC (rev 1080) +++ trunk/plugins/MyEmulators/myEmulators/Properties/AssemblyInfo.cs 2007-11-21 11:29:16 UTC (rev 1081) @@ -31,5 +31,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.1.6.0")] -[assembly: AssemblyFileVersion("0.1.6.0")] +[assembly: AssemblyVersion("0.1.7.0")] +[assembly: AssemblyFileVersion("0.1.7.0")] Modified: trunk/plugins/MyEmulators/myEmulators/myEmulators.csproj =================================================================== --- trunk/plugins/MyEmulators/myEmulators/myEmulators.csproj 2007-11-20 21:29:57 UTC (rev 1080) +++ trunk/plugins/MyEmulators/myEmulators/myEmulators.csproj 2007-11-21 11:29:16 UTC (rev 1081) @@ -28,23 +28,27 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.2560.28099, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\dll version 2.2.0\Core.dll</HintPath> + <HintPath>..\dll version 2.3.0\Core.dll</HintPath> </Reference> - <Reference Include="Databases, Version=1.0.2560.28101, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\dll version 2.2.0\Databases.dll</HintPath> + <HintPath>..\dll version 2.3.0\Databases.dll</HintPath> </Reference> - <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL"> + <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\dll version 2.2.0\Dialogs.dll</HintPath> + <HintPath>..\dll version 2.3.0\Dialogs.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> + <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=x86"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\dll version 2.3.0\Utils.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Class1.cs" /> 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: <ts...@us...> - 2007-11-20 21:30:01
|
Revision: 1080 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1080&view=rev Author: tsmotw Date: 2007-11-20 13:29:57 -0800 (Tue, 20 Nov 2007) Log Message: ----------- Started with tv-series Modified Paths: -------------- trunk/skins/Xephyr/TVSeries.xml Added Paths: ----------- trunk/skins/Xephyr/Media/1tvseries_focus.png Added: trunk/skins/Xephyr/Media/1tvseries_focus.png =================================================================== (Binary files differ) Property changes on: trunk/skins/Xephyr/Media/1tvseries_focus.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/skins/Xephyr/TVSeries.xml =================================================================== --- trunk/skins/Xephyr/TVSeries.xml 2007-11-19 23:49:26 UTC (rev 1079) +++ trunk/skins/Xephyr/TVSeries.xml 2007-11-20 21:29:57 UTC (rev 1080) @@ -1,949 +1,932 @@ -<?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> - - <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>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>780</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>770</posX> - <posY>625</posY> - <width>180</width> - <height>70</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>55ffffff</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 ( in textlist )</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> - <visible>Control.IsVisible(1235)</visible> - </control> - - <control> - <type>image</type> - <description>thumb Logos ( graphical listings )</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>260</posX> - <posY>100</posY> - <width>730</width> - <height>80</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> - <visible>!Control.IsVisible(1235)</visible> - </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>740</posX> - <posY>668</posY> - <width>200</width> - <label>#TVSeries.LastView</label> - <align>right</align> - <textcolor>333333</textcolor> - <font>font16</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>760</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>970</posX> - <posY>668</posY> - <width>200</width> - <label>#TVSeries.NextView</label> - <align>left</align> - <textcolor>333333</textcolor> - <font>font16</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>760</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>940</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>740</posX> - <posY>668</posY> - <width>200</width> - <label>#TVSeries.LastView</label> - <align>right</align> - <textcolor>d4d2d2</textcolor> - <font>font16</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>760</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>970</posX> - <posY>668</posY> - <width>200</width> - <label>#TVSeries.NextView</label> - <align>left</align> - <textcolor>d4d2d2</textcolor> - <font>font16</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>760</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>940</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>605</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>720</posX><!-- 750 --> - <posY>10</posY><!-- 185 --> - <width>610</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>1250</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>615</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>1135</posX> - <posY>650</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>1160</posX> - <posY>669</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>yes</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>MY TV BACKGROUND</description> + <id>1</id> + <type>multiimage</type> + <posx>0</posx> + <posy>0</posy> + <width>1280</width> + <height>720</height> + <imagepath>tv</imagepath> + <timeperimage>6000</timeperimage> + <fadetime>800</fadetime> + <loop>yes</loop> + <randomize>false</randomize> + </control> + + <control> + <description>background image</description> + <type>image</type> + <id>1</id> + <posX>0</posX> + <posY>90</posY> + <texture>1glassback.png</texture> + <visible>!Control.IsVisible(1235)</visible> + </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> + <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>80</posX> + <posY>608</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>70</posX> + <posY>608</posY> + <width>180</width> + <height>70</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>55ffffff</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>230</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>265</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>270</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>305</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>340</posY> + <width>570</width> + <height>250</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.Series... [truncated message content] |
From: <che...@us...> - 2007-11-19 23:49:29
|
Revision: 1079 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1079&view=rev Author: chef_koch Date: 2007-11-19 15:49:26 -0800 (Mon, 19 Nov 2007) Log Message: ----------- fixed design in config Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.resx trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-11-19 22:45:30 UTC (rev 1078) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-11-19 23:49:26 UTC (rev 1079) @@ -66,10 +66,9 @@ platformComboBox.SelectedValue = applicationItem.PlatformId; } - if((applicationItem.Title != "") && (applicationItem.Title != "New item")) + if ((applicationItem.Title != "") && (applicationItem.Title != "New item")) { informationLabel.Text = applicationItem.Title; - } } Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-11-19 22:45:30 UTC (rev 1078) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.Designer.cs 2007-11-19 23:49:26 UTC (rev 1079) @@ -29,6 +29,7 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AppSettingsGamebase)); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); this.SuspendLayout(); // // enabledCheckbox @@ -42,12 +43,13 @@ // shellexecuteCheckBox // this.shellexecuteCheckBox.Location = new System.Drawing.Point(7, 338); - this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" + - "extension.\r\nYou can omit the \"Launching Application\" in this case."); + this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileI" + + "tem-extension.\r\nYou can omit the \"Launching Application\" in this case."); // // waitExitCheckBox // this.waitExitCheckBox.Location = new System.Drawing.Point(7, 389); + this.toolTip.SetToolTip(this.waitExitCheckBox, "If you want mediaportal to wait for exit while running application."); // // applicationArgumentsLabel // @@ -85,20 +87,17 @@ // informationLabel // this.informationLabel.Image = ((System.Drawing.Image)(resources.GetObject("informationLabel.Image"))); - this.informationLabel.ImageAlign = System.Drawing.ContentAlignment.BottomLeft; - this.informationLabel.Location = new System.Drawing.Point(2, 0); - this.informationLabel.Size = new System.Drawing.Size(314, 68); this.informationLabel.MouseLeave += new System.EventHandler(this.informationLabel_MouseLeave); this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click); this.informationLabel.MouseEnter += new System.EventHandler(this.informationLabel_MouseEnter); // - // // AppSettingsGamebase // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Name = "AppSettingsGamebase"; this.Load += new System.EventHandler(this.AppSettingsGamebase_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.resx =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.resx 2007-11-19 22:45:30 UTC (rev 1078) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsGamebase.resx 2007-11-19 23:49:26 UTC (rev 1079) @@ -118,7 +118,7 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>313, 17</value> + <value>292, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="informationLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -164,7 +164,7 @@ </value> </data> <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>150, 17</value> + <value>141, 17</value> </metadata> <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-11-19 22:45:30 UTC (rev 1078) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.Designer.cs 2007-11-19 23:49:26 UTC (rev 1079) @@ -32,6 +32,7 @@ this.historyDatLink = new System.Windows.Forms.LinkLabel(); this.catverLink = new System.Windows.Forms.LinkLabel(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); this.groupBox1.SuspendLayout(); this.SuspendLayout(); // @@ -86,9 +87,6 @@ // informationLabel // this.informationLabel.Image = ((System.Drawing.Image)(resources.GetObject("informationLabel.Image"))); - this.informationLabel.ImageAlign = System.Drawing.ContentAlignment.TopLeft; - this.informationLabel.Size = new System.Drawing.Size(248, 62); - this.informationLabel.TextAlign = System.Drawing.ContentAlignment.BottomRight; this.informationLabel.MouseLeave += new System.EventHandler(this.informationLabel_MouseLeave); this.informationLabel.Click += new System.EventHandler(this.informationLabel_Click); this.informationLabel.MouseEnter += new System.EventHandler(this.informationLabel_MouseEnter); @@ -134,6 +132,7 @@ this.Controls.Add(this.groupBox1); this.Name = "AppSettingsMame"; this.Load += new System.EventHandler(this.AppSettingsMameDirect_Load); + this.Controls.SetChildIndex(this.pictureBox, 0); this.Controls.SetChildIndex(this.preCommandsLabel, 0); this.Controls.SetChildIndex(this.preCommandTextBox, 0); this.Controls.SetChildIndex(this.postCommandsLabel, 0); @@ -160,6 +159,7 @@ this.Controls.SetChildIndex(this.startupDirButton, 0); this.Controls.SetChildIndex(this.allowGUIImportCheckBox, 0); this.Controls.SetChildIndex(this.groupBox1, 0); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit(); this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx 2007-11-19 22:45:30 UTC (rev 1078) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsMame.resx 2007-11-19 23:49:26 UTC (rev 1079) @@ -118,7 +118,7 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>313, 17</value> + <value>292, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="informationLabel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -504,7 +504,7 @@ </value> </data> <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>150, 17</value> + <value>141, 17</value> </metadata> <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <che...@us...> - 2007-11-19 22:45:33
|
Revision: 1078 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1078&view=rev Author: chef_koch Date: 2007-11-19 14:45:30 -0800 (Mon, 19 Nov 2007) Log Message: ----------- added: option to set an application item as root, is now possible to set up in configuration Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.resx trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-11-19 17:42:47 UTC (rev 1077) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsBase.Designer.cs 2007-11-19 22:45:30 UTC (rev 1078) @@ -64,44 +64,49 @@ // enabledCheckbox // this.enabledCheckbox.AutoSize = true; - this.enabledCheckbox.Location = new System.Drawing.Point(427, 17); + this.enabledCheckbox.Location = new System.Drawing.Point(8, 60); this.enabledCheckbox.Name = "enabledCheckbox"; - this.enabledCheckbox.Size = new System.Drawing.Size(65, 17); + this.enabledCheckbox.Size = new System.Drawing.Size(64, 17); this.enabledCheckbox.TabIndex = 1; this.enabledCheckbox.Text = "Enabled"; this.enabledCheckbox.UseVisualStyleBackColor = true; // // titleLabel // - this.titleLabel.Location = new System.Drawing.Point(2, 71); + this.titleLabel.AutoSize = true; + this.titleLabel.Location = new System.Drawing.Point(5, 82); this.titleLabel.Name = "titleLabel"; - this.titleLabel.Size = new System.Drawing.Size(93, 20); + this.titleLabel.Size = new System.Drawing.Size(31, 13); this.titleLabel.TabIndex = 2; this.titleLabel.Text = "Title:"; this.titleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // applicationExeLabel // - this.applicationExeLabel.Location = new System.Drawing.Point(2, 97); + this.applicationExeLabel.AutoSize = true; + this.applicationExeLabel.Location = new System.Drawing.Point(5, 109); this.applicationExeLabel.Name = "applicationExeLabel"; - this.applicationExeLabel.Size = new System.Drawing.Size(93, 20); + this.applicationExeLabel.Size = new System.Drawing.Size(63, 13); this.applicationExeLabel.TabIndex = 3; this.applicationExeLabel.Text = "Application:"; this.applicationExeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // titleTextBox // + this.titleTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.titleTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.titleTextBox.Location = new System.Drawing.Point(93, 71); + this.titleTextBox.Location = new System.Drawing.Point(100, 80); this.titleTextBox.Name = "titleTextBox"; - this.titleTextBox.Size = new System.Drawing.Size(325, 20); + this.titleTextBox.Size = new System.Drawing.Size(357, 21); this.titleTextBox.TabIndex = 4; this.titleTextBox.TextChanged += new System.EventHandler(this.titleTextBox_TextChanged); // // applicationExeButton // + this.applicationExeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.applicationExeButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; - this.applicationExeButton.Location = new System.Drawing.Point(426, 96); + this.applicationExeButton.Location = new System.Drawing.Point(463, 107); this.applicationExeButton.Name = "applicationExeButton"; this.applicationExeButton.Size = new System.Drawing.Size(31, 23); this.applicationExeButton.TabIndex = 6; @@ -111,9 +116,9 @@ // shellexecuteCheckBox // this.shellexecuteCheckBox.AutoSize = true; - this.shellexecuteCheckBox.Location = new System.Drawing.Point(5, 345); + this.shellexecuteCheckBox.Location = new System.Drawing.Point(8, 354); this.shellexecuteCheckBox.Name = "shellexecuteCheckBox"; - this.shellexecuteCheckBox.Size = new System.Drawing.Size(88, 17); + this.shellexecuteCheckBox.Size = new System.Drawing.Size(87, 17); this.shellexecuteCheckBox.TabIndex = 7; this.shellexecuteCheckBox.Text = "ShellExecute"; this.shellexecuteCheckBox.UseVisualStyleBackColor = true; @@ -122,59 +127,68 @@ // waitExitCheckBox // this.waitExitCheckBox.AutoSize = true; - this.waitExitCheckBox.Location = new System.Drawing.Point(5, 391); + this.waitExitCheckBox.Location = new System.Drawing.Point(8, 400); this.waitExitCheckBox.Name = "waitExitCheckBox"; - this.waitExitCheckBox.Size = new System.Drawing.Size(82, 17); + this.waitExitCheckBox.Size = new System.Drawing.Size(86, 17); this.waitExitCheckBox.TabIndex = 8; this.waitExitCheckBox.Text = "Wait for exit"; this.waitExitCheckBox.UseVisualStyleBackColor = true; // // applicationImageLabel // - this.applicationImageLabel.Location = new System.Drawing.Point(2, 124); + this.applicationImageLabel.AutoSize = true; + this.applicationImageLabel.Location = new System.Drawing.Point(5, 136); this.applicationImageLabel.Name = "applicationImageLabel"; - this.applicationImageLabel.Size = new System.Drawing.Size(93, 20); + this.applicationImageLabel.Size = new System.Drawing.Size(70, 13); this.applicationImageLabel.TabIndex = 11; this.applicationImageLabel.Text = "App. Picture:"; this.applicationImageLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // applicationArgumentsLabel // - this.applicationArgumentsLabel.Location = new System.Drawing.Point(2, 150); + this.applicationArgumentsLabel.AutoSize = true; + this.applicationArgumentsLabel.Location = new System.Drawing.Point(5, 163); this.applicationArgumentsLabel.Name = "applicationArgumentsLabel"; - this.applicationArgumentsLabel.Size = new System.Drawing.Size(93, 20); + this.applicationArgumentsLabel.Size = new System.Drawing.Size(89, 13); this.applicationArgumentsLabel.TabIndex = 12; this.applicationArgumentsLabel.Text = "App. Arguments:"; this.applicationArgumentsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // applicationImageTextBox // + this.applicationImageTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.applicationImageTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.applicationImageTextBox.Location = new System.Drawing.Point(93, 124); + this.applicationImageTextBox.Location = new System.Drawing.Point(100, 134); this.applicationImageTextBox.Name = "applicationImageTextBox"; - this.applicationImageTextBox.Size = new System.Drawing.Size(325, 20); + this.applicationImageTextBox.Size = new System.Drawing.Size(357, 21); this.applicationImageTextBox.TabIndex = 13; this.applicationImageTextBox.TextChanged += new System.EventHandler(this.applicationImageTextBox_TextChanged); // // applicationArgumentsTextBox // + this.applicationArgumentsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.applicationArgumentsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.applicationArgumentsTextBox.Location = new System.Drawing.Point(93, 150); + this.applicationArgumentsTextBox.Location = new System.Drawing.Point(100, 161); this.applicationArgumentsTextBox.Name = "applicationArgumentsTextBox"; - this.applicationArgumentsTextBox.Size = new System.Drawing.Size(325, 20); + this.applicationArgumentsTextBox.Size = new System.Drawing.Size(357, 21); this.applicationArgumentsTextBox.TabIndex = 14; // // winStyleLabel // - this.winStyleLabel.Location = new System.Drawing.Point(2, 177); + this.winStyleLabel.AutoSize = true; + this.winStyleLabel.Location = new System.Drawing.Point(5, 191); this.winStyleLabel.Name = "winStyleLabel"; - this.winStyleLabel.Size = new System.Drawing.Size(93, 20); + this.winStyleLabel.Size = new System.Drawing.Size(56, 13); this.winStyleLabel.TabIndex = 15; this.winStyleLabel.Text = "Win Style:"; this.winStyleLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // winStyleComboBox // + this.winStyleComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.winStyleComboBox.BackColor = System.Drawing.SystemColors.Window; this.winStyleComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.winStyleComboBox.FormattingEnabled = true; @@ -183,16 +197,17 @@ "Hidden", "Minimized", "Maximized"}); - this.winStyleComboBox.Location = new System.Drawing.Point(93, 177); + this.winStyleComboBox.Location = new System.Drawing.Point(100, 188); this.winStyleComboBox.Name = "winStyleComboBox"; - this.winStyleComboBox.Size = new System.Drawing.Size(325, 21); + this.winStyleComboBox.Size = new System.Drawing.Size(357, 21); this.winStyleComboBox.TabIndex = 16; // // startupDirLabel // - this.startupDirLabel.Location = new System.Drawing.Point(2, 204); + this.startupDirLabel.AutoSize = true; + this.startupDirLabel.Location = new System.Drawing.Point(5, 218); this.startupDirLabel.Name = "startupDirLabel"; - this.startupDirLabel.Size = new System.Drawing.Size(85, 20); + this.startupDirLabel.Size = new System.Drawing.Size(64, 13); this.startupDirLabel.TabIndex = 18; this.startupDirLabel.Text = "StartUp Dir:"; this.startupDirLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -200,17 +215,18 @@ // quoteCheckBox // this.quoteCheckBox.AutoSize = true; - this.quoteCheckBox.Location = new System.Drawing.Point(5, 322); + this.quoteCheckBox.Location = new System.Drawing.Point(8, 331); this.quoteCheckBox.Name = "quoteCheckBox"; - this.quoteCheckBox.Size = new System.Drawing.Size(102, 17); + this.quoteCheckBox.Size = new System.Drawing.Size(104, 17); this.quoteCheckBox.TabIndex = 19; this.quoteCheckBox.Text = "Quote filenames"; this.quoteCheckBox.UseVisualStyleBackColor = true; // // applicationImageButton // + this.applicationImageButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.applicationImageButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; - this.applicationImageButton.Location = new System.Drawing.Point(426, 121); + this.applicationImageButton.Location = new System.Drawing.Point(463, 134); this.applicationImageButton.Name = "applicationImageButton"; this.applicationImageButton.Size = new System.Drawing.Size(31, 23); this.applicationImageButton.TabIndex = 26; @@ -219,8 +235,9 @@ // // startupDirButton // + this.startupDirButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.startupDirButton.Image = global::GUIProgramsAlt.Properties.Resources.browseButtonImage; - this.startupDirButton.Location = new System.Drawing.Point(426, 201); + this.startupDirButton.Location = new System.Drawing.Point(463, 215); this.startupDirButton.Name = "startupDirButton"; this.startupDirButton.Size = new System.Drawing.Size(31, 23); this.startupDirButton.TabIndex = 27; @@ -230,20 +247,23 @@ // allowGUIImportCheckBox // this.allowGUIImportCheckBox.AutoSize = true; - this.allowGUIImportCheckBox.Location = new System.Drawing.Point(5, 368); + this.allowGUIImportCheckBox.Location = new System.Drawing.Point(8, 377); this.allowGUIImportCheckBox.Name = "allowGUIImportCheckBox"; - this.allowGUIImportCheckBox.Size = new System.Drawing.Size(201, 17); + this.allowGUIImportCheckBox.Size = new System.Drawing.Size(209, 17); this.allowGUIImportCheckBox.TabIndex = 30; this.allowGUIImportCheckBox.Text = "Allow reimport from within mediaportal"; this.allowGUIImportCheckBox.UseVisualStyleBackColor = true; // // informationLabel // + this.informationLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.informationLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 19F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.informationLabel.Location = new System.Drawing.Point(4, 6); + this.informationLabel.Location = new System.Drawing.Point(3, 0); this.informationLabel.Name = "informationLabel"; - this.informationLabel.Size = new System.Drawing.Size(396, 57); + this.informationLabel.Size = new System.Drawing.Size(491, 57); this.informationLabel.TabIndex = 31; + this.informationLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // openFileDialog // @@ -251,26 +271,30 @@ // // applicationExeTextBox // + this.applicationExeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.applicationExeTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.applicationExeTextBox.Location = new System.Drawing.Point(93, 98); + this.applicationExeTextBox.Location = new System.Drawing.Point(100, 107); this.applicationExeTextBox.Name = "applicationExeTextBox"; - this.applicationExeTextBox.Size = new System.Drawing.Size(325, 20); + this.applicationExeTextBox.Size = new System.Drawing.Size(357, 21); this.applicationExeTextBox.TabIndex = 32; this.applicationExeTextBox.TextChanged += new System.EventHandler(this.applicationExeTextBox_TextChanged); // // startupDirComboBox // + this.startupDirComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.startupDirComboBox.FormattingEnabled = true; - this.startupDirComboBox.Location = new System.Drawing.Point(93, 204); + this.startupDirComboBox.Location = new System.Drawing.Point(100, 215); this.startupDirComboBox.Name = "startupDirComboBox"; - this.startupDirComboBox.Size = new System.Drawing.Size(325, 21); + this.startupDirComboBox.Size = new System.Drawing.Size(357, 21); this.startupDirComboBox.TabIndex = 36; // // pictureBox // this.pictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.pictureBox.InitialImage = null; - this.pictureBox.Location = new System.Drawing.Point(248, 322); + this.pictureBox.Location = new System.Drawing.Point(251, 331); this.pictureBox.Name = "pictureBox"; this.pictureBox.Size = new System.Drawing.Size(170, 170); this.pictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -279,36 +303,42 @@ // // postCommandsLabel // - this.postCommandsLabel.Location = new System.Drawing.Point(2, 257); + this.postCommandsLabel.AutoSize = true; + this.postCommandsLabel.Location = new System.Drawing.Point(5, 271); this.postCommandsLabel.Name = "postCommandsLabel"; - this.postCommandsLabel.Size = new System.Drawing.Size(85, 20); + this.postCommandsLabel.Size = new System.Drawing.Size(80, 13); this.postCommandsLabel.TabIndex = 40; this.postCommandsLabel.Text = "PostCommands"; this.postCommandsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // preCommandTextBox // + this.preCommandTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.preCommandTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.preCommandTextBox.Location = new System.Drawing.Point(93, 231); + this.preCommandTextBox.Location = new System.Drawing.Point(100, 242); this.preCommandTextBox.Name = "preCommandTextBox"; - this.preCommandTextBox.Size = new System.Drawing.Size(325, 20); + this.preCommandTextBox.Size = new System.Drawing.Size(357, 21); this.preCommandTextBox.TabIndex = 39; // // preCommandsLabel // - this.preCommandsLabel.Location = new System.Drawing.Point(2, 231); + this.preCommandsLabel.AutoSize = true; + this.preCommandsLabel.Location = new System.Drawing.Point(5, 244); this.preCommandsLabel.Name = "preCommandsLabel"; - this.preCommandsLabel.Size = new System.Drawing.Size(93, 20); + this.preCommandsLabel.Size = new System.Drawing.Size(79, 13); this.preCommandsLabel.TabIndex = 38; this.preCommandsLabel.Text = "PreCommands:"; this.preCommandsLabel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // postCommandTextBox // + this.postCommandTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.postCommandTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.postCommandTextBox.Location = new System.Drawing.Point(93, 257); + this.postCommandTextBox.Location = new System.Drawing.Point(100, 269); this.postCommandTextBox.Name = "postCommandTextBox"; - this.postCommandTextBox.Size = new System.Drawing.Size(325, 20); + this.postCommandTextBox.Size = new System.Drawing.Size(357, 21); this.postCommandTextBox.TabIndex = 41; // // AppSettingsBase @@ -374,10 +404,10 @@ protected System.Windows.Forms.OpenFileDialog openFileDialog; protected System.Windows.Forms.TextBox applicationExeTextBox; protected System.Windows.Forms.ComboBox startupDirComboBox; - private System.Windows.Forms.PictureBox pictureBox; protected System.Windows.Forms.Label postCommandsLabel; protected System.Windows.Forms.TextBox preCommandTextBox; protected System.Windows.Forms.Label preCommandsLabel; protected System.Windows.Forms.TextBox postCommandTextBox; + protected System.Windows.Forms.PictureBox pictureBox; } } \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-11-19 17:42:47 UTC (rev 1077) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.Designer.cs 2007-11-19 22:45:30 UTC (rev 1078) @@ -30,6 +30,7 @@ { this.platformComboBox = new System.Windows.Forms.ComboBox(); this.platformLabel = new System.Windows.Forms.Label(); + this.rootCheckBox = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // enabledCheckbox @@ -42,9 +43,13 @@ // // shellexecuteCheckBox // - this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileItem-" + - "extension.\r\nYou can omit the \"Launching Application\" in this case."); + this.toolTip.SetToolTip(this.shellexecuteCheckBox, "Enable this if you want to run a program that is associated with a specific fileI" + + "tem-extension.\r\nYou can omit the \"Launching Application\" in this case."); // + // waitExitCheckBox + // + this.toolTip.SetToolTip(this.waitExitCheckBox, "If you want mediaportal to wait for exit while running application."); + // // applicationArgumentsLabel // this.toolTip.SetToolTip(this.applicationArgumentsLabel, "Optional arguments that are needed to launch the program \r\n\r\n(advanced hint: Use " + @@ -78,31 +83,48 @@ // // platformComboBox // + this.platformComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.platformComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.platformComboBox.FormattingEnabled = true; - this.platformComboBox.Location = new System.Drawing.Point(93, 286); + this.platformComboBox.Location = new System.Drawing.Point(100, 296); this.platformComboBox.Name = "platformComboBox"; - this.platformComboBox.Size = new System.Drawing.Size(325, 21); + this.platformComboBox.Size = new System.Drawing.Size(357, 21); this.platformComboBox.TabIndex = 42; // // platformLabel // this.platformLabel.AutoSize = true; this.platformLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.platformLabel.Location = new System.Drawing.Point(2, 289); + this.platformLabel.Location = new System.Drawing.Point(5, 299); this.platformLabel.Name = "platformLabel"; - this.platformLabel.Size = new System.Drawing.Size(84, 13); + this.platformLabel.Size = new System.Drawing.Size(89, 13); this.platformLabel.TabIndex = 41; this.platformLabel.Text = "Default platform:"; // + // rootCheckBox + // + this.rootCheckBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.rootCheckBox.AutoSize = true; + this.rootCheckBox.Location = new System.Drawing.Point(346, 60); + this.rootCheckBox.Name = "rootCheckBox"; + this.rootCheckBox.Size = new System.Drawing.Size(148, 17); + this.rootCheckBox.TabIndex = 43; + this.rootCheckBox.Text = "show files in ROOT-folder"; + this.rootCheckBox.UseVisualStyleBackColor = true; + this.rootCheckBox.CheckedChanged += new System.EventHandler(this.rootCheckBox_CheckedChanged); + // // AppSettingsDirCache // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.rootCheckBox); this.Controls.Add(this.platformComboBox); this.Controls.Add(this.platformLabel); this.Name = "AppSettingsDirCache"; this.Load += new System.EventHandler(this.AppSettingsDirCache_Load); + this.Controls.SetChildIndex(this.platformLabel, 0); + this.Controls.SetChildIndex(this.platformComboBox, 0); this.Controls.SetChildIndex(this.preCommandsLabel, 0); this.Controls.SetChildIndex(this.preCommandTextBox, 0); this.Controls.SetChildIndex(this.postCommandsLabel, 0); @@ -128,8 +150,7 @@ this.Controls.SetChildIndex(this.informationLabel, 0); this.Controls.SetChildIndex(this.applicationExeTextBox, 0); this.Controls.SetChildIndex(this.startupDirComboBox, 0); - this.Controls.SetChildIndex(this.platformLabel, 0); - this.Controls.SetChildIndex(this.platformComboBox, 0); + this.Controls.SetChildIndex(this.rootCheckBox, 0); this.ResumeLayout(false); this.PerformLayout(); @@ -139,6 +160,7 @@ protected System.Windows.Forms.ComboBox platformComboBox; protected System.Windows.Forms.Label platformLabel; + protected System.Windows.Forms.CheckBox rootCheckBox; } } \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-11-19 17:42:47 UTC (rev 1077) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.cs 2007-11-19 22:45:30 UTC (rev 1078) @@ -51,6 +51,11 @@ ProgramUtils.FillComboBox("tblPlatform", "platform", platformComboBox); base.LoadSettings(applicationItem); + if (applicationItem.Title == "@ROOT@") + rootCheckBox.Checked = true; + else + rootCheckBox.Checked = false; + startupDirComboBox.Text = applicationItem.StartupDir; shellexecuteCheckBox.Checked = applicationItem.UseShellExecute; quoteCheckBox.Checked = applicationItem.UseQuotes; @@ -105,18 +110,15 @@ public override void LoadFromAppItem(ApplicationItem applicationItem) { - informationLabel.Text = applicationItem.Title; + informationLabel.Text = applicationItem.Title; titleTextBox.Text = applicationItem.Title; - applicationExeTextBox.Text = applicationItem.Executable; - + applicationExeTextBox.Text = applicationItem.Executable; applicationArgumentsTextBox.Text = applicationItem.Arguments; startupDirComboBox.Text = applicationItem.StartupDir; - shellexecuteCheckBox.Checked = applicationItem.UseShellExecute; quoteCheckBox.Checked = applicationItem.UseQuotes; waitExitCheckBox.Checked = applicationItem.WaitForExit; platformComboBox.SelectedValue = applicationItem.PlatformId; - } private void AppSettingsDirCache_Load(object sender, EventArgs e) @@ -127,5 +129,29 @@ allowGUIImportCheckBox.Checked = false; } + + private void rootCheckBox_CheckedChanged(object sender, EventArgs e) + { + if (this.rootCheckBox.Checked) + { + this.titleTextBox.Text = @"@ROOT@"; + this.titleTextBox.Enabled = false; + + this.shellexecuteCheckBox.Checked = true; + + this.allowGUIImportCheckBox.Checked = false; + this.allowGUIImportCheckBox.Enabled = false; + + this.pictureBox.Visible = false; + } + else + { + this.titleTextBox.Enabled = true; + + this.allowGUIImportCheckBox.Enabled = true; + + this.pictureBox.Visible = true; + } + } } } \ No newline at end of file Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.resx =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.resx 2007-11-19 17:42:47 UTC (rev 1077) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/Design/AppSettingsDirCache.resx 2007-11-19 22:45:30 UTC (rev 1078) @@ -118,10 +118,10 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>313, 17</value> + <value>292, 17</value> </metadata> <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>150, 17</value> + <value>141, 17</value> </metadata> <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> Modified: trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp =================================================================== --- trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp 2007-11-19 17:42:47 UTC (rev 1077) +++ trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp 2007-11-19 22:45:30 UTC (rev 1078) @@ -8,7 +8,7 @@ <Source>GUIProgramsAlt\bin\Release\GUIProgramsAlt.dll</Source> <Id>01010</Id> <Option /> - <Guid>57893c55-dcc4-4a2f-bc23-b05c7c653c7e</Guid> + <Guid>525634c1-4fad-4e93-b0c4-9ac1856fca7d</Guid> </File> <File> <FileName>myProgramsAlt.xml</FileName> @@ -17,7 +17,7 @@ <Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAlt.xml</Source> <Id>02010</Id> <Option>OutputFileName=|DefaultFile=True|</Option> - <Guid>972438e5-d3cc-4e34-9aaa-6ae9cf39b023</Guid> + <Guid>9eda7ceb-1bd1-444c-80d6-1ae34ab369c8</Guid> </File> <File> <FileName>myProgramsAltFileInfo.xml</FileName> @@ -26,7 +26,7 @@ <Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAltFileInfo.xml</Source> <Id>02010</Id> <Option>OutputFileName=|DefaultFile=True|</Option> - <Guid>58a988af-5557-4ec9-a0b7-2b862c6f9887</Guid> + <Guid>86600492-8319-4dfe-9584-83747e174f86</Guid> </File> <File> <FileName>myProgramsAltPreconfiguration.xml</FileName> @@ -35,7 +35,7 @@ <Source>GUIProgramsAlt\MetaData\myProgramsAltPreconfiguration.xml</Source> <Id>02010</Id> <Option /> - <Guid>1a909c22-67c5-4915-8c92-e7464d416e0a</Guid> + <Guid>6f29ab27-c903-4292-883b-927ee42b0512</Guid> </File> <File> <FileName>README.txt</FileName> @@ -44,7 +44,7 @@ <Source>README.txt</Source> <Id>04010</Id> <Option>OutputFileName=MyPrograms2_ReadMe|DefaultFile=False|</Option> - <Guid>1d7ab3ca-a21a-4953-ac24-ffd485215ae1</Guid> + <Guid>d4fd583e-a581-42e7-9e84-6cd8a2e7dec2</Guid> </File> <File> <FileName>System.Data.SQLite.DLL</FileName> @@ -53,12 +53,13 @@ <Source>GUIProgramsAlt\bin\Release\System.Data.SQLite.DLL</Source> <Id>04010</Id> <Option /> - <Guid>17cf81f6-0105-42f2-aaa4-9246a856d21a</Guid> + <Guid>8ce8bd92-3c7d-4721-908d-29bc440d5ab4</Guid> </File> </FileList> <StringList /> <Actions> <Action Place="POSTSETUP" Id="1" Command="GUIProgramsAlt.dll" /> + <Action Place="POSTSETUP" Id="1" Command="GUIProgramsAlt.dll" /> </Actions> <SetupGroups /> <SetupGroupMappings /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mis...@us...> - 2007-11-19 17:43:32
|
Revision: 1077 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1077&view=rev Author: misterd_sf Date: 2007-11-19 09:42:47 -0800 (Mon, 19 Nov 2007) Log Message: ----------- Removed Reflection from external osd library, since it isn't needed anymore. thx rtv for adding the needed properties to MP. Modified Paths: -------------- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs trunk/plugins/My MPlayer/My MPlayer.xmp Added Paths: ----------- trunk/plugins/My MPlayer/My MPlayer-License.txt Removed Paths: ------------- trunk/plugins/My MPlayer/MPlayer-License.txt Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/BaseElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -26,7 +26,6 @@ using System.Collections.Generic; using System.Drawing; using System.IO; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -115,11 +114,7 @@ /// <returns>Font </returns> protected Font getFont(String name) { GUIFont guiFont = GUIFontManager.GetFont(name); - Type guiFontType = typeof(GUIFont); - FieldInfo styleFieldInfo = guiFontType.GetField("_fontStyle", - BindingFlags.NonPublic | BindingFlags.Instance); - FontStyle style = (FontStyle)styleFieldInfo.GetValue(guiFont); - return new Font(guiFont.FileName, guiFont.FontSize, style); + return new Font(guiFont.FileName, guiFont.FontSize, guiFont.FontStyle); } /// <summary> Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ButtonElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -78,26 +77,6 @@ private Color _disabledColor; /// <summary> - /// X-coordinate of the hover image - /// </summary> - private int _hoverX; - - /// <summary> - /// Y-coordinate of the hover image - /// </summary> - private int _hoverY; - - /// <summary> - /// Width of the hover image - /// </summary> - private int _hoverWidth; - - /// <summary> - /// Height of the hover image - /// </summary> - private int _hoverHeight; - - /// <summary> /// Indicates, if the button is focused /// </summary> private bool _focus; @@ -119,27 +98,10 @@ _font = getFont(_button.FontName); _focusBitmap = loadBitmap(_button.TexutureFocusName); _noFocusBitmap = loadBitmap(_button.TexutureNoFocusName); - Type buttonType = typeof(GUIButtonControl); - FieldInfo hoverFileNameFieldInfo = buttonType.GetField("_hoverFilename", - BindingFlags.NonPublic | BindingFlags.Instance); - _hoverBitmap = loadBitmap(hoverFileNameFieldInfo.GetValue(_button).ToString()); + _hoverBitmap = loadBitmap(_button.HoverFilename); _textColor = GetColor(_button.TextColor); - FieldInfo textColorNoFocusFieldInfo = buttonType.GetField("_textColorNoFocus", - BindingFlags.NonPublic | BindingFlags.Instance); - _textColorNoFocus = GetColor(long.Parse(textColorNoFocusFieldInfo.GetValue(_button).ToString())); + _textColorNoFocus = GetColor(_button.TextColorNoFocus); _disabledColor = GetColor(_button.DisabledColor); - FieldInfo hoverXFieldInfo = buttonType.GetField("_hoverX", - BindingFlags.NonPublic | BindingFlags.Instance); - _hoverX = Int32.Parse(hoverXFieldInfo.GetValue(_button).ToString()); - FieldInfo hoverYFieldInfo = buttonType.GetField("_hoverY", - BindingFlags.NonPublic | BindingFlags.Instance); - _hoverY = Int32.Parse(hoverYFieldInfo.GetValue(_button).ToString()); - FieldInfo hoverWidthFieldInfo = buttonType.GetField("_hoverWidth", - BindingFlags.NonPublic | BindingFlags.Instance); - _hoverWidth = Int32.Parse(hoverWidthFieldInfo.GetValue(_button).ToString()); - FieldInfo hoverHeightFieldInfo = buttonType.GetField("_hoverHeight", - BindingFlags.NonPublic | BindingFlags.Instance); - _hoverHeight = Int32.Parse(hoverHeightFieldInfo.GetValue(_button).ToString()); _label = _button.Label; _focus = _button.Focus; Log.Debug("VideoPlayerOSD: Found button element: " + _button.GetID); @@ -158,7 +120,7 @@ graph.DrawImage(_focusBitmap, (float)_button.Location.X, (float)_button.Location.Y, (float)_button.Size.Width, (float)_button.Size.Height); } if (_hoverBitmap != null) { - graph.DrawImage(_hoverBitmap, _hoverX, _hoverY, _hoverWidth, _hoverHeight); + graph.DrawImage(_hoverBitmap, _button.HoverX, _button.HoverY, _button.HoverWidth, _button.HoverHeight); } } else { if (_noFocusBitmap != null) { Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/CheckMarkElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -53,16 +52,6 @@ private Bitmap _checkNoFocusBitmap; /// <summary> - /// Width of the checkMark - /// </summary> - private int _checkMarkWidth; - - /// <summary> - /// Height of the checkMark - /// </summary> - private int _checkMarkHeight; - - /// <summary> /// Font /// </summary> private Font _font; @@ -106,19 +95,8 @@ public CheckMarkElement(GUIControl control) : base(control) { _checkMark = control as GUICheckMarkControl; - Type buttonType = typeof(GUICheckMarkControl); - FieldInfo checkFocusFieldInfo = buttonType.GetField("_checkMarkFocusTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _checkFocusBitmap = loadBitmap(checkFocusFieldInfo.GetValue(_checkMark).ToString()); - FieldInfo checkNoFocusFieldInfo = buttonType.GetField("_checkMarkNoFocusTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _checkNoFocusBitmap = loadBitmap(checkNoFocusFieldInfo.GetValue(_checkMark).ToString()); - FieldInfo checkMarkWidthFieldInfo = buttonType.GetField("_checkMarkWidth", - BindingFlags.NonPublic | BindingFlags.Instance); - _checkMarkWidth = Int32.Parse(checkMarkWidthFieldInfo.GetValue(_checkMark).ToString()); - FieldInfo checkMarkHeightFieldInfo = buttonType.GetField("_checkMarkHeight", - BindingFlags.NonPublic | BindingFlags.Instance); - _checkMarkHeight = Int32.Parse(checkMarkHeightFieldInfo.GetValue(_checkMark).ToString()); + _checkFocusBitmap = loadBitmap(_checkMark.CheckMarkTextureName); + _checkNoFocusBitmap = loadBitmap(_checkMark.CheckMarkTextureNameNF); _font = getFont(_checkMark.FontName); _disabledColor = GetColor(_checkMark.DisabledColor); _textColor = GetColor(_checkMark.TextColor); Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ListElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -25,7 +25,6 @@ using System; using System.Collections.Generic; using System.Drawing; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -355,11 +354,6 @@ private GUIListControl _list; /// <summary> - /// Items per page - /// </summary> - private int _itemsPerPage; - - /// <summary> /// Offset /// </summary> private int _offset; @@ -370,21 +364,6 @@ private int _cursorX; /// <summary> - /// DrawFocus - /// </summary> - private bool _drawFocus; - - /// <summary> - /// ListType - /// </summary> - private GUIListControl.ListType _listType; - - /// <summary> - /// Alignment of the elements - /// </summary> - private GUIControl.Alignment _alignment; - - /// <summary> /// List of the buttons /// </summary> private List<ListButtonElement> _listButtons; @@ -415,36 +394,6 @@ private Dictionary<String, Bitmap> _cachedBitmaps; /// <summary> - /// Reflection field info for listItems - /// </summary> - private FieldInfo _listItemsFieldInfo; - - /// <summary> - /// Reflection field info for the offset - /// </summary> - private FieldInfo _offsetFieldInfo; - - /// <summary> - /// Reflection field info for the cursor position - /// </summary> - private FieldInfo _cursorXFieldInfo; - - /// <summary> - /// Played Color - /// </summary> - private long _playedColor; - - /// <summary> - /// Remote Color - /// </summary> - private long _remoteColor; - - /// <summary> - /// Download Color - /// </summary> - private long _downloadColor; - - /// <summary> /// Text line /// </summary> private String _textLine; @@ -468,61 +417,16 @@ public ListElement(GUIControl control) : base(control) { _list = control as GUIListControl; - Type listType = typeof(GUIListControl); - FieldInfo alignmentFieldInfo = listType.GetField("_textAlignment", - BindingFlags.NonPublic | BindingFlags.Instance); - _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_list); - - FieldInfo listTypeFieldInfo = listType.GetField("_listType", - BindingFlags.NonPublic | BindingFlags.Instance); - _listType = (GUIListControl.ListType)listTypeFieldInfo.GetValue(_list); - - FieldInfo drawFocusFieldInfo = listType.GetField("_drawFocus", - BindingFlags.NonPublic | BindingFlags.Instance); - _drawFocus = (bool)drawFocusFieldInfo.GetValue(_list); - - _cursorXFieldInfo = listType.GetField("_cursorX", - BindingFlags.NonPublic | BindingFlags.Instance); - _cursorX = (int)_cursorXFieldInfo.GetValue(_list); - - _offsetFieldInfo = listType.GetField("_offset", - BindingFlags.NonPublic | BindingFlags.Instance); - _offset = (int)_offsetFieldInfo.GetValue(_list); - - FieldInfo itemsPerPageFieldInfo = listType.GetField("_itemsPerPage", - BindingFlags.NonPublic | BindingFlags.Instance); - _itemsPerPage = (int)itemsPerPageFieldInfo.GetValue(_list); - - FieldInfo playedColorFieldInfo = listType.GetField("_playedColor", - BindingFlags.NonPublic | BindingFlags.Instance); - _playedColor = (int)itemsPerPageFieldInfo.GetValue(_list); - - FieldInfo remoteColorFieldInfo = listType.GetField("_remoteColor", - BindingFlags.NonPublic | BindingFlags.Instance); - _remoteColor = (long)remoteColorFieldInfo.GetValue(_list); - - FieldInfo downloadColorFieldInfo = listType.GetField("_downloadColor", - BindingFlags.NonPublic | BindingFlags.Instance); - _downloadColor = (long)downloadColorFieldInfo.GetValue(_list); - - FieldInfo spinControlPositionXFieldInfo = listType.GetField("_spinControlPositionX", - BindingFlags.NonPublic | BindingFlags.Instance); - int spinControlPositionX = (int)spinControlPositionXFieldInfo.GetValue(_list); - FieldInfo spinControlPositionYFieldInfo = listType.GetField("_spinControlPositionY", - BindingFlags.NonPublic | BindingFlags.Instance); - int spinControlPositionY = (int)spinControlPositionYFieldInfo.GetValue(_list); + _cursorX = _list.CursorX; + _offset = _list.Offset; _listButtons = new List<ListButtonElement>(); _labelControls1 = new List<ListLabelElement>(); _labelControls2 = new List<ListLabelElement>(); _labelControls3 = new List<ListLabelElement>(); _cachedBitmaps = new Dictionary<String, Bitmap>(); - AllocButtons(spinControlPositionX, spinControlPositionY); - _listItemsFieldInfo = listType.GetField("_listItems", - BindingFlags.NonPublic | BindingFlags.Instance); + AllocButtons(_list.SpinX, _list.SpinY); initializeLabels(); _verticalScrollBarElement = new VerticalScrollBarElement(_list.Scrollbar); - _offset = (int)_offsetFieldInfo.GetValue(_list); - _cursorX = (int)_cursorXFieldInfo.GetValue(_list); _focus = _list.IsFocused; Log.Debug("VideoPlayerOSD: Found list element: "); } @@ -535,14 +439,14 @@ /// <param name="graph">Graphics</param> public override void DrawElement(Graphics graph) { if (_list.Visible) { - _listItems = _listItemsFieldInfo.GetValue(_list) as List<GUIListItem>; + _listItems = _list.ListItems; int dwPosY = _list.YPosition; // Render the buttons first. - for (int i = 0; i < _itemsPerPage; i++) { + for (int i = 0; i < _list.ItemsPerPage; i++) { if (i + _offset < _listItems.Count) { // render item bool gotFocus = false; - if (_drawFocus && i == _cursorX && _list.IsFocused && _listType == GUIListControl.ListType.CONTROL_LIST) + if (_list.DrawFocus && i == _cursorX && _list.IsFocused && _list.TypeOfList == GUIListControl.ListType.CONTROL_LIST) gotFocus = true; RenderButton(graph, i, _list.XPosition, dwPosY, gotFocus); } @@ -551,7 +455,7 @@ // Render new item list dwPosY = _list.YPosition; - for (int i = 0; i < _itemsPerPage; i++) { + for (int i = 0; i < _list.ItemsPerPage; i++) { int dwPosX = _list.XPosition; if (i + _offset < _listItems.Count) { int iconX; @@ -560,7 +464,7 @@ int ten = 10; GUIGraphicsContext.ScaleHorizontal(ref ten); - switch (_alignment) { + switch (_list.TextAlignment) { case GUIControl.Alignment.ALIGN_RIGHT: iconX = dwPosX + _list.Width - _list.IconOffsetX - _list.ImageWidth; labelX = dwPosX; @@ -617,8 +521,8 @@ /// <returns>true, if an update is needed</returns> protected override bool CheckElementSpecificForUpdate() { bool result = false; - int newOffset = (int)_offsetFieldInfo.GetValue(_list); - int newCursorX = (int)_cursorXFieldInfo.GetValue(_list); + int newOffset = _list.Offset; + int newCursorX = _list.CursorX; if (_offset!=newOffset) { _offset = newOffset; result = true; @@ -642,7 +546,7 @@ /// <param name="spinControlPositionX">X Position</param> /// <param name="spinControlPositionY">Y Position</param> private void AllocButtons(int spinControlPositionX, int spinControlPositionY) { - for (int i = 0; i < _itemsPerPage; ++i) { + for (int i = 0; i < _list.ItemsPerPage; ++i) { ListButtonElement cntl = new ListButtonElement(spinControlPositionX, spinControlPositionY, _list.Width, _list.ItemHeight, _list.ButtonFocusName, _list.ButtonNoFocusName); _listButtons.Add(cntl); } @@ -652,7 +556,7 @@ /// Initialize the labels /// </summary> private void initializeLabels() { - for (int i = 0; i < _itemsPerPage; ++i) { + for (int i = 0; i < _list.ItemsPerPage; ++i) { ListLabelElement cntl1 = new ListLabelElement(); cntl1.Font = getFont(_list.FontName); cntl1.Brush = new SolidBrush(GetColor(_list.TextColor)); @@ -697,11 +601,11 @@ dwColor = _list.SelectedColor2; if (pItem.IsPlayed) - dwColor = _playedColor; + dwColor = _list.PlayedColor; if (pItem.IsRemote) { - dwColor = _remoteColor; - if (pItem.IsDownloading) dwColor = _downloadColor; + dwColor = _list.RemoteColor; + if (pItem.IsDownloading) dwColor = _list.DownloadColor; } int xpos = dwPosX; @@ -736,11 +640,11 @@ dwColor = _list.SelectedColor; if (pItem.IsPlayed) - dwColor = _playedColor; + dwColor = _list.PlayedColor; if (pItem.IsRemote) { - dwColor = _remoteColor; - if (pItem.IsDownloading) dwColor = _downloadColor; + dwColor = _list.RemoteColor; + if (pItem.IsDownloading) dwColor = _list.DownloadColor; } RenderText(graph, buttonNr, (float)dwPosX, (float)dwPosY + GUIGraphicsContext.ScaleVertical(2) + _list.TextOffsetY, (float)dMaxWidth, dwColor, _textLine); @@ -753,11 +657,11 @@ dwColor = _list.SelectedColor2; if (pItem.IsPlayed) - dwColor = _playedColor; + dwColor = _list.PlayedColor; if (pItem.IsRemote) { - dwColor = _remoteColor; - if (pItem.IsDownloading) dwColor = _downloadColor; + dwColor = _list.RemoteColor; + if (pItem.IsDownloading) dwColor = _list.DownloadColor; } if (0 == _list.TextOffsetX2) dwPosX = _list.XPosition + _list.Width - GUIGraphicsContext.ScaleHorizontal(16); @@ -789,11 +693,11 @@ dwColor = _list.SelectedColor3; if (pItem.IsPlayed) - dwColor = _playedColor; + dwColor = _list.PlayedColor; if (pItem.IsRemote) { - dwColor = _remoteColor; - if (pItem.IsDownloading) dwColor = _downloadColor; + dwColor = _list.RemoteColor; + if (pItem.IsDownloading) dwColor = _list.DownloadColor; } if (0 == _list.TextColor3) @@ -848,7 +752,7 @@ if (label == null) return; SizeF stringSize = label.GetStringSize(graph); - if (_alignment == GUIControl.Alignment.ALIGN_RIGHT && stringSize.Width < fMaxWidth) { + if (_list.TextAlignment == GUIControl.Alignment.ALIGN_RIGHT && stringSize.Width < fMaxWidth) { label.XPosition = fPosX + fMaxWidth; label.YPosition = fPosY; } else { @@ -859,7 +763,7 @@ label.Label = strTextToRender; label.Width = fMaxWidth; if (stringSize.Width < fMaxWidth) - label.Alignment = _alignment; + label.Alignment = _list.TextAlignment; else label.Alignment = GUIControl.Alignment.ALIGN_LEFT; label.Font = getFont(_list.FontName); @@ -962,7 +866,7 @@ /// <param name="graph">Graphics</param> /// <param name="y">Y Position</param> private void RenderScrollbar(Graphics graph, int y) { - if (_listItems.Count > _itemsPerPage) { + if (_listItems.Count > _list.ItemsPerPage) { if (_verticalScrollBarElement != null) { _verticalScrollBarElement.DrawElement(graph); } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/SliderElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -82,15 +81,9 @@ : base(control) { _slider = control as GUISliderControl; Type buttonType = typeof(GUISliderControl); - FieldInfo backgroundBitmapFieldInfo = buttonType.GetField("_backgroundTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _backgroundBitmap = loadBitmap(backgroundBitmapFieldInfo.GetValue(_slider).ToString()); - FieldInfo sliderBitmapFieldInfo = buttonType.GetField("_sliderTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _sliderBitmap = loadBitmap(sliderBitmapFieldInfo.GetValue(_slider).ToString()); - FieldInfo sliderFocusBitmapFieldInfo = buttonType.GetField("_sliderFocusTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _sliderFocusBitmap = loadBitmap(sliderFocusBitmapFieldInfo.GetValue(_slider).ToString()); + _backgroundBitmap = loadBitmap(_slider.BackGroundTextureName); + _sliderBitmap = loadBitmap(_slider.BackTextureMidName); + _sliderFocusBitmap = loadBitmap(_slider.BackTextureMidNameFocus); _focus = _slider.Focus; _percentage = _slider.Percentage; _strValue = getStringValue(); Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/TextScrollUpElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -53,11 +52,6 @@ private Brush _brush; /// <summary> - /// Alignment of the message - /// </summary> - private GUIControl.Alignment _alignment; - - /// <summary> /// Label of the text scrollup element /// </summary> private String _label; @@ -72,13 +66,8 @@ : base(control) { _textScrollUp = control as GUITextScrollUpControl; Type textScrollUpType = typeof(GUITextScrollUpControl); - FieldInfo fontNameFieldInfo = textScrollUpType.GetField("_fontName", - BindingFlags.NonPublic | BindingFlags.Instance); - _font = getFont(fontNameFieldInfo.GetValue(_textScrollUp).ToString()); + _font = getFont(_textScrollUp.FontName); _brush = new SolidBrush(GetColor(_textScrollUp.TextColor)); - FieldInfo alignmentFieldInfo = textScrollUpType.GetField("_textAlignment", - BindingFlags.NonPublic | BindingFlags.Instance); - _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_textScrollUp); _label = _textScrollUp.Property; Log.Debug("VideoPlayerOSD: Found textScrollUp element: " + _textScrollUp.GetID); } @@ -93,9 +82,9 @@ if (_textScrollUp.Visible) { SizeF textSize = graph.MeasureString(_label, _font); RectangleF rectangle; - if (_alignment == GUIControl.Alignment.ALIGN_LEFT) { + if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_LEFT) { rectangle = new RectangleF((float)_textScrollUp.Location.X, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height); - } else if (_alignment == GUIControl.Alignment.ALIGN_RIGHT) { + } else if (_textScrollUp.TextAlignment == GUIControl.Alignment.ALIGN_RIGHT) { rectangle = new RectangleF((float)_textScrollUp.Location.X - textSize.Width, (float)_textScrollUp.Location.Y, _textScrollUp.Width, _textScrollUp.Height); } else { rectangle = new RectangleF((float)_textScrollUp.Location.X - (textSize.Width / 2), (float)_textScrollUp.Location.Y - (textSize.Height / 2), _textScrollUp.Width, _textScrollUp.Height); Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/ToggleButtonElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -63,11 +62,6 @@ private Bitmap _altNoFocusBitmap; /// <summary> - /// Alignment of the message - /// </summary> - private GUIControl.Alignment _alignment; - - /// <summary> /// Font /// </summary> private Font _font; @@ -107,22 +101,10 @@ : base(control) { _button = control as GUIToggleButtonControl; _font = getFont(_button.FontName); - Type buttonType = typeof(GUIToggleButtonControl); - FieldInfo focusBitmapFieldInfo = buttonType.GetField("_focusedTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _focusBitmap = loadBitmap(focusBitmapFieldInfo.GetValue(_button).ToString()); - FieldInfo noFocusBitmapFieldInfo = buttonType.GetField("_nonFocusedTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _noFocusBitmap = loadBitmap(noFocusBitmapFieldInfo.GetValue(_button).ToString()); - FieldInfo altFocusBitmapFieldInfo = buttonType.GetField("_alternativeFocusTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _altFocusBitmap = loadBitmap(altFocusBitmapFieldInfo.GetValue(_button).ToString()); - FieldInfo altNoFocusBitmapFieldInfo = buttonType.GetField("_alternativeNonFocusTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _altNoFocusBitmap = loadBitmap(altNoFocusBitmapFieldInfo.GetValue(_button).ToString()); - FieldInfo alignmentFieldInfo = buttonType.GetField("_textAlignment", - BindingFlags.NonPublic | BindingFlags.Instance); - _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_button); + _focusBitmap = loadBitmap(_button.TexutureFocusName); + _noFocusBitmap = loadBitmap(_button.TexutureNoFocusName); + _altFocusBitmap = loadBitmap(_button.AltTexutureFocusName); + _altNoFocusBitmap = loadBitmap(_button.AltTexutureNoFocusName); _textColor = GetColor(_button.TextColor); _disabledColor = GetColor(_button.DisabledColor); _focus = _button.Focus; @@ -168,7 +150,7 @@ // render the text on the button int x = 0; - switch (_alignment) { + switch (_button.TextAlignment) { case GUIControl.Alignment.ALIGN_LEFT: x = _button.TextOffsetX + _button.XPosition; break; Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VerticalScrollbarElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -25,7 +25,6 @@ using System; using System.Collections.Generic; using System.Drawing; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -69,18 +68,9 @@ public VerticalScrollBarElement(GUIControl control) : base(control) { _verticalScrollBar = control as GUIVerticalScrollbar; - Type verticalScrollBarType = typeof(GUIVerticalScrollbar); - FieldInfo scrollBarBgFieldInfo = verticalScrollBarType.GetField("_scrollbarBackgroundName", - BindingFlags.NonPublic | BindingFlags.Instance); - _scrollBarBackground = loadBitmap(scrollBarBgFieldInfo.GetValue(_verticalScrollBar).ToString()); ; - - FieldInfo scrollBarTopFieldInfo = verticalScrollBarType.GetField("_scrollbarTopTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _scrollBarTop = loadBitmap(scrollBarTopFieldInfo.GetValue(_verticalScrollBar).ToString()); ; - - FieldInfo scrollBarBottomFieldInfo = verticalScrollBarType.GetField("_scrollbarBottomTextureName", - BindingFlags.NonPublic | BindingFlags.Instance); - _scrollBarBottom = loadBitmap(scrollBarBottomFieldInfo.GetValue(_verticalScrollBar).ToString()); ; + _scrollBarBackground = loadBitmap(_verticalScrollBar.BackGroundTextureName); ; + _scrollBarTop = loadBitmap(_verticalScrollBar.BackTextureTopName); ; + _scrollBarBottom = loadBitmap(_verticalScrollBar.BackTextureBottomName); ; _percentage = _verticalScrollBar.Percentage; Log.Debug("VideoPlayerOSD: Found vertical scroll bar element "); } Modified: trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs =================================================================== --- trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/ExternalOSDLibrary/Elements/VolumeBarElement.cs 2007-11-19 17:42:47 UTC (rev 1077) @@ -27,7 +27,6 @@ using System.Drawing; using System.Drawing.Drawing2D; using System.Drawing.Imaging; -using System.Reflection; using System.Text; using MediaPortal.GUI.Library; @@ -81,19 +80,13 @@ public VolumeBarElement(GUIControl control) : base(control) { _volumeBar = control as GUIVolumeBar; - Type volumeBarType = typeof(GUIVolumeBar); - FieldInfo textureNameFieldInfo = volumeBarType.GetField("_textureName", - BindingFlags.NonPublic | BindingFlags.Instance); - FieldInfo alignmentFieldInfo = volumeBarType.GetField("_alignment", - BindingFlags.NonPublic | BindingFlags.Instance); - String textureFileName = textureNameFieldInfo.GetValue(_volumeBar).ToString(); - _alignment = (GUIControl.Alignment)alignmentFieldInfo.GetValue(_volumeBar); - _bitmap = loadBitmap(textureFileName); + _alignment = _volumeBar.TextAlignment; + _bitmap = loadBitmap(_volumeBar.TextureName); _image1 = _volumeBar.Image1; _image2 = _volumeBar.Image2; _maximum = _volumeBar.Maximum; _current = _volumeBar.Current; - Log.Debug("VideoPlayerOSD: Found volume bar element: " + textureFileName); + Log.Debug("VideoPlayerOSD: Found volume bar element: " + _volumeBar.TextureName); } #endregion Deleted: trunk/plugins/My MPlayer/MPlayer-License.txt =================================================================== --- trunk/plugins/My MPlayer/MPlayer-License.txt 2007-11-19 13:25:08 UTC (rev 1076) +++ trunk/plugins/My MPlayer/MPlayer-License.txt 2007-11-19 17:42:47 UTC (rev 1077) @@ -1,96 +0,0 @@ -The plugin is licensed under the terms of the terms of the GNU General Public License as published by the Free Software Foundation, which is displayed below. You are only allowed to use this plugin if your with this plugin used version of MPlayer does not violate the laws of your country! - ------------------------------------------------------------ - - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - - Preamble - - The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - - Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - - c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - - 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS Copied: trunk/plugins/My MPlayer/My MPlayer-License.txt (from rev 1017, trunk/plugins/My MPlayer/MPlayer-License.txt) =================================================================== --- trunk/plugins/My MPlayer/My MPlayer-License.txt (rev 0) +++ trunk/plugins/My MPlayer/My MPlayer-License.txt 2007-11-19 17:42:47 UTC (rev 1077) @@ -0,0 +1,96 @@ +The plugin is licensed under the terms of the terms of the GNU General Public License as published by the Free Software Foundation, which is displayed below. You are only allowed to use this plugin if your with this plugin used version of MPlayer does not violate the laws of your country! + +----------------------------------------------------------- + + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. + + + Preamble + + The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too. + + When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. + + We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. + + Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. + + c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. + + 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. + + 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. + +This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundati... [truncated message content] |
From: <rs...@us...> - 2007-11-19 13:25:21
|
Revision: 1076 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1076&view=rev Author: rsparey Date: 2007-11-19 05:25:08 -0800 (Mon, 19 Nov 2007) Log Message: ----------- Modified Paths: -------------- trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_fastforward.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_pause.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_play.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_rewind.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_stop.png trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/osd_bg_top.png trunk/skins/Foofaraw/Development Skin/Foofaraw/MyRadioLastFM.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/common.progressbar.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytrailers.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvFullScreen.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/videoFullScreen.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_fastforward.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_pause.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_play.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_rewind.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/logo_stop.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/Media/osd_bg_top.png =================================================================== (Binary files differ) Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/MyRadioLastFM.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/MyRadioLastFM.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/MyRadioLastFM.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -5,71 +5,90 @@ <allowoverlay>no</allowoverlay> <define>#selecteditem:#Play.Current.Lastfm.CurrentStream</define> <controls> - <control> + <import>common.window.xml</import> + <import>common.time.xml</import> + + <control> <type>image</type> - <description>background image</description> - <id>0</id> - </control> - <control> + <decription>lowbar info block</decription> + <id>1</id> + <posX>12</posX> + <posY>590</posY> + <width>1342</width> + <height>168</height> + <texture>lowbar.png</texture> + </control> + <control> + <description>icon background</description> <type>image</type> - <description>OSD background image</description> - <id>0</id> - <posX>58</posX> - <posY>566</posY> - <width>1250</width> - <height>189</height> - <texture>osd_bg.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> + <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> </control> - <control> + <control> <type>image</type> - <description>background hover image</description> - <id>0</id> - <posX>120</posX> - <posY>590</posY> - <width>120</width> - <height>168</height> - <texture>music.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> + <description>Radio top left text logo</description> + <id>1</id> + <posX>90</posX> + <posY>23</posY> + <texture>radio_logo.png</texture> + <animation effect="fade" time="500" delay="1300">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <control> + <control> <type>image</type> - <description>title image</description> - <id>0</id> - <posX>113</posX> - <posY>26</posY> - <texture>radio_logo.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> + <id>1</id> + <posX>15</posX> + <posY>5</posY> + <width>61</width> + <height>122</height> + <texture>hover_my radio.png</texture> + <animation effect="fade" time="1000" delay="2000">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> <control> - <type>image</type> - <description>nowplaying background</description> - <id>0</id> - <posX>886</posX> - <posY>56</posY> - <width>400</width> - <height>484</height> - <texture>nowplaying_background.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> + <type>label</type> + <description>Last FM Label</description> + <id>1</id> + <posX>251</posX> + <posY>68</posY> + <label>#Play.Current.Lastfm.CurrentStream</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> </control> + <control> <type>image</type> <description>artist art image</description> <id>112</id> - <posX>908</posX> + <posX>908</posX> <posY>122</posY> <width>350</width> <height>350</height> - <texture>#Play.Current.ArtistThumb</texture> + <texture flipY="true" diffuse="Thumb_Mask.png">#Play.Current.ArtistThumb</texture> <!-- <texture>F:\\Quellen\\Mediaportal-trunk\\xbmc\\bin\\Debug\\skin\\BlueTwo\\media\\missing_coverart.png</texture> --> <centered>yes</centered> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> + <control> + <type>image</type> + <id>1</id> + <posX>850</posX> + <posY>95</posY> + <width>430</width> + <height>385</height> + <texture flipY="true" diffuse="Thumb_Mask.png">cd_box.png</texture> + </control> <control> <description>start a stream</description> <type>button</type> @@ -117,7 +136,7 @@ <description>track label</description> <id>0</id> <posX>285</posX> - <posY>611</posY> + <posY>615</posY> <width>800</width> <height>26</height> <label>#Play.Current.Title</label> @@ -131,7 +150,7 @@ <description>artist label</description> <id>0</id> <posX>285</posX> - <posY>668</posY> + <posY>672</posY> <width>800</width> <height>26</height> <label>#Play.Current.Artist</label> @@ -154,22 +173,9 @@ <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> + <control> <type>label</type> - <description>stream label</description> - <id>0</id> - <posX>366</posX> - <posY>33</posY> - <width>500</width> - <label>#Play.Current.Lastfm.CurrentStream</label> - <font>font16</font> - <align>left</align> - <textcolor>80ffffff</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <control> - <type>label</type> <description>track progress label</description> <id>0</id> <posX>908</posX> @@ -222,30 +228,7 @@ <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <!-- - <control> - <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> - <description>list of best track tags</description> - <font>font13</font> - <id>55</id> - <onup>66</onup> - <onleft>66</onleft> - <posX>40</posX> - <posY>333</posY> - <width>250</width> - <height>100</height> - <itemWidth>35</itemWidth> - <itemHeight>15</itemHeight> - <spaceBetweenItems>2</spaceBetweenItems> - <textureHeight>14</textureHeight> - <spinColor>-</spinColor> - <textureUp>-</textureUp> - <textureDown>-</textureDown> - <textureUpFocus>-</textureUpFocus> - <textureDownFocus>-</textureDownFocus> - <textureNoFocus>-</textureNoFocus> - <textcolor>White</textcolor> - </control> ---> + + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/common.progressbar.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/common.progressbar.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/common.progressbar.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -1,25 +1,13 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> <controls> - <control> - <description>progressbar background</description> - <type>image</type> - <id>104</id> - <posX>60</posX> - <posY>10</posY> - <width>1229</width> - <height>109</height> - <texture>osd_bg_top.png</texture> - <visible>no</visible> - <animation effect="fade" time="250">visiblechange</animation> - <animation effect="fade" time="250">windowopen</animation> - </control> + <control> <description>background</description> <type>image</type> <id>105</id> <posX>196</posX> - <posY>43</posY> + <posY>25</posY> <width>547</width> <height>43</height> <texture>osd_progress_background.png</texture> @@ -32,9 +20,9 @@ <type>progress</type> <id>1</id> <posX>188</posX> - <posY>47</posY> + <posY>33</posY> <width>539</width> - <height>36</height> + <height>26</height> <label>#percentage</label> <animation effect="fade" time="250">visiblechange</animation> <animation effect="fade" time="250">windowopen</animation> @@ -44,10 +32,10 @@ <description>Time Past Info</description> <type>label</type> <id>101</id> - <posX>140</posX> - <posY>63</posY> + <posX>190</posX> + <posY>31</posY> <label>#currentplaytime</label> - <align>center</align> + <align>right</align> <font>font13</font> <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="250">visiblechange</animation> @@ -58,10 +46,10 @@ <description>Remaining Time Info</description> <type>label</type> <id>102</id> - <posX>820</posX> - <posY>63</posY> + <posX>750</posX> + <posY>31</posY> <label>#currentremaining</label> - <align>center</align> + <align>left</align> <font>font13</font> <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="250">visiblechange</animation> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/musicOverlay.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -3,143 +3,52 @@ <id>2004</id> <defaultcontrol>2</defaultcontrol> <controls> - <control> - <description>Gap / Normal Icon</description> - <type>image</type> - <id>10</id> - <posX>20</posX> - <posY>590</posY> - <width>33</width> - <height>33</height> - <texture>logo_gap.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - - <control> - <description>Gapless Icon</description> - <type>image</type> - <id>11</id> - <posX>20</posX> - <posY>590</posY> - <width>33</width> - <height>33</height> - <texture>logo_gapless.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> + <control> - <description>Crossfade Icon</description> - <type>image</type> - <id>12</id> - <posX>20</posX> - <posY>590</posY> - <width>33</width> - <height>33</height> - <texture>logo_crossfade.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> <description>play time label</description> <type>label</type> <id>2</id> - <posX>70</posX> - <posY>580</posY> + <posX>80</posX> + <posY>730</posY> <label>#currentplaytime</label> - <align>left</align> - <font>wipeout</font> - <textcolor>20ffffff</textcolor> + <align>Right</align> + <font>font13</font> + <textcolor>ffffffff</textcolor> <animation effect="fade" time="500">WindowClose</animation> <animation effect="fade" time="250">WindowOpen</animation> </control> - <control> - <description>Album Artwork</description> - <type>image</type> - <id>1</id> - <posX>30</posX> - <posY>628</posY> - <width>180</width> - <height>101</height> - <keepaspectratio>yes</keepaspectratio> - <centered>yes</centered> - <texture>#Play.Current.Thumb</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - - <control> - <description>play logo</description> - <type>image</type> - <id>3</id> - <posX>165</posX> - <posY>587</posY> - <texture>logo_play.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>Pause logo</description> - <type>image</type> - <id>4</id> - <posX>165</posX> - <posY>587</posY> - <texture>logo_pause.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>FF logo</description> - <type>image</type> - <id>7</id> - <posX>165</posX> - <posY>587</posY> - <texture>logo_fastforward.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>RW logo</description> - <type>image</type> - <id>8</id> - <posX>165</posX> - <posY>587</posY> - <texture>logo_rewind.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - - - - - <control> - <description>album/artist/genre etc info label</description> + <description>scrolling info label</description> <type>fadelabel</type> - - <width>180</width> - <height>40</height> - <posX>200</posX> - <posY>592</posY> + <width>100</width> + <height>45</height> + <posX>90</posX> + <posY>730</posY> <font>font13</font> <label>#Play.Current.Title\r#Play.Current.Artist\r#Play.Current.Album\r#Play.Current.Duration</label> - <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="500">WindowClose</animation> <animation effect="fade" time="250">WindowOpen</animation> <id>5</id> </control> + + + + + + + <control> <description>video preview window</description> <type>videowindow</type> <id>9</id> <posX>20</posX> - <posY>626</posY> - <width>223</width> - <height>125</height> + <posY>630</posY> + <width>178</width> + <height>100</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> + </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/myradioguide.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -79,12 +79,12 @@ <control> <description>RADIO GUIDE Panel</description> - <type>image</type> + <type>image</type> <id>2</id> <posX>5</posX> - <posY>200</posY> + <posY>100</posY> <width>1322</width> - <height>380</height> + <height>486</height> <colordiffuse>60ffffff</colordiffuse> <texture>-</texture> <animation effect="fade" time="250">WindowOpen</animation> @@ -122,7 +122,7 @@ <width>24</width> <height>24</height> <posX>43</posX> - <posY>160</posY> + <posY>105</posY> <showrange>no</showrange> <orientation>horizontal</orientation> <align>center</align> @@ -137,27 +137,27 @@ </control> - <control> + <control> <description>Channel template</description> <type>image</type> <id>20</id> - <posX>50</posX> - <posY>200</posY> + <posX>50</posX> + <posY>140</posY> <width>155</width> - <height>35</height> + <height>40</height> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <control> + <control> <description>Channel image template</description> <type>image</type> <id>7</id> - <width>36</width> + <posX>4</posX> + <posY>4</posY> + <width>32</width> <height>32</height> <zoom>no</zoom> - <keepaspectratio>yes</keepaspectratio> - <zoom>yes</zoom> - <texture>defaultVideoBig.png</texture> + <texture>TV.png</texture> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> @@ -174,59 +174,60 @@ <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <control> + <control> <description>Current program title</description> <type>fadelabel</type> <id>13</id> - <posX>400</posX> - <posY>580</posY> - <width>600</width> + <posX>400</posX> + <posY>587</posY> + <width>400</width> <label>#Radio.Guide.Title</label> <font>font16</font> <textcolor>FFFFFFFF</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> + <control> <description>Current program time</description> <type>label</type> <id>14</id> - <posX>230</posX> - <posY>585</posY> + <posX>850</posX> + <posY>593</posY> <label>#Radio.Guide.Time</label> <align>left</align> - <font>font16</font> + <font>font14</font> <textcolor>FFB2D4F5</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <control> + + + <control> <description>Current program genre</description> <type>label</type> <id>27</id> - <posX>1320</posX> - <posY>580</posY> + <posX>1320</posX> + <posY>590</posY> <label>#Radio.Guide.Genre</label> - <align>left</align> - <font>font16</font> + <align>Right</align> + <font>font14</font> <textcolor>FFB2D4F5</textcolor> <animation effect="fade" time="250">WindowOpen</animation> <animation effect="fade" time="500">WindowClose</animation> </control> - <control> + <control> <description>Description1</description> <type>textboxscrollup</type> <id>15</id> - <posX>230</posX> + <posX>260</posX> <posY>620</posY> - <width>1100</width> + <width>670</width> <height>93</height> <seperator>----------------------------------------------------------------------------------------------</seperator> <label>#Radio.Guide.Description</label> - <font>font13</font> + <font>font14</font> <textcolor>FFFFFFFF</textcolor> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> </control> <!-- <control> <description>template for program genre light area</description> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytrailers.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytrailers.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytrailers.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -3,17 +3,104 @@ <id>5900</id> <defaultcontrol>2</defaultcontrol> <allowoverlay>yes</allowoverlay> - <define>#header.label:5900</define> - <define>#header.image:trailers_logo.png</define> - <define>#header.hover:hover_my trailers.png</define> <controls> <import>common.window.xml</import> + <import>common.time.xml</import> + + <control> + <description>icon and label 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> + </control> + <control> + <type>image</type> + <description>Picture text gfx</description> + <id>1</id> + <posX>90</posX> + <posY>18</posY> + <texture>videos_logo.png</texture> + <animation effect="fade" time="500" delay="1300">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + + <control> + <type>image</type> + <decription>video icon</decription> + <id>1</id> + <posX>15</posX> + <posY>5</posY> + <width>61</width> + <height>122</height> + <texture>hover_my videos.png</texture> + <animation effect="fade" time="1000" delay="2000">WindowOpen</animation> + <animation effect="fade" time="500">WindowClose</animation> + </control> + <control> + <type>label</type> + <description>My trailiers Label</description> + <id>1</id> + <posX>251</posX> + <posY>68</posY> + <label>3</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> + </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>650</posY> + <width>700</width> + <label>#selecteditem</label> + <font>wipeout</font> + <align>Left</align> + <textcolor>ffffffff</textcolor> + </control> + + <control> + <type>image</type> + <decription>top-strip</decription> + <id>1</id> + <posX>12</posX> + <posY>100</posY> + <width>1342</width> + <height>36</height> + <texture>top-strip.png</texture> + + </control> + + + <control> + <type>image</type> + <decription>lowbar info block</decription> + <id>1</id> + <posX>12</posX> + <posY>590</posY> + <width>1342</width> + <height>168</height> + <texture>lowbar.png</texture> + </control> <control> <type>togglebutton</type> <description>Plot</description> <id>5</id> <posX>113</posX> - <posY>176</posY> + <posY>200</posY> <onleft>4</onleft> <onright>4</onright> <onup>3</onup> @@ -25,7 +112,7 @@ <description>Cast</description> <id>6</id> <posX>113</posX> - <posY>222</posY> + <posY>246</posY> <onleft>4</onleft> <onright>4</onright> <onup>5</onup> @@ -128,7 +215,7 @@ <description>Letter button</description> <id>3</id> <posX>113</posX> - <posY>129</posY> + <posY>153</posY> <onleft>4</onleft> <onright>4</onright> <onup>17</onup> @@ -163,43 +250,57 @@ <font>font18</font> <disabledcolor>ff808080</disabledcolor> </control> - <control> - <type>listcontrol</type> <dimColor>0x10ffffff</dimColor> - <description>listview</description> - <id>4</id> - <posX>474</posX> - <width>586</width> - <height>576</height> - <onleft>3</onleft> + <control> + <description>listcontrol</description> + <type>listcontrol</type> + <id>4</id> + <onleft>3</onleft> <onright>3</onright> <onup>3</onup> <ondown>3</ondown> - <textXOff2>0</textXOff2> - <IconYOff>10</IconYOff> - <textYOff>5</textYOff> - <font>font13</font> - <textXOff>9</textXOff> - <textureHeight>42</textureHeight> - <IconXOff>15</IconXOff> - <spinPosX>1119</spinPosX> - <textYOff2>5</textYOff2> - </control> + <posX>542</posX> + <posY>140</posY> + <width>800</width> + <height>500</height> + <spinWidth>28</spinWidth> + <spinHeight>28</spinHeight> + <spinPosX>1252</spinPosX> + <spinPosY>592</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> + <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> <type>image</type> - <description>movie border</description> - <id>0</id> - <posX>178</posX> - <posY>277</posY> - <width>160</width> - <height>245</height> - <texture>playback_background.png</texture> - </control> - <control> - <type>image</type> <description>movie poster</description> <id>24</id> <posX>188</posX> - <posY>296</posY> + <posY>310</posY> <width>136</width> <height>200</height> </control> Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvFullScreen.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvFullScreen.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/mytvFullScreen.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -1,13 +1,26 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <window> <id>602</id> - <defaultcontrol>13</defaultcontrol> + <defaultcontrol>13</defaultcontrol> <allowoverlay>no</allowoverlay> <define>#percentage:#TV.View.Percentage</define> <define>#currentplaytime:#TV.View.start</define> <define>#currentremaining:#TV.View.stop</define> <controls> <control> + <description>bar image</description> + <posX>12</posX> + <posY>10</posY> + <width>1342</width> + <height>75</height> + <texture>osd_bg_top.png</texture> + <type>image</type> + <id>0</id> + + <visible>no</visible> + <animation effect="fade" time="250">visiblechange</animation> + </control> + <control> <description>Current Time Info</description> <type>label</type> <id>110</id> @@ -20,19 +33,7 @@ <animation effect="fade" time="250">visiblechange</animation> <animation effect="fade" time="250">windowopen</animation> </control> - <control> - <description>bar image</description> - <posX>60</posX> - <posY>10</posY> - <width>1246</width> - <height>60</height> - <texture>-</texture> - <type>image</type> - <id>0</id> - <colordiffuse>White</colordiffuse> - <visible>no</visible> - <animation effect="fade" time="250">visiblechange</animation> - </control> + <control> <description>Time Past Info</description> <type>label</type> @@ -61,25 +62,13 @@ <animation effect="fade" time="250">windowopen</animation> <visible>no</visible> </control> - <control> - <description>progressbar background</description> - <type>image</type> - <id>104</id> - <posX>60</posX> - <posY>10</posY> - <width>1229</width> - <height>109</height> - <texture>osd_bg_top.png</texture> - <visible>no</visible> - <animation effect="fade" time="250">visiblechange</animation> - <animation effect="fade" time="250">windowopen</animation> - </control> + <control> - <description>background</description> + <description> progress background</description> <type>image</type> <id>105</id> <posX>196</posX> - <posY>43</posY> + <posY>25</posY> <width>547</width> <height>43</height> <texture>osd_progress_background.png</texture> @@ -132,7 +121,7 @@ <type>image</type> <id>16</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-pause.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -144,7 +133,7 @@ <!-- <width>733</width> <height>26</height> --> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+2x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -154,7 +143,7 @@ <type>image</type> <id>18</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+4x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -164,7 +153,7 @@ <type>image</type> <id>19</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+8x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -174,7 +163,7 @@ <type>image</type> <id>20</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+16x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -184,7 +173,7 @@ <type>image</type> <id>21</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+32x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -194,7 +183,7 @@ <type>image</type> <id>23</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-2x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -204,7 +193,7 @@ <type>image</type> <id>24</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-4x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -214,7 +203,7 @@ <type>image</type> <id>25</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-8x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -224,7 +213,7 @@ <type>image</type> <id>26</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-16x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -234,7 +223,7 @@ <type>image</type> <id>27</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-32x.png</texture> <animation effect="fade" time="250">visiblechange</animation> @@ -257,7 +246,7 @@ <type>tvprogress</type> <id>100</id> <posX>188</posX> - <posY>53</posY> + <posY>33</posY> <width>539</width> <height>36</height> <toptexture>osd_progress_indicator.png</toptexture> @@ -289,7 +278,7 @@ <type>image</type> <id>39</id> <posX>900</posX> - <posY>50</posY> + <posY>40</posY> <texture>rec.png</texture> <animation effect="fade" time="250">visiblechange</animation> </control> @@ -388,14 +377,29 @@ <description>Progress Bar Shine</description> <type>image</type> <id>103</id> - <posX>79</posX> - <posY>29</posY> - <width>1191</width> - <height>36</height> - <texture>osd_progress_shine_bg.png</texture> + <posX>202</posX> + <posY>27</posY> + <width>538</width> + <height>25</height> + <texture>osd_progress_shine.png</texture> <visible>no</visible> <animation effect="fade" time="250">visiblechange</animation> <animation effect="fade" time="250">windowopen</animation> </control> + <control> + <description>VIDEO IMAGE</description> + <type>image</type> + <id>104</id> + <posX>20</posX> + <posY>8</posY> + <width>40</width> + <height>78</height> + <texture>#Play.Current.Thumb</texture> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <visible>no</visible> + <animation effect="fade" time="250">visiblechange</animation> + <animation effect="fade" time="250">windowopen</animation> + </control> </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/videoFullScreen.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/videoFullScreen.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/videoFullScreen.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -6,25 +6,27 @@ <controls> <control> <description>bar image</description> - <posX>60</posX> - <posY>500</posY> - <width>1246</width> - <height>60</height> - <texture>-</texture> + <posX>12</posX> + <posY>10</posY> + <width>1342</width> + <height>75</height> + <texture>osd_bg_top.png</texture> <type>image</type> <id>0</id> - <colordiffuse>White</colordiffuse> + <visible>no</visible> <animation effect="fade" time="250">visiblechange</animation> </control> <import>common.progressbar.xml</import> - <control> + + + <control> <description>row 1 label</description> <type>label</type> <id>10</id> <posX>1100</posX> - <posY>45</posY> + <posY>31</posY> <label>-</label> <align>left</align> <font>font13</font> @@ -37,7 +39,7 @@ <type>label</type> <id>11</id> <posX>1177</posX> - <posY>87</posY> + <posY>31</posY> <label>-</label> <align>left</align> <font>font13</font> @@ -50,7 +52,7 @@ <type>label</type> <id>12</id> <posX>1177</posX> - <posY>147</posY> + <posY>31</posY> <label>-</label> <align>left</align> <font>ffffffff</font> @@ -63,7 +65,7 @@ <type>image</type> <id>16</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-pause.png</texture> <colordiffuse>ffffffff</colordiffuse> @@ -74,7 +76,7 @@ <type>image</type> <id>17</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+2x.png</texture> <colordiffuse>White</colordiffuse> @@ -85,7 +87,7 @@ <type>image</type> <id>18</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+4x.png</texture> <colordiffuse>White</colordiffuse> @@ -96,7 +98,7 @@ <type>image</type> <id>19</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+8x.png</texture> <colordiffuse>White</colordiffuse> @@ -107,7 +109,7 @@ <type>image</type> <id>20</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video+16x.png</texture> <colordiffuse>White</colordiffuse> @@ -129,7 +131,7 @@ <type>image</type> <id>23</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-2x.png</texture> <colordiffuse>White</colordiffuse> @@ -140,7 +142,7 @@ <type>image</type> <id>24</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-4x.png</texture> <colordiffuse>White</colordiffuse> @@ -151,7 +153,7 @@ <type>image</type> <id>25</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-8x.png</texture> <colordiffuse>White</colordiffuse> @@ -162,7 +164,7 @@ <type>image</type> <id>26</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-16x.png</texture> <colordiffuse>White</colordiffuse> @@ -173,61 +175,13 @@ <type>image</type> <id>27</id> <posX>1000</posX> - <posY>50</posY> + <posY>30</posY> <visible>no</visible> <texture>video-32x.png</texture> <colordiffuse>White</colordiffuse> <animation effect="fade" time="250">visiblechange</animation> </control> - <!-- <control> - <description>background</description> - <type>image</type> - <id>104</id> - <posX>324</posX> - <posY>661</posY> - <width>710</width> - <height>29</height> - <texture>osd_progress_background.png</texture> - <visible>yes</visible> - </control> - <control> - <description>Progress Bar</description> - <type>progress</type> - <id>1</id> - <posX>301</posX> - <posY>663</posY> - <width>733</width> - <height>26</height> - <texturebg>osd_progress_back.png</texturebg> - <lefttexture>osd_progress_left.png</lefttexture> - <midtexture>osd_progress_mid.png</midtexture> - <righttexture>osd_progress_right.png</righttexture> - <visible>yes</visible> - <label>#percentage</label> - </control> - <control> - <description>Start Time Info</description> - <type>label</type> - <id>101</id> - <posX>303</posX> - <posY>660</posY> - <label>#currentplaytime</label> - <align>right</align> - <font>font16</font> - <textcolor>White</textcolor> - </control> - <control> - <description>Remaining time</description> - <type>label</type> - <id>102</id> - <posX>1052</posX> - <posY>660</posY> - <label>-#currentremaining</label> - <align>left</align> - <font>font16</font> - <textcolor>White</textcolor> - </control> --> <control> <type>image</type> <id>500</id> @@ -255,14 +209,29 @@ <description>Progress Bar Shine</description> <type>image</type> <id>103</id> - <posX>79</posX> - <posY>29</posY> - <width>1191</width> - <height>36</height> - <texture>osd_progress_shine_bg.png</texture> + <posX>202</posX> + <posY>27</posY> + <width>538</width> + <height>25</height> + <texture>osd_progress_shine.png</texture> <visible>no</visible> <animation effect="fade" time="250">visiblechange</animation> <animation effect="fade" time="250">windowopen</animation> </control> + <control> + <description>VIDEO IMAGE</description> + <type>image</type> + <id>104</id> + <posX>20</posX> + <posY>8</posY> + <width>40</width> + <height>78</height> + <texture>#Play.Current.Thumb</texture> + <keepaspectratio>yes</keepaspectratio> + <centered>yes</centered> + <visible>no</visible> + <animation effect="fade" time="250">visiblechange</animation> + <animation effect="fade" time="250">windowopen</animation> + </control> </controls> </window> \ No newline at end of file Modified: trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOSD.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -32,7 +32,7 @@ <description>Video Logo</description> <type>image</type> <id>102</id> - <posX>60</posX> + <posX>55</posX> <posY>630</posY> <width>60</width> <height>78</height> @@ -72,42 +72,7 @@ </control> - <control> - <description>Progress background</description> - <type>image</type> - <id>1</id> - <posX>50</posX> - <posY>700</posY> - <width>546</width> - <texture>osd_progress_background.png</texture> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <control> - <description>progress bar</description> - <type>progress</type> - <id>20</id> - <posX>43</posX> - <posY>705</posY> - <width>544</width> - <label>#percentag</label> - <visible>yes</visible> - <animation effect="fade" time="250">WindowOpen</animation> - <animation effect="fade" time="500">WindowClose</animation> - </control> - <control> - <description>progress bar shine</description> - - <type>image</type> - <id>1</id> - <posX>55</posX> - <posY>705</posY> - <width>538</width> - <height>25</height> - <texture>osd_progress_shine.png</texture> - <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/videoOverlay.xml =================================================================== --- trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml 2007-11-18 18:46:16 UTC (rev 1075) +++ trunk/skins/Foofaraw/Development Skin/Foofaraw/videoOverlay.xml 2007-11-19 13:25:08 UTC (rev 1076) @@ -9,62 +9,24 @@ <description>play time label</description> <type>label</type> <id>2</id> - <posX>20</posX> - <posY>592</posY> + <posX>80</posX> + <posY>730</posY> <label>#currentplaytime</label> - <align>left</align> + <align>Right</align> <font>font13</font> <textcolor>ffffffff</textcolor> <animation effect="fade" time="500">WindowClose</animation> <animation effect="fade" time="250">WindowOpen</animation> </control> + + <control> - <description>play logo</description> - <type>image</type> - <id>3</id> - <posX>0</posX> - <posY>695</posY> - <texture>logo_play.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>Pause logo</description> - <type>image</type> - <id>4</id> - <posX>0</posX> - <posY>695</posY> - <texture>logo_pause.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>FF logo</description> - <type>image</type> - <id>7</id> - <posX>0</posX> - <posY>695</posY> - <texture>logo_fastforward.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> - <description>RW logo</description> - <type>image</type> - <id>8</id> - <posX>0</posX> - <posY>695</posY> - <texture>logo_rewind.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - <control> <description>scrolling info label</description> <type>fadelabel</type> <width>100</width> - <height>40</height> - <posX>100</posX> - <posY>592</posY> + <height>45</height> + <posX>90</posX> + <posY>730</posY> <font>font13</font> <label>#Play.Current.Title\r#Play.Current.Genre\r#Play.Current.Year\r#Play.Current.Director</label> <animation effect="fade" time="500">WindowClose</animation> @@ -86,38 +48,7 @@ <animation effect="fade" time="250">WindowOpen</animation> </control> - <control> - <description>Progress Background</description> - <type>image</type> - <id>1</id> - <posX>19</posX> - <posY>734</posY> - <width>179</width> - <height>19</height> - <texture>progess_white_back.png</texture> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</animation> - </control> - - <control> - <description>progress bar</description> - <type>progress</type> - <id>1</id> - <posX>10</posX> - <posY>727</posY> - <width>544</width> - <label>#video.percentag</label> - <visible>yes</visible> + - - <texturebg>-</texturebg> - <lefttexture>white_progess.png</lefttexture> - <midtexture>white_progess.png</midtexture> - <righttexture>white_progess.png</righttexture> - - <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: <ze...@us...> - 2007-11-18 18:46:19
|
Revision: 1075 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1075&view=rev Author: zebons Date: 2007-11-18 10:46:16 -0800 (Sun, 18 Nov 2007) Log Message: ----------- MyFilms v4.3.0 Modified Paths: -------------- trunk/plugins/MyFilms/Configuration.cs 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 trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml trunk/plugins/MyFilms/skin/BlueTwo/MesFilmsDetail.xml Added Paths: ----------- trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png trunk/plugins/MyFilms/skin/BlueTwo/MesFilms_Visible.xml trunk/plugins/MyFilms/skin/BlueTwo wide/MesFilms_Visible.xml Modified: trunk/plugins/MyFilms/Configuration.cs =================================================================== --- trunk/plugins/MyFilms/Configuration.cs 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/Configuration.cs 2007-11-18 18:46:16 UTC (rev 1075) @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Text; using MediaPortal.Configuration; +using System.IO; @@ -21,7 +22,9 @@ 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", ""); + StrDirStor = xmlreader.GetValueAsString(CurrentConfig, "PathStorage", ""); + SearchFile = xmlreader.GetValueAsString(CurrentConfig, "SearchFileName", "False"); + ItemSearchFile = xmlreader.GetValueAsString(CurrentConfig, "ItemSearchFileName", ""); StrIdentItem = xmlreader.GetValueAsString(CurrentConfig, "AntIdentItem", ""); StrTitle1 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle1", ""); StrTitle2 = xmlreader.GetValueAsString(CurrentConfig, "AntTitle2", ""); @@ -83,8 +86,8 @@ 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); + Boolselect = xmlreader.GetValueAsBool(CurrentConfig, "Boolselect", false); + Boolreturn = xmlreader.GetValueAsBool(CurrentConfig, "Boolreturn", false); WStrSort = xmlreader.GetValueAsString(CurrentConfig, "WStrSort", ""); wselectedlabel = xmlreader.GetValueAsString(CurrentConfig, "WSelectedLabel", ""); Wstar = xmlreader.GetValueAsString(CurrentConfig, "Wstar", ""); @@ -92,6 +95,7 @@ StrViewDfltItem = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltItem", ""); StrViewDfltText = xmlreader.GetValueAsString(CurrentConfig, "ViewDfltText", ""); TitleDelim = xmlreader.GetValueAsString(CurrentConfig, "TitleDelim", "."); + DefaultCover = xmlreader.GetValueAsString(CurrentConfig, "DefaultCover", ""); } if (StrSelect == "") @@ -102,8 +106,10 @@ StrSort = StrTitle1; if (StrSortSens == "") StrSortSens = " ASC"; + + } + - } // static values private static string currentConfig = string.Empty; public static string CurrentConfig @@ -249,6 +255,18 @@ get { return strStorage; } set { strStorage = value; } } + private string searchFile = "False"; + public string SearchFile + { + get { return searchFile; } + set { searchFile = value; } + } + private string itemSearchFile = string.Empty; + public string ItemSearchFile + { + get { return itemSearchFile; } + set { itemSearchFile = value; } + } private string strIdentItem = string.Empty; public string StrIdentItem { @@ -387,6 +405,12 @@ get { return wstar; } set { wstar = value; } } + private string defaultcover = string.Empty; + public string DefaultCover + { + get { return defaultcover; } + set { defaultcover = value; } + } private int strLayOut = int.MinValue; public int StrLayOut { Modified: trunk/plugins/MyFilms/MesFilms.cs =================================================================== --- trunk/plugins/MyFilms/MesFilms.cs 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/MesFilms.cs 2007-11-18 18:46:16 UTC (rev 1075) @@ -66,16 +66,6 @@ CTRL_BtnSearchA = 5, CTRL_BtnLayout = 6, CTRL_TxtSelect = 12, - 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, @@ -83,21 +73,6 @@ 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_NbObjects = 2073 } [SkinControlAttribute((int)Controls.CTRL_TxtSelect)] @@ -106,8 +81,6 @@ protected GUISortButtonControl BtnSrtBy = null; [SkinControlAttribute((int)Controls.CTRL_List)] protected GUIFacadeControl facadeView = null; - //[SkinControlAttribute((int)Controls.CTRL_List)] - //protected GUIListControl lsCtlFilm = null; [SkinControlAttribute((int)Controls.CTRL_Texte)] protected GUITextScrollUpControl ScrlLstText = null; [SkinControlAttribute((int)Controls.CTRL_Title)] @@ -246,6 +219,12 @@ if (actionType.wID == Action.ActionType.ACTION_PREVIOUS_MENU) if (GetPrevFilmList()) return; + + //if (((actionType.wID == Action.ActionType.ACTION_MOVE_RIGHT) || (actionType.wID == Action.ActionType.ACTION_MOVE_LEFT)) + // && ((facadeView.SelectedListItem.ItemId > -1) && (!facadeView.SelectedListItem.IsFolder))) + // affichage_Lstdetail(facadeView.SelectedListItem.ItemId, true, facadeView.SelectedListItem.Label); + + base.OnAction(actionType); } //--------------------------------------------------------------------------------------- @@ -301,7 +280,7 @@ } else { - if (facadeView.SelectedListItemIndex > -1 && facadeView.SelectedListItem.IsFolder) + if (facadeView.SelectedListItemIndex > -1 && !facadeView.SelectedListItem.IsFolder) { affichage_Lstdetail(facadeView.SelectedListItem.ItemId, false, facadeView.SelectedListItem.Label); } @@ -314,35 +293,6 @@ 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 @@ -474,7 +424,7 @@ if (!facadeView.SelectedListItem.IsFolder && !conf.Boolselect) // New Window for detailed selected item information { - conf.StrIndex = facadeView.SelectedListItemIndex; + conf.StrIndex = facadeView.SelectedListItem.ItemId; GUIWindowManager.ActivateWindow(ID_MesFilmsDetail); } else @@ -620,34 +570,16 @@ facadeView.Clear(); //---------------------------------------------------------------------------------------- // Load the DataSet. + int number = -1; foreach (DataRow r in BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens)) { + number++; if (conf.Boolreturn)//in case of selection by view verify if value correspond excatly to the searched string { - //string[] split; - //if (conf.WStrSort == "DateAdded") - // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' }); - //else - // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',}); - //foreach (string s in split) - //{ - // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower()) - // goto suite; - //} - //goto fin; - //string[] split; - //if (conf.WStrSort == "DateAdded") - // split = string.Format("{0:yyyy/MM/dd}", r[conf.WStrSort]).Split(new Char[] { ',' }); - //else - // split = r[conf.WStrSort].ToString().Split(new Char[] { ',','(',')',}); - //foreach (string s in split) - //{ - // if (s.Trim().ToLower() == conf.Wselectedlabel.Trim().ToLower()) - // goto suite; - //} if (r[conf.WStrSort].ToString().IndexOfAny (conf.Wselectedlabel.Trim().ToCharArray ()) >=0) goto suite; - goto fin; } + goto fin; + } suite: string wthumb = item.ThumbnailImage; @@ -674,7 +606,6 @@ iCnt = 1; item = new GUIListItem(); item.Label = sFullTitle; // Set = full subfolders path initially - item.ItemId = (int)(r["Number"]); switch (conf.StrSort) { case "TranslatedTitle": @@ -702,22 +633,17 @@ break; } if (r["Picture"].ToString().IndexOf(":\\") == -1) - { - item.ThumbnailImage = conf.StrPathImg + "\\" + r["Picture"].ToString(); - item.IconImage = conf.StrPathImg + "\\" + r["Picture"].ToString(); - } + conf.FileImage = conf.StrPathImg + "\\" + r["Picture"].ToString(); else - { - item.ThumbnailImage = r["Picture"].ToString(); - item.IconImage = conf.StrPathImg + "\\" + r["Picture"].ToString(); - } - //if ((!System.IO.File.Exists(item.IconImage)) || r["Picture"].ToString().Length == 0) - //{ - // item.ThumbnailImage = "Films_No_Cover.png"; - // item.IconImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png"; - //} + conf.FileImage = r["Picture"].ToString(); + if (!System.IO.File.Exists(conf.FileImage)) + conf.FileImage = conf.DefaultCover; + item.ThumbnailImage = conf.FileImage; + item.IconImage = conf.FileImage; +// item.IconImageBig = conf.FileImage; + item.ItemId = number; + item.OnItemSelected += new MediaPortal.GUI.Library.GUIListItem.ItemSelectedHandler(item_OnItemSelected); - //item.OnRetrieveArt += new MediaPortal.GUI.Library.GUIListItem.RetrieveCoverArtHandler(OnRetrieveCoverArt); facadeView.Add(item); if (iSelItem == -2) //set selected item = passed in string? @@ -779,9 +705,6 @@ { int r, i; - //if (rating == 0) - // r = -1; //=> hide all - //else r = Decimal.ToInt32(Decimal.Round(rating, MidpointRounding.AwayFromZero)); // by setting rating here can easily modify for diff effect if (r > 10) r = 10; for (i = 0; i < 10; i++) @@ -798,8 +721,9 @@ //---------------------------------------------------------------------------------------- private void affichage_Lstdetail(int ItemId, bool wrep, string wlabel)//wrep = false display only image { - DataRow[] r = BaseMesFilms.LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "", ""); - if (r.Length == 0) + // DataRow[] r = BaseMesFilms.LectureDonn\xE9es("Number = " + ItemId.ToString(), "", "", ""); + DataRow[] r = BaseMesFilms.LectureDonn\xE9es(conf.StrDfltSelect, conf.StrFilmSelect, conf.StrSort, conf.StrSortSens); + if (ItemId > r.Length) { GUIControl.ShowControl(GetID, 34); affichage_rating(0); @@ -808,17 +732,17 @@ GUIControl.HideControl(GetID, 34); try { - if (!(conf.FileImage == conf.StrPathImg + "\\" + r[0]["Picture"].ToString() || conf.FileImage == r[0]["Picture"].ToString())) + if (!(conf.FileImage == conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString() || conf.FileImage == r[ItemId]["Picture"].ToString())) { //if (conf.FileImage != "9999") - { - ImgLstFilm.FreeResources(); - } - ImgLstFilm2.FreeResources(); - if (r[0]["Picture"].ToString().IndexOf(":\\") == -1) - conf.FileImage = conf.StrPathImg + "\\" + r[0]["Picture"].ToString(); + // ImgLstFilm.FreeResources(); + // ImgLstFilm2.FreeResources(); + if (r[ItemId]["Picture"].ToString().IndexOf(":\\") == -1) + conf.FileImage = conf.StrPathImg + "\\" + r[ItemId]["Picture"].ToString(); else - conf.FileImage = r[0]["Picture"].ToString(); + conf.FileImage = r[ItemId]["Picture"].ToString(); + if (!System.IO.File.Exists(conf.FileImage)) + conf.FileImage = conf.DefaultCover; ImgLstFilm.SetFileName(conf.FileImage); ImgLstFilm2.SetFileName(conf.FileImage); } @@ -826,11 +750,6 @@ catch { conf.FileImage = "9999"; - //FileImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png"; - //GUIControl.HideControl(GetID, Ctrl_DspImage); - //GUIControl.HideControl(GetID, Ctrl_DspImage2); - //GUIControl.ShowControl(GetID, 34); - //affichage_rating(0); } if (!wrep) { @@ -839,13 +758,14 @@ return; } ScrlLstText.Clear(); - ScrlLstText.Label = r[0]["Description"].ToString().Replace('|', ' '); + ScrlLstText.Label = r[ItemId]["Description"].ToString().Replace('|', ' '); + TitleSelect.Label = r[ItemId][conf.StrTitle1].ToString(); TitleSelect.Label = wlabel; - TxtLstGenre.Label = r[0]["Category"].ToString(); - TxtLstYear.Label = r[0]["Year"].ToString(); + TxtLstGenre.Label = r[ItemId]["Category"].ToString(); + TxtLstYear.Label = r[ItemId]["Year"].ToString(); try { - conf.W_rating = (decimal)r[0]["Rating"]; + conf.W_rating = (decimal)r[ItemId]["Rating"]; } catch { @@ -994,7 +914,10 @@ if (arSplit[wi].IndexOf("(") > 0) wzone = arSplit[wi].Substring(0, arSplit[wi].IndexOf("(")).Trim(); else - wzone = arSplit[wi].Trim(); + if (arSplit[wi].IndexOf(" as ") > 0) + wzone = arSplit[wi].Substring(0, arSplit[wi].IndexOf(" as ")).Trim(); + else + wzone = arSplit[wi].Trim(); if (wzone.Length > 0) w_tableau.Add(wzone); } @@ -1064,6 +987,7 @@ conf.Boolselect = true; conf.Boolreturn = false; } + } //-------------------------------------------------------------------------------------------- // Initial Windows load. If LoadDfltSlct = true => load default select if any @@ -1158,37 +1082,25 @@ //-------------------------------------------------------------------------------------------- private void Change_LayOut(int wLayOut) { - GUIControl.HideControl(GetID, (int)Controls.CTRL_LblList); switch (wLayOut) { case 1: GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(100)); - GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblIcons); - GUIControl.HideControl(GetID, (int)Controls.CTRL_LblList); facadeView.View = GUIFacadeControl.ViewMode.SmallIcons; break; case 2: GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(417)); - GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblBigIcons); - GUIControl.HideControl(GetID, (int)Controls.CTRL_LblIcons); facadeView.View = GUIFacadeControl.ViewMode.LargeIcons; break; case 3: GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(733)); - GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblFilmStrip); - GUIControl.HideControl(GetID, (int)Controls.CTRL_LblBigIcons); facadeView.View = GUIFacadeControl.ViewMode.Filmstrip; break; default: GUIControl.SetControlLabel(GetID, (int)Controls.CTRL_BtnLayout, GUILocalizeStrings.Get(101)); - GUIControl.ShowControl(GetID, (int)Controls.CTRL_LblList); - GUIControl.HideControl(GetID, (int)Controls.CTRL_LblFilmStrip); facadeView.View = GUIFacadeControl.ViewMode.List; break; } - //GUIControl.HideControl(GetID, facadeView.GetID); - //int iControl = facadeView.GetID; - //GUIControl.ShowControl(GetID, iControl); GUIControl.FocusControl(GetID, facadeView.GetID); } //-------------------------------------------------------------------------------------------- Modified: trunk/plugins/MyFilms/MesFilms.csproj =================================================================== --- trunk/plugins/MyFilms/MesFilms.csproj 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/MesFilms.csproj 2007-11-18 18:46:16 UTC (rev 1075) @@ -30,26 +30,26 @@ <DebugSymbols>true</DebugSymbols> </PropertyGroup> <ItemGroup> - <Reference Include="Core, Version=1.0.2546.32606, Culture=neutral, processorArchitecture=x86"> + <Reference Include="Core, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Core.DLL</HintPath> + <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Core.DLL</HintPath> </Reference> - <Reference Include="Databases, Version=1.0.2546.32610, Culture=neutral, processorArchitecture=x86"> + <Reference Include="Databases, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Databases.DLL</HintPath> + <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Databases.DLL</HintPath> </Reference> - <Reference Include="Dialogs, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86"> + <Reference Include="Dialogs, Version=0.2.3.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Dialogs.dll</HintPath> + <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Dialogs.DLL</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.Windows.Forms" /> <Reference Include="System.Xml" /> - <Reference Include="Utils, Version=1.0.2546.32604, Culture=neutral, processorArchitecture=x86"> + <Reference Include="Utils, Version=2.2.2.0, Culture=neutral, processorArchitecture=x86"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\..\mediaportal_plugin\MesFilms\Core_SVN\Utils.DLL</HintPath> + <HintPath>..\..\mediaportal_plugin\MesFilms\Core_Rc3\Utils.DLL</HintPath> </Reference> </ItemGroup> <ItemGroup> Modified: trunk/plugins/MyFilms/MesFilmsDetail.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/MesFilmsDetail.cs 2007-11-18 18:46:16 UTC (rev 1075) @@ -80,8 +80,6 @@ [SkinControlAttribute((int)Controls.CTRL_ImgDD)] protected GUIImage ImgDD = null; - string ItemSearchFile = null; - bool SearchFile = false; string wzone = null; int StrMax = 0; public SQLiteClient m_db; @@ -158,6 +156,7 @@ // Windows Init //--------------------------------------------------------------------------------------- g_Player.PlayBackStarted += new MediaPortal.Player.g_Player.StartedHandler(OnPlayBackStarted); + //g_Player.PlayBackEnded += new MediaPortal.Player.g_Player.EndedHandler(OnPlayBackEnded); m_directory.SetExtensions(Utils.VideoExtensions); base.OnMessage(messageType); @@ -253,15 +252,15 @@ base.OnMessage(messageType); return true; } - //------------------------------------------------------------------------------------------- - // Load the XML data. - //------------------------------------------------------------------------------------------- - private DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens) - { - r = BaseMesFilms.LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens); - StrMax = (int)r.Length; - return r; - } + ////------------------------------------------------------------------------------------------- + //// Load the XML data. + ////------------------------------------------------------------------------------------------- + //private DataRow[] LectureDonn\xE9es(string StrFilmSelect, string StrSort, string StrSortSens) + //{ + // r = BaseMesFilms.LectureDonn\xE9es(StrFilmSelect, StrSort, StrSortSens); + // StrMax = (int)r.Length; + // return r; + //} //-------------------------------------------------------------------------------------------- // Update specifics Infos //-------------------------------------------------------------------------------------------- @@ -464,6 +463,9 @@ file = MesFilms.conf.StrPathImg + "\\" + r[MesFilms.conf.StrIndex]["Picture"].ToString(); else file = r[MesFilms.conf.StrIndex]["Picture"].ToString(); + if (!System.IO.File.Exists(file)) + file = MesFilms.conf.DefaultCover; + ImgDetFilm.SetFileName(file ); ImgDetFilm2.SetFileName(file); if (!(MesFilms.conf.StrStorage.Length == 0) && !(MesFilms.conf.StrStorage == "(none)")) @@ -634,17 +636,21 @@ string fileName = null; if (!(MesFilms.conf.StrStorage == null) && !(MesFilms.conf.StrStorage == "(none)") && !(MesFilms.conf.StrStorage == "")) { - fileName = (string)r[select_item][MesFilms.conf.StrStorage]; + try + { fileName = (string)r[select_item][MesFilms.conf.StrStorage]; } + catch + { fileName = ""; } + if ((fileName == "")) // recherche nom de fichier par titre du film - if ((SearchFile) && (first)) + if ((MesFilms.conf.SearchFile == "True") && (first)) { - if (ItemSearchFile.Length > 0) + if (MesFilms.conf.ItemSearchFile.Length > 0) { - fileName = Search_FileName(r[select_item][ItemSearchFile].ToString(), MesFilms.conf.StrDirStor); + fileName = Search_FileName(r[select_item][MesFilms.conf.ItemSearchFile].ToString(), MesFilms.conf.StrDirStor); if (fileName.Length > 0) { - r[MesFilms.conf.StrIndex][MesFilms.conf.StrStorage] = fileName; + r[MesFilms.conf.StrIndex][MesFilms.conf.StrStorage] = fileName.Substring(fileName.LastIndexOf(@"\") + 1); Update_XML_database(false, MesFilms.conf.StrIndex, MesFilms.conf.StrStorage); } } @@ -777,7 +783,11 @@ VideoDatabase.SetMovieDuration(idFile, movieDuration); } } + //private void OnPlayBackEnded(MediaPortal.Player.g_Player.MediaType type, string filename) + //{ + // System.Windows.Forms.MessageBox.Show("OnPlayBackEnded"); + //} private void AddFileToDatabase(string strFile,int select_item) { if (!Utils.IsVideo(strFile)) return; @@ -827,59 +837,71 @@ bool asked = false; string wfile = null; GUIDialogOK dlgOk = (GUIDialogOK)GUIWindowManager.GetWindow((int)GUIWindow.Window.WINDOW_DIALOG_OK); - if (PlayListFactory.IsPlayList(filename.Trim())) + wfile = filename.Trim(); + string wstordir = MesFilms.conf.StrDirStor; + if (PlayListFactory.IsPlayList(wfile)) { wfile = LoadPlaylist(filename.Trim()); - if (!(wfile == "")) - multifile = true; - else + wstordir = wfile.Substring(0, wfile.LastIndexOf(@"\")).Trim() + ";" + wstordir; + + if (wfile == "") { - first = false; - wfile = GUILocalizeStrings.Get(136) + " : max 15 " + GUILocalizeStrings.Get(100003); - dlgOk.SetHeading(3);//my videos - dlgOk.SetLine(1, 1036);//no video found - dlgOk.SetLine(2, wfile);//ANT File Name - dlgOk.SetLine(3, 477);//Unable to load playlist - dlgOk.DoModal(GetID); - return; // fist time ask for mounting; second time stop + if (first) // first time asking for mounting + { + first = false; + wfile = GUILocalizeStrings.Get(136) + " : max 15 " + GUILocalizeStrings.Get(100003); + dlgOk.SetHeading(3);//my videos + dlgOk.SetLine(1, 1036);//no video found + dlgOk.SetLine(2, wfile);//ANT File Name + dlgOk.SetLine(3, 477);//Unable to load playlist + dlgOk.DoModal(GetID); + return; // fist time ask for mounting; second time stop + } + else + return; // second time no asking } } // search character ";" => playlist (multiple files) string[] split; - split = filename.ToString().Split(new Char[] { ',', ';' }); + split = wfile.ToString().Split(new Char[] { ',', ';' }); if (split.Length > 1) + multifile = true; + else multifile = false; - else - multifile = true; foreach (string file in split) { - wfile = SearchMovie(file.Trim(), MesFilms.conf.StrDirStor); + wfile = SearchMovie(file.Trim(), wstordir); if (wfile == "false") { // file not found - // ask for mounting file - dlgOk.SetHeading(3);//my videos - dlgOk.SetLine(1, 219);//no disc - if (!(MesFilms.conf.StrIdentItem == null) && !(MesFilms.conf.StrIdentItem == "(none)") && !(MesFilms.conf.StrIdentItem == "")) - if (MesFilms.conf.StrIdentLabel.Length > 0) - dlgOk.SetLine(2, MesFilms.conf.StrIdentLabel.ToString() + " = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//Label Identification for Media + if (first) + // ask for mounting file first time + { + dlgOk.SetHeading(3);//my videos + dlgOk.SetLine(1, 219);//no disc + if (!(MesFilms.conf.StrIdentItem == null) && !(MesFilms.conf.StrIdentItem == "(none)") && !(MesFilms.conf.StrIdentItem == "")) + if (MesFilms.conf.StrIdentLabel.Length > 0) + dlgOk.SetLine(2, MesFilms.conf.StrIdentLabel.ToString() + " = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//Label Identification for Media + else + dlgOk.SetLine(2, "'" + MesFilms.conf.StrIdentItem.ToString() + "' = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//ANT Item Identification for Media else - dlgOk.SetLine(2, "'" + MesFilms.conf.StrIdentItem.ToString() + "' = " + r[select_item][MesFilms.conf.StrIdentItem].ToString());//ANT Item Identification for Media + dlgOk.SetLine(2, "' disc n\xB0 = " + r[select_item]["Number"].ToString());//ANT Number for Identification Media + dlgOk.SetLine(3, wfile);//ANT File Name + dlgOk.DoModal(GetID); + PlayMovie_Divx(filename, select_item, false); // try a second time. Maybe disc mounted + return; + } else - dlgOk.SetLine(2, "' disc n\xB0 = " + r[select_item]["Number"].ToString());//ANT Number for Identification Media - dlgOk.SetLine(3, wfile);//ANT File Name - dlgOk.DoModal(GetID); - PlayMovie_Divx(filename, select_item, false); // try a second time. Maybe disc mounted - return; + return; //no asking second time } else { // file found update database and add to playlist - idMovie = update_database(file, select_item, idMovie); + idMovie = update_database(wfile, select_item, idMovie); if (!multifile) { //case monofile search files belonging same movie (extension cdx or diskx) - string folder = file.Substring(0, file.LastIndexOf(@"\")).Trim(); - wfile = folder + "\\" + file.Substring(file.LastIndexOf(@"\") + 1); + string folder = wfile.Substring(0, wfile.LastIndexOf(@"\")).Trim(); + // wfile = folder + "\\" + wfile.Substring(file.LastIndexOf(@"\") + 1); ArrayList items = m_directory.GetDirectory(folder.ToString()); for (int i = 0; i < items.Count; ++i) @@ -1049,13 +1071,16 @@ // File.Copy(MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString(), LargeThumb, true); //else // File.Copy(r1[select_item]["Picture"].ToString(), LargeThumb, true); - string wimage; + string wImage; if (r1[select_item]["Picture"].ToString().IndexOf(":\\") == -1) - wimage = MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString(); + wImage = MesFilms.conf.StrPathImg + "\\" + r1[select_item]["Picture"].ToString(); else - wimage = r1[select_item]["Picture"].ToString(); - MediaPortal.Util.Picture.CreateThumbnail(wimage, strThumb, 128, 128, 0); - MediaPortal.Util.Picture.CreateThumbnail(wimage, LargeThumb, 512, 512, 0); + wImage = r1[select_item]["Picture"].ToString(); + if (!System.IO.File.Exists(wImage)) + wImage = Config.Dir.Skin + "\\media\\Films_No_Cover.png"; + + MediaPortal.Util.Picture.CreateThumbnail(wImage, strThumb, 128, 128, 0); + MediaPortal.Util.Picture.CreateThumbnail(wImage, LargeThumb, 512, 512, 0); } catch { @@ -1370,10 +1395,10 @@ } return false; } - // static public void PlayMovieFromPlayList(bool NoResumeMovie) - // { - // PlayMovieFromPlayList(NoResumeMovie, -1); - // } + static public void PlayMovieFromPlayList(bool NoResumeMovie) + { + PlayMovieFromPlayList(NoResumeMovie, -1); + } static public void PlayMovieFromPlayList(bool NoResumeMovie, int iMovieIndex) { string filename; Modified: trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/MesFilmsSetup.Designer.cs 2007-11-18 18:46:16 UTC (rev 1075) @@ -186,6 +186,9 @@ this.ButSave = new System.Windows.Forms.Button(); this.Config_Dflt = new System.Windows.Forms.CheckBox(); this.Config_Menu = new System.Windows.Forms.CheckBox(); + this.DutDefCov = new System.Windows.Forms.Button(); + this.DefaultCover = new System.Windows.Forms.TextBox(); + this.label19 = new System.Windows.Forms.Label(); this.General.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox11.SuspendLayout(); @@ -208,9 +211,9 @@ this.label10.AutoSize = true; this.label10.Location = new System.Drawing.Point(676, 42); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(75, 13); + this.label10.Size = new System.Drawing.Size(69, 13); this.label10.TabIndex = 34; - this.label10.Text = "Version 4.2.6a"; + this.label10.Text = "Version 4.3.0"; // // textBox1 // @@ -459,6 +462,9 @@ // // groupBox5 // + this.groupBox5.Controls.Add(this.DutDefCov); + this.groupBox5.Controls.Add(this.DefaultCover); + this.groupBox5.Controls.Add(this.label19); this.groupBox5.Controls.Add(this.label17); this.groupBox5.Controls.Add(this.TitleDelim); this.groupBox5.Controls.Add(this.label9); @@ -467,7 +473,7 @@ this.groupBox5.Controls.Add(this.AntTitle1); this.groupBox5.Location = new System.Drawing.Point(7, 208); this.groupBox5.Name = "groupBox5"; - this.groupBox5.Size = new System.Drawing.Size(453, 76); + this.groupBox5.Size = new System.Drawing.Size(453, 100); this.groupBox5.TabIndex = 61; this.groupBox5.TabStop = false; this.groupBox5.Text = "Title Order"; @@ -510,9 +516,9 @@ // AntTitle2 // this.AntTitle2.FormattingEnabled = true; - this.AntTitle2.Location = new System.Drawing.Point(131, 41); + this.AntTitle2.Location = new System.Drawing.Point(132, 41); this.AntTitle2.Name = "AntTitle2"; - this.AntTitle2.Size = new System.Drawing.Size(156, 21); + this.AntTitle2.Size = new System.Drawing.Size(155, 21); this.AntTitle2.TabIndex = 11; // // AntTitle1 @@ -1088,6 +1094,32 @@ this.Config_Menu.Text = "Display Always Configuration\'s Menu (if no Default Config)"; this.Config_Menu.UseVisualStyleBackColor = true; // + // DutDefCov + // + this.DutDefCov.Location = new System.Drawing.Point(401, 66); + this.DutDefCov.Name = "DutDefCov"; + this.DutDefCov.Size = new System.Drawing.Size(32, 22); + this.DutDefCov.TabIndex = 69; + this.DutDefCov.Text = "..."; + this.DutDefCov.UseVisualStyleBackColor = true; + this.DutDefCov.Click += new System.EventHandler(this.DutDefCov_Click); + // + // DefaultCover + // + this.DefaultCover.Location = new System.Drawing.Point(132, 68); + this.DefaultCover.Name = "DefaultCover"; + this.DefaultCover.Size = new System.Drawing.Size(259, 20); + this.DefaultCover.TabIndex = 68; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(8, 71); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(74, 13); + this.label19.TabIndex = 67; + this.label19.Text = "Default Poster"; + // // MesFilmsSetup // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1231,6 +1263,9 @@ private CheckBox Config_Menu; private Label label18; private TextBox Selected_Enreg; + private Button DutDefCov; + private TextBox DefaultCover; + private Label label19; } } \ No newline at end of file Modified: trunk/plugins/MyFilms/MesFilmsSetup.cs =================================================================== --- trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/MesFilmsSetup.cs 2007-11-18 18:46:16 UTC (rev 1075) @@ -417,6 +417,7 @@ MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "Dwp", crypto.Crypter(Dwp.Text)); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SearchFileName", SearchFileName.Checked); MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "ItemSearchFileName", ItemSearchFileName.Text); + MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "DefaultCover", DefaultCover.Text); if (CatalogType.SelectedIndex == 1) { MyFilms_xmlwriter.SetValue(Config_Name.Text.ToString(), "SortTitle", SortTitle.Checked); @@ -522,6 +523,7 @@ else SortTitle.Checked = false; ItemSearchFileName.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ItemSearchFileName", ""); + DefaultCover.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "DefaultCover", ""); View_Dflt_Item.Items.Remove(View_Dflt_Item.Text); View_Dflt_Item.Items.Add(View_Dflt_Item.Text); View_Dflt_Item.Text = MyFilms_xmlreader.GetValueAsString(Config_Name.Text.ToString(), "ViewDfltItem", "(none)"); @@ -593,6 +595,7 @@ LayOut.ResetText(); View_Dflt_Item.ResetText(); View_Dflt_Text.ResetText(); + DefaultCover.ResetText(); Dwp.ResetText(); Rpt_Dwp.ResetText(); ItemSearchFileName.ResetText(); @@ -627,6 +630,8 @@ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntPicture"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntStorage"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "PathStorage"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SearchFileName"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "ItemSearchFileName"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentItem"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntIdentLabel"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "AntTitle1"); @@ -671,6 +676,7 @@ MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "Dwp"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "SortTitle"); MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DVDPTagField"); + MyFilms_xmlwriter.RemoveEntry(Config_Name.Text, "DefaultCover"); if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Default_Config", "")) MyFilms_xmlwriter.RemoveEntry("MyFilms", "Default_Config"); if ((Config_Name.Text) == MyFilms_xmlreader.GetValueAsString("MyFilms", "Current_Config", "")) @@ -864,5 +870,15 @@ { Selected_Enreg_TextChanged(); } + + private void DutDefCov_Click(object sender, EventArgs e) + { + openFileDialog1.RestoreDirectory = true; + openFileDialog1.DefaultExt = "jpg"; + openFileDialog1.Filter = "JPG Files|*.jpg|PNG Files|*.png|BMP Files|*.bmp|All Files|*.*"; + openFileDialog1.Title = "Default display Cover"; + if (openFileDialog1.ShowDialog(this) == DialogResult.OK) + DefaultCover.Text = openFileDialog1.FileName; + } } } Added: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png =================================================================== (Binary files differ) Property changes on: trunk/plugins/MyFilms/skin/BlueTwo/Media/Films_No_Cover.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml =================================================================== --- trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-18 11:51:50 UTC (rev 1074) +++ trunk/plugins/MyFilms/skin/BlueTwo/MesFilms.xml 2007-11-18 18:46:16 UTC (rev 1075) @@ -1,455 +1,498 @@ <window> - <id>7986</id> - <defaultcontrol>6</defaultcontrol> - <allowoverlay>yes</allowoverlay> - <controls> - <import>common.time.xml</import> - <control> - <type>image</type> - <description>BG</description> - <id>1</id> - <posX>0</posX> - <posY>0</posY> - <texture>background.png</texture> - </control> - <control> - <type>image</type> - <id>24</id> - <posX>64</posX> - <posY>70</posY> - <width>67</width> - <height>40</height> - <colordiffuse>9fffffff</colordiffuse> - <texture>amclogo.png</texture> - <keepaspectratio>yes</keepaspectratio> - </control> - <control> - <type>image</type> - <id>25</id> - <posX>56</posX> - <posY>16</posY> - <texture>videos_logo.png</texture> - </control> - <control> - <type>group</type> - <description>group element</description> - <id>1</id> - <posX>60</posX> - <posY>97</posY> - <width>198</width> - <height>140</height> - <layout>StackLayout</layout> - <animation effect="slide" time="400" start="-300,0">WindowOpen</animation> - <animation effect="slide" time="400" end="0,-300" >WindowClose</animation> - <animation effect="fade" time="500">WindowClose</animation> - <animation effect="fade" time="250">WindowOpen</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>Layout</description> - <id>6</id> - <posX>60</posX> - <posY>97</posY> - <onleft>5</onleft> - <onright>1026</onright> - <onup>5</onup> - <ondown>2</ondown> - <animation>unfocus</animation> - <label>101</label> - <textcolor>ff000000</textcolor> - </control> - <control> - <type>sortbutton</type> - <id>2</id> - <posX>60</posX> - <posY>129</posY> - <onleft>6</onleft> - <onright>1026</onright> - <onup>6</onup> - <ondown>3</ondown> - <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused> - <font>font13</font> - <textureFocus>menu_list_focus.png</textureFocus> - <textYOff>5</textYOff> - <animation>unfocus</animation> - <textXOff>10</textXOff> - <disabledcolor>60ffffff</disabledcolor> - <label>103</label> - <offsetSortButtonY>8</offsetSortButtonY> - <offsetSortButtonX>165</offsetSortButtonX> - <textcolor>White</textcolor> - <textureNoFocus>menu_list_nofocus.png</textureNoFocus> - <textureAscending>arrow_round_up_nofocus.png</textureAscending> - <textureDescending>arrow_round_down_nofocus.png</textureDescending> - <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused> - </control> - <control> - <type>button</type> - <description>Switch view</description> - <id>3</id> - <posX>60</posX> - <posY>161</posY> - <onleft>2</onleft> - <onright>1026</onright> - <onup>2</onup> - <ondown>4</ondown> - <animation>unfocus</animation> - <label>457</label> - <textcolor>ff000000</textcolor> - </control> - <control> - <type>button</type> - <description>Search by Films</description> - <id>4</id> - <posX>60</posX> - <posY>193</posY> - <onleft>3</onleft> - <onright>1026</onright> - <onup>3</onup> - <ondown>5</ondown> - <animation>unfocus</animation> - <label>137</label> - <textcolor>ff000000</textcolor> - </control> - <control> - <type>button</type> - <description>Search by Actors</description> - <id>5</id> - <posX>60</posX> - <posY>225</posY> - <onleft>4</onleft> - <onright>1026</onright> - <onup>4</onup> - <ondown>6</ondown> - <animation>unfocus</animation> - <label>137</label> - <textcolor>ff000000</textcolor> - </control> + <id>7986</id> + <defaultcontrol>6</defaultcontrol> + <allowoverlay>yes</allowoverlay> + <controls> + <import>common.time.xml</import> + <import>MesFilms_Visible.xml</import> + <control> + <type>image</type> + <description>BG</description> + <id>1</id> + <posX>0</posX> + <posY>0</posY> + <texture>background.png</texture> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>64</posX> + <posY>70</posY> + <width>67</width> + <height>40</height> + <colordiffuse>9fffffff</colordiffuse> + <texture>amclogo.png</texture> + <keepaspectratio>yes</keepaspectratio> + </control> + <control> + <type>image</type> + <id>1</id> + <posX>56</posX> + <posY>16</posY> + <texture>videos_logo.png</texture> + </control> + <control> + <type>image</type> + <id>1019</id> + <posX>50</posX> + <posY>250</posY> + <width>180</width> + <height>250</height> + <texture>hover_my films.png</texture> + <visible>!player.hasmedia+facadeview.filmstrip |!player.hasmedia+!control.hasfocus(1026)</visible> + <keepaspectratio>yes</keepaspectratio> + </control> - </control> - <control> - <type>fadelabel</type> - <id>12</id> - <posX>344</posX> - <posY>68</posY> - <width>272</width> - <height>24</height> - <label>label</label> - <font>font14</font> - <textcolor>ffa9d0f7</textcolor> - <disabledcolor>ff808080</disabledcolor> - </control> - <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> - <control> - <description>composite control consisting of a list control and a thumbnail panel</description> - <type>facadeview</type> - <id>1026</id> - <control> - <description>Thumbnail Panel</description> - <type>thumbnailpanel</type> - <scrollOffset>1</scrollOffset> - <onleft>6</onleft> - <itemWidth>72</itemWidth> - <textureWidth>58</textureWidth> - <thumbWidth>44</thumbWidth> - <thumbPosX>7</thumbPosX> - <textureWidthBig>85</textureWidthBig> - <textureHeightBig>116</textureHeightBig> - <itemWidthBig>108</itemWidthBig> - <itemHeightBig>138</itemHeightBig> - <thumbWidthBig>64</thumbWidthBig> - <thumbHeightBig>90</thumbHeightBig> - <thumbPosXBig>10</thumbPosXBig> - </control> - <control> - <type>listcontrol</type> - <description>listcontrol</description> - <posX>260</posX> - <posY>97</posY> - <width>440</width> - <height>354</height> - <onleft>6</onleft> - <font>font13</font> - </control> - <control> - <description>Filmstrip view</description> - <type>filmstrip</type> - <width>440</width> - <height>354</height> - <onleft>6</onleft> - <backgroundx>354</backgroundx> - <backgroundy>99</backgroundy> - <backgroundwidth>238</backgroundwidth> - <backgroundheight>336</backgroundheight> - <InfoImagex>366</InfoImagex> - <InfoImagey>118</InfoImagey> - <InfoImagewidth>197</InfoImagewidth> - <InfoImageheight>274</InfoImageheight> - </control> + <control> + <type>group</type> + <description>group element</description> + <posX>60</posX> + <posY>97</posY> + <width>198</width> + <height>140</height> + <layout>StackLayout</layout> + <animation effect="slide" time="400" start="-300,0">WindowOpen</animation> + <animation effect="slide" time="400" end="0,-300" >WindowClose</animation> + <animation effect="fade" time="500">WindowClose</animation> + <animation effect="fade" time="250">WindowOpen</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>Layout</description> + <id>6</id> + <posX>60</posX> + <posY>97</posY> + <onleft>5</onleft> + <onright>1026</onright> + <onup>5</onup> + <ondown>2</ondown> + <animation>unfocus</animation> + <label>101</label> + <textcolor>ff000000</textcolor> + </control> + <control> + <type>sortbutton</type> + <id>2</id> + <posX>60</posX> + <posY>129</posY> + <onleft>6</onleft> + <onright>1026</onright> + <onup>6</onup> + <ondown>3</ondown> + <textureAscendingFocused>arrow_round_up_focus.png</textureAscendingFocused> + <font>font13</font> + <textureFocus>menu_list_focus.png</textureFocus> + <textYOff>5</textYOff> + <animation>unfocus</animation> + <textXOff>10</textXOff> + <disabledcolor>60ffffff</disabledcolor> + <label>103</label> + <offsetSortButtonY>8</offsetSortButtonY> + <offsetSortButtonX>165</offsetSortButtonX> + <textcolor>White</textcolor> + <textureNoFocus>menu_list_nofocus.png</textureNoFocus> + <textureAscending>arrow_round_up_nofocus.png</textureAscending> + <textureDescending>arrow_round_down_nofocus.png</textureDescending> + <textureDescendingFocused>arrow_round_down_focus.png</textureDescendingFocused> + </control> + <control> + <type>button</type> + <description>Switch view</description> + <id>3</id> + <posX>60</posX> + <posY>161</posY> + <onleft>2</onleft> + <onright>1026</onright> + <onup>2</onup> + <ondown>4</ondown> + <animation>unfocus</animation> + <label>457</label> + <textcolor>ff000000</textcolor> + </control> + <control> + <type>button</type> + <description>Search by Films</description> + <id>4</id> + <posX>60</posX> + <posY>193</posY> + <onleft>3</onleft> + <onright>1026</onright> + <onup>3</onup> + <ondown>5</ondown> + <animation>unfocus</animation> + <label>137</label> + <textcolor>ff000000</textcolor> + </control> + <control> + <type>button</type> + <description>Search by Actors</description> + <id>5</id> + <posX>60</posX> + <posY>225</posY> + <onleft>4</onleft> + <onright>1026</onright> + <onup>4</onup> + <ondown>6</ondown> + <animation>unfocus</animation> + <label>137</label> + <textcolor>ff000000</textcolor> + </control> - </control> - <control> - <type>textboxscrollup</type> - <description>Biography value</description> - <id>1025</id> - <posX>260</posX> - <posY>414</posY> - <width>440</width> - <height>100</height> - <colordiffuse>ffffffff</colordiffuse> - <onleft>1026</onleft> - <onright>1026</onright> - <onup>1026</onup> - <ondown>1026</ondown> - <font>font12</font> - <speed>10</speed> - <textcolor>FFFFFFFF</textcolor> - <label>-</label> - <seperator>------------------------------------------------------------------------------------------------------------------------------</seperator> - </control> - <control> - <type>fadelabel</type> - <description>Title (during Icons)</description> - <id>1027</id> - <posX>65</posX> - <posY>470</posY> - <onleft>6</onleft> - <onright>1026</onright> - <onup>1026</onup> - <ondown>1026</ondown> - <font>font12</font> - <width>175</width> - <height>24</height> - <label>-</label> - </control> - </control> - <control> - <type>image</type> - <id>1065</id> - <posX>219</posX> - <posY>370</posY> - <width>36</width> - <height>36</height> - <visible>no</visible> - <texture>star.png</texture> - <centered>yes</centered> - </control> - <control> - <type>image</type> - <id>1064</id> - <posX>222</posX> - <posY>... [truncated message content] |
From: <che...@us...> - 2007-11-18 11:51:59
|
Revision: 1074 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=1074&view=rev Author: chef_koch Date: 2007-11-18 03:51:50 -0800 (Sun, 18 Nov 2007) Log Message: ----------- added: option to set an application item as root, so it is possible to show it's files in root view together with other application items Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs trunk/plugins/myGUIProgramsAlt/README.txt trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-18 03:24:29 UTC (rev 1073) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/GUIProgramsAlt.cs 2007-11-18 11:51:50 UTC (rev 1074) @@ -81,6 +81,7 @@ DatabaseHandler dbHandlerInstance = DatabaseHandler.DBHandlerInstance; ApplicationItem currentApplicationItem = null; + ApplicationItem rootApplicationItem = null; string prevFilepath = ""; int selectedItemIndex = -1; Layout currentLayout = Layout.List; @@ -434,7 +435,7 @@ int TotalItems = 0; if (ApplicationItemSubItemsAllowed()) TotalItems += DisplayApps(); - if (IsCurrentApplicationItemNotNull()) + //if (IsCurrentApplicationItemNotNull()) trying to display Files in root folder TotalItems += DisplayFiles(); if (currentApplicationItem != null) @@ -452,7 +453,7 @@ int DisplayFiles() { - if (currentApplicationItem == null) return 0; + if (currentApplicationItem == null) return DisplayRootFiles(); // Refresh FileList if view has changed, while this appItem was not active if ((currentApplicationItem.CurrentView != ViewHandler.CurrentView) || (currentApplicationItem.filesAreLoaded == false)) @@ -465,6 +466,22 @@ return (totalFiles); } + int DisplayRootFiles() + { + foreach (ApplicationItem applicationItem in AppsOfFatherID(currentApplicationItem == null ? -1 : currentApplicationItem.ApplicationItemId)) + { + if (!applicationItem.Title.Equals(@"@ROOT@")) continue; + rootApplicationItem = applicationItem; + } + if (rootApplicationItem == null) return 0; + + rootApplicationItem.LoadFiles(); + + int totalFiles = 0; + totalFiles = totalFiles + DisplayItemList(rootApplicationItem.ItemList, facadeView); + return (totalFiles); + } + int DisplayApps() { int totalApps = 0; @@ -472,7 +489,8 @@ foreach (ApplicationItem applicationItem in AppsOfFatherID(currentApplicationItem == null ? -1 : currentApplicationItem.ApplicationItemId)) { if (!applicationItem.Enabled) continue; - + if (applicationItem.Title.Equals(@"@ROOT@")) continue; + totalApps++; GUIListItem item = new GUIListItem(applicationItem.Title); @@ -648,6 +666,11 @@ prevFilepath = currentApplicationItem.DefaultFilepath(); currentApplicationItem.LaunchFile(fileItem); } + else + { + prevFilepath = rootApplicationItem.DefaultFilepath(); + rootApplicationItem.LaunchFile(fileItem); + } } else if (item is FilterItem) { Modified: trunk/plugins/myGUIProgramsAlt/README.txt =================================================================== --- trunk/plugins/myGUIProgramsAlt/README.txt 2007-11-18 03:24:29 UTC (rev 1073) +++ trunk/plugins/myGUIProgramsAlt/README.txt 2007-11-18 11:51:50 UTC (rev 1074) @@ -30,6 +30,9 @@ --------------- -- ChangeLog -- --------------- +v0.1.0.10 +2007-11-18: chefkoch : added: option to set an application item as root, so it is possible to show it's files in root view together with other application items + v0.1.0.9 2007-11-04: chefkoch : changed: remember last used application is now optional Modified: trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp =================================================================== --- trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp 2007-11-18 03:24:29 UTC (rev 1073) +++ trunk/plugins/myGUIProgramsAlt/myProgramsAlt.xmp 2007-11-18 11:51:50 UTC (rev 1074) @@ -8,7 +8,7 @@ <Source>GUIProgramsAlt\bin\Release\GUIProgramsAlt.dll</Source> <Id>01010</Id> <Option /> - <Guid>71910bfb-9ee2-445d-9c76-b93aba6bced3</Guid> + <Guid>57893c55-dcc4-4a2f-bc23-b05c7c653c7e</Guid> </File> <File> <FileName>myProgramsAlt.xml</FileName> @@ -17,7 +17,7 @@ <Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAlt.xml</Source> <Id>02010</Id> <Option>OutputFileName=|DefaultFile=True|</Option> - <Guid>062d6b00-83c7-4876-8f0b-debb2bed6c5b</Guid> + <Guid>972438e5-d3cc-4e34-9aaa-6ae9cf39b023</Guid> </File> <File> <FileName>myProgramsAltFileInfo.xml</FileName> @@ -26,7 +26,7 @@ <Source>GUIProgramsAlt\skin\BlueTwo\myProgramsAltFileInfo.xml</Source> <Id>02010</Id> <Option>OutputFileName=|DefaultFile=True|</Option> - <Guid>7dde964f-674f-4b41-923e-cb2c5d00c12c</Guid> + <Guid>58a988af-5557-4ec9-a0b7-2b862c6f9887</Guid> </File> <File> <FileName>myProgramsAltPreconfiguration.xml</FileName> @@ -35,7 +35,7 @@ <Source>GUIProgramsAlt\MetaData\myProgramsAltPreconfiguration.xml</Source> <Id>02010</Id> <Option /> - <Guid>da68b967-88fd-4509-b0d1-16a9f6c435ab</Guid> + <Guid>1a909c22-67c5-4915-8c92-e7464d416e0a</Guid> </File> <File> <FileName>README.txt</FileName> @@ -44,7 +44,7 @@ <Source>README.txt</Source> <Id>04010</Id> <Option>OutputFileName=MyPrograms2_ReadMe|DefaultFile=False|</Option> - <Guid>418d38f1-3fb9-4d12-b190-d9e4315f6f3a</Guid> + <Guid>1d7ab3ca-a21a-4953-ac24-ffd485215ae1</Guid> </File> <File> <FileName>System.Data.SQLite.DLL</FileName> @@ -53,7 +53,7 @@ <Source>GUIProgramsAlt\bin\Release\System.Data.SQLite.DLL</Source> <Id>04010</Id> <Option /> - <Guid>b4d409d8-4fbd-43f3-81d7-5062f19ee48a</Guid> + <Guid>17cf81f6-0105-42f2-aaa4-9246a856d21a</Guid> </File> </FileList> <StringList /> @@ -68,7 +68,7 @@ <ProiectName>MyPrograms2</ProiectName> <Author>chefkoch,northern</Author> <UpdateURL>http://www.team-mediaportal.com</UpdateURL> - <Version>0.1.0.9</Version> + <Version>0.1.0.10</Version> <Description>myprograms2 is a complete rewrite of weabeard's MyPrograms plugin. it's able to start apps and games.</Description> <Group>Games</Group> <Release>Test</Release> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |