Guest User

osd-wdtvlivehub_03.05.10-3.07.14

a guest
Sep 10th, 2012
257
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 29.38 KB | None | 0 0
  1. diff --git a/osd/accuweather_home.xml b/osd/accuweather_home.xml
  2. index f85804f..c32bc0c 100644
  3. --- a/osd/accuweather_home.xml
  4. +++ b/osd/accuweather_home.xml
  5. @@ -48,7 +48,7 @@
  6.     </wrapper>
  7.  
  8.     <mlmenuview ctrlname="accuweather-home-menu" changed="@@accuweather-home-menu-changed" style="rv_home"    
  9. -       x="0" y="458" w="1280" h="262" display_item_cnt="7" dashboard_bar_image="image/accuweather/accuweather_notification_bg.png" dashboard_bar_title="Favorite City Weather" dashboard_bar_title_x="390" dashboard_bar_title_y="697" dashboard_bar_title_w="500" dashboard_bar_title_h="22" dashboard_bar_title_fontsize="20" dashboard_bar_title_textcolor="0x001542"/>
  10. +       x="0" y="458" w="1280" h="262" display_item_cnt="5" dashboard_bar_image="image/accuweather/accuweather_notification_bg.png" dashboard_bar_title="Favorite City Weather" dashboard_bar_title_x="390" dashboard_bar_title_y="697" dashboard_bar_title_w="500" dashboard_bar_title_h="22" dashboard_bar_title_fontsize="20" dashboard_bar_title_textcolor="0x001542"/>
  11.    
  12.  <include filename="./inc_loading.xml"/>
  13.  <include filename="./decoration.xml"/>
  14. diff --git a/osd/accuweather_regexp.xml b/osd/accuweather_regexp.xml
  15. index 6d5699f..949e6e0 100644
  16. --- a/osd/accuweather_regexp.xml
  17. +++ b/osd/accuweather_regexp.xml
  18. @@ -47,7 +47,22 @@
  19.  
  20.     <GetDailyResults dest="8">
  21.         <RegExp input="$$3" output="&lt;results&gt;\1&lt;/results&gt;" dest="8">
  22. -           <RegExp input="$$1" output="&lt;daily&gt;&lt;/daily&gt;" dest="3">
  23. +           <RegExp input="$$1" output="&lt;temp&gt;&lt;/temp&gt;" dest="3">
  24. +               <expression>&lt;units&gt;.*?&lt;temp&gt;(.*?)&lt;/temp&gt;.*?&lt;/units&gt;</expression>
  25. +           </RegExp>
  26. +           <RegExp input="$$1" output="&lt;dist&gt;&lt;/dist&gt;" dest="3+">
  27. +               <expression>&lt;units&gt;.*?&lt;dist&gt;(.*?)&lt;/dist&gt;.*?&lt;/units&gt;</expression>
  28. +           </RegExp>
  29. +           <RegExp input="$$1" output="&lt;speed&gt;&lt;/speed&gt;" dest="3+">
  30. +               <expression>&lt;units&gt;.*?&lt;speed&gt;(.*?)&lt;/speed&gt;.*?&lt;/units&gt;</expression>
  31. +           </RegExp>
  32. +           <RegExp input="$$1" output="&lt;pres&gt;&lt;/pres&gt;" dest="3+">
  33. +               <expression>&lt;units&gt;.*?&lt;pres&gt;(.*?)&lt;/pres&gt;.*?&lt;/units&gt;</expression>
  34. +           </RegExp>
  35. +           <RegExp input="$$1" output="&lt;prec&gt;&lt;/prec&gt;" dest="3+">
  36. +               <expression>&lt;units&gt;.*?&lt;prec&gt;(.*?)&lt;/prec&gt;.*?&lt;/units&gt;</expression>
  37. +           </RegExp>
  38. +           <RegExp input="$$1" output="&lt;daily&gt;&lt;/daily&gt;" dest="3+">
  39.                 <expression repeat="yes">&lt;day number=&quot;.*?&quot;&gt;(.*?)&lt;/day&gt;</expression>
  40.             </RegExp>
  41.             <expression/>
  42. diff --git a/osd/deezer_entry.xml b/osd/deezer_entry.xml
  43. index 6baf19f..429467d 100644
  44. --- a/osd/deezer_entry.xml
  45. +++ b/osd/deezer_entry.xml
  46. @@ -7,7 +7,7 @@
  47.     </mlmenu>
  48.  </ctrlgrp>
  49.     <mlmenuview ctrlname="DEEZER_ENTRY_XML_VALKEY" changed="@@DEEZER_ENTRY_XML_VALKEY-changed" style="rv_home"    
  50. -       x="0" y="458" w="1280" h="262" display_item_cnt="6"/>
  51. +       x="0" y="458" w="1280" h="262" display_item_cnt="5"/>
  52.  
  53.  <include filename="./inc_deezer_logo.xml"/>
  54.  <include filename="./decoration.xml"/>
  55. diff --git a/osd/facebook_comment_input.xml b/osd/facebook_comment_input.xml
  56. index 9b78016..1e2a8dc 100644
  57. --- a/osd/facebook_comment_input.xml
  58. +++ b/osd/facebook_comment_input.xml
  59. @@ -1,11 +1,9 @@
  60.  <?xml version="1.0"?>
  61.  <!-- Copyright (C) 2007, ALPHA Networks, inc. -->
  62.  <page background="image/RV-BG.jpg">
  63. -<wrapper>
  64.          <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  65. -   <text text="@@master_headline" x="267" y="164" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  66. -</wrapper>
  67.         <include filename="./inc_keyboard.xml"/>
  68. +   <text text="@@master_headline" x="267" y="138" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  69.     <image image="@@logo" x="1069" y="534" w="158" h="65"/>
  70.     <image image="@@status_icon" x="573" y="320" w="133" h="133" /> <!--loading icon-->
  71.  </page>
  72. diff --git a/osd/facebook_home.xml b/osd/facebook_home.xml
  73. index 45f54af..fbf688c 100644
  74. --- a/osd/facebook_home.xml
  75. +++ b/osd/facebook_home.xml
  76. @@ -56,7 +56,7 @@
  77.     <image image="image/facebook/facebook_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  78.     <image image="image/facebook/facebook_logo.png" x="61" y="30" w="235" h="50"/>
  79.     <mlmenuview ctrlname="facebook-home-menu" changed="@@facebook-home-menu-changed" style="rv_home"    
  80. -       x="0" y="458" w="1280" h="262" display_item_cnt="6" dashboard_bar_image="image/facebook/facebook_dashboard_notification_bg.png" dashboard_bar_title="Notifications" dashboard_bar_title_x="390" dashboard_bar_title_y="677" dashboard_bar_title_w="500" dashboard_bar_title_h="22" dashboard_bar_title_fontsize="20" dashboard_bar_title_textcolor="0x001542"/>
  81. +       x="0" y="458" w="1280" h="262" display_item_cnt="5" dashboard_bar_image="image/facebook/facebook_dashboard_notification_bg.png" dashboard_bar_title="Notifications" dashboard_bar_title_x="390" dashboard_bar_title_y="677" dashboard_bar_title_w="500" dashboard_bar_title_h="22" dashboard_bar_title_fontsize="20" dashboard_bar_title_textcolor="0x001542"/>
  82.  
  83.     <image image="image/facebook/facebook_avatar_bg.png" x="61" y="163" w="98" h="98"/>
  84.     <image image="@@user_icon" x="62" y="164" w="96" h="96" scale_type="pan" scale="100" align="top"/>
  85. diff --git a/osd/facebook_publish_input.xml b/osd/facebook_publish_input.xml
  86. index 3430303..7e6bf4e 100644
  87. --- a/osd/facebook_publish_input.xml
  88. +++ b/osd/facebook_publish_input.xml
  89. @@ -1,10 +1,8 @@
  90.  <?xml version="1.0"?>
  91.  <!-- Copyright (C) 2007, ALPHA Networks, inc. -->
  92.  <page background="image/RV-BG.jpg">
  93. -<wrapper>
  94.          <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  95. -   <text text="@@master_headline" x="267" y="164" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  96. -</wrapper>
  97.         <include filename="./inc_keyboard.xml"/>
  98. +   <text text="@@master_headline" x="267" y="138" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  99.     <image image="@@logo" x="1069" y="534" w="158" h="65"/>
  100.  </page>
  101. diff --git a/osd/facebook_upload_input.xml b/osd/facebook_upload_input.xml
  102. index 9b78016..1e2a8dc 100644
  103. --- a/osd/facebook_upload_input.xml
  104. +++ b/osd/facebook_upload_input.xml
  105. @@ -1,11 +1,9 @@
  106.  <?xml version="1.0"?>
  107.  <!-- Copyright (C) 2007, ALPHA Networks, inc. -->
  108.  <page background="image/RV-BG.jpg">
  109. -<wrapper>
  110.          <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  111. -   <text text="@@master_headline" x="267" y="164" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  112. -</wrapper>
  113.         <include filename="./inc_keyboard.xml"/>
  114. +   <text text="@@master_headline" x="267" y="138" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  115.     <image image="@@logo" x="1069" y="534" w="158" h="65"/>
  116.     <image image="@@status_icon" x="573" y="320" w="133" h="133" /> <!--loading icon-->
  117.  </page>
  118. diff --git a/osd/flixster_filter.xml b/osd/flixster_filter.xml
  119. index 78a75a7..9816ec7 100644
  120. --- a/osd/flixster_filter.xml
  121. +++ b/osd/flixster_filter.xml
  122. @@ -5,11 +5,11 @@
  123.         <listbox valkey="typelist" autoenter="1" autoswitch="0" move="page" cols="1" rows="4" lbmask="lr" loop_scroll="1" turbo_trigger="10" turbo_multi="10"/>
  124.         <listbox valkey="filterlist" autoenter="1" autoswitch="0" move="page" cols="1" rows="4" lbmask="lr" loop_scroll="1" turbo_trigger="10" turbo_multi="10"/>
  125.         <button valkey="SELECT"
  126. -           normal_bg="./image/mediafly/global_ok_bt_n.png"
  127. -           focused_bg="./image/mediafly/global_ok_bt_f.png"/>
  128. +           normal_bg="./image/flixster/global_ok_bt_n.png"
  129. +           focused_bg="./image/flixster/global_ok_bt_f.png"/>
  130.         <button valkey="CANCEL"
  131. -           normal_bg="./image/mediafly/global_cancel_bt_n.png"
  132. -           focused_bg="./image/mediafly/global_cancel_bt_f.png"/>
  133. +           normal_bg="./image/flixster/global_cancel_bt_n.png"
  134. +           focused_bg="./image/flixster/global_cancel_bt_f.png"/>
  135.     </ctrlgrp>
  136.  
  137.     <text x="296" y="178" w="100" h="38" fontsize="36" textcolor="0xffffff" text="$$Filter:" speed="1" deplay="2"/>
  138. diff --git a/osd/inc_keyboard.xml b/osd/inc_keyboard.xml
  139. index 6620ea5..be40290 100644
  140. --- a/osd/inc_keyboard.xml
  141. +++ b/osd/inc_keyboard.xml
  142. @@ -14,6 +14,6 @@
  143.    <text text="$$Prev Page" x="272" y="255" w="350" h="22" align="left" fontsize="20" textcolor="0x6f6f6f"/>
  144.    <text text="$$Next Page" x="642" y="255" w="350" h="22" align="right" fontsize="20" textcolor="0x6f6f6f"/>
  145.  
  146. -   <text text="$$Press [Option] key for multi-lingual input" x="265" y="558" w="900" h="80" align="left" fontsize="20" textcolor="0xe2e2e2" numlines="2" disable="@@disable-OPTION"/>
  147. +   <text text="$$Press [Option] key for multi-lingual input" x="265" y="564" w="900" h="80" align="left" fontsize="20" textcolor="0xe2e2e2" numlines="2" disable="@@disable-OPTION"/>
  148.  
  149.  </wrapper>
  150. diff --git a/osd/inc_shoutcast_menu_node.xml b/osd/inc_shoutcast_menu_node.xml
  151. index d4bf0ce..3145235 100644
  152. --- a/osd/inc_shoutcast_menu_node.xml
  153. +++ b/osd/inc_shoutcast_menu_node.xml
  154. @@ -30,12 +30,6 @@
  155.         normal_bg="image/shoutcast/shoutcast_main_facorites_n.png"
  156.         focused_bg="image/shoutcast/shoutcast_main_facorites_f.png"
  157.         disabled_bg="image/shoutcast/shoutcast_main_facorites_n.png"/>
  158. -   <button valkey="SHOUTCAST_SEARCH"
  159. -       numlines="3"
  160. -       name="Search"  
  161. -       normal_bg="image/shoutcast/shoutcast_main_search_n.png"
  162. -       focused_bg="image/shoutcast/shoutcast_main_search_f.png"
  163. -       disabled_bg="image/shoutcast/shoutcast_main_search_n.png"/>
  164.     <button valkey="SHOUTCAST_TOP_RADIO"
  165.         numlines="3"
  166.         name="Top Radio"   
  167. diff --git a/osd/inc_spotify_logo.xml b/osd/inc_spotify_logo.xml
  168. index 3ac49a6..4245b5c 100644
  169. --- a/osd/inc_spotify_logo.xml
  170. +++ b/osd/inc_spotify_logo.xml
  171. @@ -1,4 +1,4 @@
  172.  <?xml version="1.0"?>
  173.  <wrapper>
  174. -   <image image="image/spotify/spotify_logo.png" x="0" y="0" w="306" h="111"/>
  175. +   <image image="image/spotify/spotify_logo.png" x="0" y="0" w="306" h="111" bg="1"/>
  176.  </wrapper>
  177. diff --git a/osd/info.xml b/osd/info.xml
  178. index 5d200d1..92dcbd1 100644
  179. --- a/osd/info.xml
  180. +++ b/osd/info.xml
  181. @@ -1,6 +1,6 @@
  182.  <?xml version="1.0"?>
  183.  <wrapper>
  184. -   <image image="@@info_inforbar" x="0" y="0" w="1280" h="126"/>
  185. +   <image image="@@info_inforbar" x="0" y="0" w="1280" h="126" bg="1"/>
  186.     <include filename="./inc_generic_now_playing.xml" />
  187.     <include filename="./inc_live365_now_playing.xml" />
  188.     <include filename="./inc_pandora_now_playing.xml" />
  189. diff --git a/osd/mtk_fwup.xml b/osd/mtk_fwup.xml
  190. index 58e9e8e..f3bd8e8 100644
  191. --- a/osd/mtk_fwup.xml
  192. +++ b/osd/mtk_fwup.xml
  193. @@ -1,14 +1,15 @@
  194.  <?xml version="1.0"?>
  195.  <page background="image/RV-BG.jpg">
  196.    <image image="image/video_encoding_bg.png"  x="0" y="0" w="1280" h="720"/>
  197. -  <image image="image/video_playback_metadata_scanning_bg.png" x="227" y="305" w="830" h="112" align="hcenter" scale_type="fixratio" scale="100"/>
  198. +  <image image="image/new_firware_progress_bar_box.png" x="227" y="305" w="830" h="112" align="hcenter" scale_type="fixratio" scale="100"/>
  199.  
  200. -  <text text="$$Updating firmware" x="247" y="326" w="772" h="41" align="left" fontsize="36" textcolor="0xffffff" />
  201. +  <text text="@@msg-stage-value" x="247" y="326" w="772" h="41" align="left" fontsize="36" textcolor="0xffffff" />
  202.  
  203. -  <text text="@@msg-value" x="243" y="179" w="794" h="150" fontsize="26" numlines="4" align="hcenter" textcolor="0xffffff" />
  204. +  <text text="@@msg-value" x="223" y="139" w="834" h="180" fontsize="26" numlines="5" align="hcenter" textcolor="0xffffff" />
  205.  
  206. -  <progress_bar name="point_bar" x="262" y="378" w="759" h="4"  pb_back_img="image/video_playback_metadata_scanning_bar_bg.png" pb_front_img="image/video_playback_metadata_scanning_bar.png" pb_point_img="image/music_playback_playing_progress_bar_point.png" pb_delay="500"/>
  207. +  <progress_bar name="point_bar" x="252" y="373" w="780" h="20"  pb_back_img="image/new_firware_progress_bar_n.png" pb_front_img="image/new_firware_progress_bar_f.png" pb_delay="500"/>
  208.  
  209.    <text text="@@msg-value1" x="828" y="342" w="200" h="19" fontsize="20" align="right" textcolor="0xffffff"/>
  210.  
  211.  </page>
  212. +
  213. diff --git a/osd/online_service_dummy_page_list.xml b/osd/online_service_dummy_page_list.xml
  214. new file mode 100644
  215. index 0000000..bdd49ef
  216. --- /dev/null
  217. +++ b/osd/online_service_dummy_page_list.xml
  218. @@ -0,0 +1,4 @@
  219. +<?xml version="1.0"?>
  220. +<page overlay="2">
  221. +   <include filename="./inc_loading.xml"/>
  222. +</page>
  223. diff --git a/osd/picasa_comment_input.xml b/osd/picasa_comment_input.xml
  224. index 9b78016..1e2a8dc 100644
  225. --- a/osd/picasa_comment_input.xml
  226. +++ b/osd/picasa_comment_input.xml
  227. @@ -1,11 +1,9 @@
  228.  <?xml version="1.0"?>
  229.  <!-- Copyright (C) 2007, ALPHA Networks, inc. -->
  230.  <page background="image/RV-BG.jpg">
  231. -<wrapper>
  232.          <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  233. -   <text text="@@master_headline" x="267" y="164" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  234. -</wrapper>
  235.         <include filename="./inc_keyboard.xml"/>
  236. +   <text text="@@master_headline" x="267" y="138" w="400" h="42" align="left" fontsize="36" textcolor="0xe2e2e2" speed="1" delay="2"/>      
  237.     <image image="@@logo" x="1069" y="534" w="158" h="65"/>
  238.     <image image="@@status_icon" x="573" y="320" w="133" h="133" /> <!--loading icon-->
  239.  </page>
  240. diff --git a/osd/radiotime_adv_search.xml b/osd/radiotime_adv_search.xml
  241. index e56a4c4..1e95142 100644
  242. --- a/osd/radiotime_adv_search.xml
  243. +++ b/osd/radiotime_adv_search.xml
  244. @@ -16,8 +16,8 @@
  245.     <text text="@@slave_headline" x="102" y="138" w="400" h="42" align="left" fontsize="36" textcolor="0xffffff" speed="1" delay="2"/>      
  246.    <text text="$$Prev Page" x="102" y="252" w="350" h="22" align="left" fontsize="20" textcolor="0x6f6f6f"/>
  247.    <text text="$$Next Page" x="482" y="252" w="350" h="22" align="right" fontsize="20" textcolor="0x6f6f6f"/>
  248. -   <image x="1002" y="192" w="40" h="29" image="@@listprev"/>
  249. -   <image x="1002" y="458" w="40" h="29" image="@@listnext"/>
  250. +   <image x="1002" y="192" w="40" h="29" image="@@moreprev"/>
  251. +   <image x="1002" y="458" w="40" h="29" image="@@morenext"/>
  252.  
  253.    <image image="image/keyboard_auto_complete_list_line.png" x="858" y="224" w="315" h="1"/>
  254.    <image image="image/keyboard_auto_complete_list_line.png" x="858" y="280" w="315" h="1"/>
  255. diff --git a/osd/registration_info_input_for_wizard.xml b/osd/registration_info_input_for_wizard.xml
  256. index 7d16ab5..9a84bd0 100644
  257. --- a/osd/registration_info_input_for_wizard.xml
  258. +++ b/osd/registration_info_input_for_wizard.xml
  259. @@ -23,7 +23,7 @@
  260.     <image image="image/wizard_message_bg.png" x="226" y="113" w="832" h="501" bg="1"/>
  261.     <image image="image/wizard_wd_logo.png" x="250" y="139" w="118" h="73" bg="1"/>
  262.     <text text="$$Device Registration" x="378" y="143" w="654" h="38" align="left" fontsize="36" textcolor="0x5291e0"/>
  263. -   <text text="$$Register to get the lastest info and special offers" x="378" y="188" w="654" h="20" align="left" fontsize="18" textcolor="0xffffff"/>
  264. +   <text text="$$Register to get the latest info and special offers" x="378" y="188" w="654" h="20" align="left" fontsize="18" textcolor="0xffffff"/>
  265.  
  266.     <image image="@@bg-FIRSTNAME" x="267" y="282" w="368" h="58"/>
  267.     <image image="@@bg-LASTNAME"  x="647" y="282" w="368" h="58"/>
  268. diff --git a/osd/setup_digital_pass_through_via_optical_only.xml b/osd/setup_digital_pass_through_via_optical_only.xml
  269. new file mode 100755
  270. index 0000000..4cdd603
  271. --- /dev/null
  272. +++ b/osd/setup_digital_pass_through_via_optical_only.xml
  273. @@ -0,0 +1,50 @@
  274. +<?xml version="1.0"?>
  275. +<page background="./image/RV-BG.jpg">
  276. +  <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  277. +  <image image="./image/global_messagebox_large_bg.png" x="226" y="48" w="832" h="624"/>
  278. +  <text text="@@headline" x="254" y="128" w="755" h="40" align="left" fontsize="32" textcolor="0xe2e2e2" speed="1" delay="2"/>
  279. +<!--for the detail item-->
  280. +  
  281. +   <ctrlgrp>
  282. +       <listbox valkey="browselist" move="page" cols="1" rows="6" lbmask="lr" autoenter="1" loop_scroll="1"/>
  283. +       <!--
  284. +       <button valkey="CONFIRM"
  285. +           focused_bg="./image/global_ok_bt_f.png"
  286. +           normal_bg="./image/global_ok_bt_n.png"/>
  287. +       -->
  288. +   </ctrlgrp>
  289. +
  290. +   <wrapper x="286" w="670" h="32" fontsize="30" align="left" textcolor="0xc1c1c1" activetextcolor="0xffffff">
  291. +       <text text="@@browselist-text0" active="@@act-text0" y="221"/> 
  292. +       <text text="@@browselist-text1" active="@@act-text1" y="281"/> 
  293. +       <text text="@@browselist-text2" active="@@act-text2" y="341"/> 
  294. +       <text text="@@browselist-text3" active="@@act-text3" y="401"/> 
  295. +       <text text="@@browselist-text4" active="@@act-text4" y="461"/> 
  296. +       <text text="@@browselist-text5" active="@@act-text5" y="521"/> 
  297. +   </wrapper>
  298. +
  299. +
  300. +<!--selected item-->
  301. +   <wrapper x="266" w="749" h="60" cols="1" rows="6" align="left">
  302. +       <image image="@@selected_0" y="207"/>
  303. +           <image image="@@selected_1" y="267"/>
  304. +           <image image="@@selected_2" y="327"/>
  305. +           <image image="@@selected_3" y="387"/>
  306. +           <image image="@@selected_4" y="447"/>
  307. +           <image image="@@selected_5" y="507"/>
  308. +   </wrapper>
  309. +
  310. +<!--checked item-->
  311. +   <wrapper x="967" w="32" h="55" cols="1" rows="6" align="left">
  312. +       <image image="@@checked_0" y="210"/>
  313. +           <image image="@@checked_1" y="270"/>
  314. +           <image image="@@checked_2" y="330"/>
  315. +           <image image="@@checked_3" y="390"/>
  316. +           <image image="@@checked_4" y="450"/>
  317. +           <image image="@@checked_5" y="510"/>
  318. +   </wrapper>
  319. +
  320. +   <!--    <imgbtn image="@@bg-CONFIRM" active="@@act-CONFIRM" x="1098" y="303" w="112" h="112" disable="disable-CONFIRM"/>-->
  321. +   <include filename="./decoration.xml"/>
  322. +</page>
  323. +
  324. diff --git a/osd/setup_network_failed_for_wizard.xml b/osd/setup_network_failed_for_wizard.xml
  325. index 335010c..06063f7 100644
  326. --- a/osd/setup_network_failed_for_wizard.xml
  327. +++ b/osd/setup_network_failed_for_wizard.xml
  328. @@ -3,7 +3,7 @@
  329.     <image image="image/wizard_message_bg.png" x="226" y="113" w="832" h="501"/>
  330.     <image image="image/wizard_wd_logo.png" x="250" y="139" w="118" h="73"/>
  331.     <text text="$$Connection Failed" x="378" y="157" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400"/>
  332. -   <text text="$$Wireless network not found" x="274" y="245" w="737" h="68" align="left" numlines="2" fontsize="28" textcolor="0xC1C1C1" />
  333. +   <text text="$$Wireless network not found. Please check your settings and try again." x="274" y="245" w="737" h="68" align="left" numlines="2" fontsize="28" textcolor="0xC1C1C1" />
  334.     <image image="image/villa_networksetup_complete_icon.png" x="590" y="259" w="108" h="140" bg="1"/>
  335.  
  336.     <ctrlgrp>
  337. diff --git a/osd/setup_network_finish_for_wizard.xml b/osd/setup_network_finish_for_wizard.xml
  338. index 5678bdc..25a8027 100644
  339. --- a/osd/setup_network_finish_for_wizard.xml
  340. +++ b/osd/setup_network_finish_for_wizard.xml
  341. @@ -5,17 +5,18 @@
  342.     <linebreak/>
  343.     <button valkey="SKIP" focused_bg="image/skip_btn_f.png" normal_bg="image/skip_btn_n.png" click_bg="image/skip_btn_n.png"/>
  344.     <linebreak/>
  345. -  </ctrlgrp>
  346. -
  347. +</ctrlgrp>
  348.     <image image="image/wizard_message_bg.png" x="226" y="113" w="832" h="501"/>
  349.     <image image="image/wizard_wd_logo.png" x="250" y="139" w="118" h="73"/>
  350. -   <text text="@@title" x="378" y="157" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400"/>
  351. -   <text text="@@txt1" x="274" y="245" w="737" h="136" align="left" numlines="4" fontsize="28" textcolor="0xC1C1C1" />
  352. +   <text text="@@title" x="378" y="143" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400" disable="@@disable-subtitle"/>
  353. +   <text text="@@subtitle" x="378" y="188" w="654" h="20" align="left" fontsize="18" textcolor="0xffffff" disable="@@disable-subtitle"/>
  354. +   <text text="@@title" x="378" y="157" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400" disable="@@disable-non_subtitle"/>
  355. +   <text text="@@txt1" x="274" y="245" w="737" h="246" align="left" numlines="7" fontsize="28" textcolor="0xC1C1C1" />
  356.     <!--
  357.     <text text="@@location" x="274" y="327" w="737" h="30" align="hcenter" numlines="2" fontsize="30" textcolor="0xffffff" />
  358.     <text text="@@timezone" x="274" y="371" w="737" h="30" align="hcenter" numlines="2" fontsize="30" textcolor="0xffffff" />
  359. -   -->
  360.     <text text="@@txt2" x="274" y="415" w="737" h="68" align="left" numlines="2" fontsize="28" textcolor="0xC1C1C1" />
  361. +   -->
  362.     <image image="image/villa_networksetup_complete_icon.png" x="590" y="259" w="108" h="140" bg="1"/>
  363.  
  364.    <imgbtn image="@@bg-MORE" active="@@act-MORE" x="1098" y="303" w="116" h="116" align="hcenter" disable="@@disable-MORE"/>
  365. diff --git a/osd/setup_reset_location.xml b/osd/setup_reset_location.xml
  366. new file mode 100644
  367. index 0000000..d73e313
  368. --- /dev/null
  369. +++ b/osd/setup_reset_location.xml
  370. @@ -0,0 +1,5 @@
  371. +<?xml version="1.0"?>
  372. +<page background="./image/RV-BG.jpg">
  373. +  <image image="image/video_encoding_bg.png" x="0" y="0" w="1280" h="720"/>
  374. +  <include filename="./inc_loading.xml"/>
  375. +</page>
  376. diff --git a/osd/setup_wireless_survey_for_wizard.xml b/osd/setup_wireless_survey_for_wizard.xml
  377. index 2b45e11..0c3fba6 100755
  378. --- a/osd/setup_wireless_survey_for_wizard.xml
  379. +++ b/osd/setup_wireless_survey_for_wizard.xml
  380. @@ -2,7 +2,7 @@
  381.  <page background="image/wizard_bg.png" type="basic">
  382.     <image image="image/wizard_message_bg.png" x="226" y="113" w="832" h="501"/>
  383.     <image image="image/wizard_wd_logo.png" x="250" y="139" w="118" h="73"/>
  384. -   <text text="$$Connect To the Internet" x="378" y="143" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400"/>
  385. +   <text text="$$Connect to Internet" x="378" y="143" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400"/>
  386.     <text text="$$Select a wireless network, or connect an ethernet cable" x="378" y="188" w="654" h="20" align="left" fontsize="18" textcolor="0xffffff"/>
  387.  
  388.    <text text="$$Wireless Network" x="287" y="254" w="372" h="28" fontsize="26" textcolor="0xffffff" align="left"/>
  389. diff --git a/osd/shoutcast_home.xml b/osd/shoutcast_home.xml
  390. index 3ba6b41..854b144 100644
  391. --- a/osd/shoutcast_home.xml
  392. +++ b/osd/shoutcast_home.xml
  393. @@ -9,9 +9,8 @@
  394.     </mlmenu>
  395.  </ctrlgrp>
  396.     <mlmenuview ctrlname="shoutcast-home-menu" changed="@@shoutcast-home-menu-changed" style="rv_home"    
  397. -       x="0" y="458" w="1280" h="262" display_item_cnt="7"/>
  398. +       x="0" y="458" w="1280" h="262" display_item_cnt="5"/>
  399.          
  400.  <include filename="./inc_loading.xml"/>
  401. -<include filename="./decoration.xml"/>
  402.  </page>
  403.  
  404. diff --git a/osd/spotify_login.xml b/osd/spotify_login.xml
  405. index 918f2b8..5507f47 100644
  406. --- a/osd/spotify_login.xml
  407. +++ b/osd/spotify_login.xml
  408. @@ -1,6 +1,6 @@
  409.  <?xml version="1.0"?>
  410.  <!-- Copyright (C) 2007, ALPHA Networks, inc. -->
  411. -<page background="./image/spotify/spotify_encoding_bg.png" overlay="1">
  412. +<page>
  413.    <ctrlgrp>
  414.     <button valkey="USERNAME"
  415.         focused_bg="./image/spotify/spotify_sign in_box_f.png"
  416. @@ -16,7 +16,7 @@
  417.             focused_bg="image/spotify/global_ok_bt_f.png" />
  418.    </ctrlgrp>
  419.     <include filename="./spotify_common.xml"/>
  420. -   <image image="./image/spotify/keyboard_mask_bg.png" x="0" y="0" w="1280" h="720"/>
  421. +   <image image="./image/spotify/keyboard_mask_bg.png" x="0" y="0" w="1280" h="720" bg="1"/>
  422.  
  423.     <image image="./image/spotify/global_messagebox_large_bg.png" x="226" y="108" w="832" h="515"/>
  424.    
  425. diff --git a/osd/spotify_view_msg_messagebox.xml b/osd/spotify_view_msg_messagebox.xml
  426. index 15dd548..435b305 100644
  427. --- a/osd/spotify_view_msg_messagebox.xml
  428. +++ b/osd/spotify_view_msg_messagebox.xml
  429. @@ -4,6 +4,7 @@
  430.     <include filename="./spotify_common.xml"/>
  431.    <image image="image/spotify/keyboard_mask_bg.png" x="0" y="0" w="1280" h="720"/>
  432.    <ctrlgrp>
  433. +   <textbox valkey="msg_overview" numlines="8" directkey_table="UD" non_focusable="1"/>
  434.       <button valkey="OK"
  435.     focused_bg="./image/spotify/global_cancel_bt_f.png"
  436.     normal_bg="./image/spotify/global_cancel_bt_n.png"/>
  437. @@ -13,11 +14,15 @@
  438.     <image default_image="./image/spotify/view_message_from_your_friend_no_cover_art.png" image="@@artist_img"
  439.     x="273" y="208" w="126" h="126" />
  440.     <text text="@@friend_name" x="438" y="215" fontsize="30" w="573" h="32" textcolor="0xffffff" speed="1" delay="2"/>
  441. -   <text text="@@message" x="438" y="269" fontsize="26" w="552" h="282" numlines="8" textcolor="0x000000" speed="1" deplay="2"/>
  442. +   <text text="@@message" x="438" y="269" w="552" h="282" fontsize="26" align="left" textcolor="0x000000" numlines="@@numlines-msg_overview" id="msg_overview" start_line="@@start_line-msg_overview" disable="@@disable-msg_overview" disable_tail_dots="1"/>
  443.     <imgbtn image="@@bg-OK" x="1098" y="303" w="116" h="116" active="@@act-OK" selected="@@sel-OK" click="@@click-OK" clicked="@@clicked-OK"/>
  444.    
  445.  
  446.     <text text="@@title" x="254" y="139" w="778" h="38"
  447.             fontsize="36" align="left" numlines="1" textcolor="0xffffff" speed="1" delay="2"/>
  448.  
  449. +
  450. +   <text text="@@msg_prev_page" x="418" y="560" w="250" h="22" fontsize="20" align="left" textcolor="0x565656" active="@@prev-msg_overview" actnoseltextcolor="0xc1c1c1" disable="@@disable-msg_overview"/>
  451. +   <text text="@@msg_next_page" x="762" y="560" w="250" h="22" fontsize="20" align="right" textcolor="0x565656" active="@@next-msg_overview" actnoseltextcolor="0xc1c1c1" disable="@@disable-msg_overview"/>
  452. +
  453.  </page>
  454. diff --git a/osd/transparent.xml b/osd/transparent.xml
  455. index 0ccf271..412a363 100644
  456. --- a/osd/transparent.xml
  457. +++ b/osd/transparent.xml
  458. @@ -1,5 +1,4 @@
  459.  <?xml version="1.0" ?>
  460. -<page>
  461. -<image image="fillrect" x="0" y="0" w="1280" h="720" textcolor="0x01000000" keycolor="1" ignore_keycolor="1"/>
  462. +<page background="./image/trans_bg.png">
  463.  <include filename="./inc_loading.xml"/>
  464.  </page>
  465. diff --git a/osd/tvdock_wizard_waiting.xml b/osd/tvdock_wizard_waiting.xml
  466. new file mode 100644
  467. index 0000000..8392c18
  468. --- /dev/null
  469. +++ b/osd/tvdock_wizard_waiting.xml
  470. @@ -0,0 +1,10 @@
  471. +<?xml version="1.0"?>
  472. +<page background="image/wizard_bg.png" type="basic">
  473. +
  474. +   <image image="image/wizard_message_bg.png" x="226" y="113" w="832" h="501"/>
  475. +   <image image="image/wizard_wd_logo.png" x="250" y="139" w="118" h="73"/>
  476. +   <text text="@@title" x="378" y="157" w="654" h="38" align="left" fontsize="36" textcolor="0xff8400"/>
  477. +   <text text="@@txt1" x="274" y="245" w="737" h="136" align="left" numlines="4" fontsize="28" textcolor="0xC1C1C1" />
  478. +
  479. +  <include filename="./inc_loading.xml"/>
  480. +</page>
  481. diff --git a/osd/video_run_buf.xml b/osd/video_run_buf.xml
  482. new file mode 100755
  483. index 0000000..6581ec2
  484. --- /dev/null
  485. +++ b/osd/video_run_buf.xml
  486. @@ -0,0 +1,57 @@
  487. +<?xml version="1.0"?>
  488. +<page>
  489. +  <ctrlgrp>
  490. +   <button valkey="CLOSE"/>
  491. +   <linebreak/>
  492. +   <button valkey="SKIP_TIME"/>
  493. +  </ctrlgrp>
  494. +  <wrapper disable="@@disable_subtitle_audio_info">
  495. +        <image image="image/video_playback_subtitle_info_bg.png" x="70" y="36" w="310" h="83"/>
  496. +        <text text="@@subtitle_info" x="87" y="53" w="276" h="22" fontsize="20" textcolor="0xffffff" align="left" speed="1" delay="2"/>
  497. +        <text text="@@audio_info" x="87" y="83" w="276" h="22" fontsize="20" textcolor="0xffffff" align="left" speed="1" delay="2"/>
  498. +  </wrapper>
  499. +
  500. +  <!-- information time info -->
  501. +
  502. +  <wrapper disable="@@disable_time_info">
  503. +   <image image="@@video_time_info_area" x="0" y="0" w="1280" h="720" bg="1"/>
  504. +   <image image="image/video_playing_bar_bg.png" x="70" y="644" w="1141" h="50"/>
  505. +   <image image="@@file_album" default_image="@@default_thumbnail" x="70" y="494" w="100" h="139" scale="100"/>
  506. +   <text text="@@filename" x="184" y="555" w="740" h="48" fontsize="44" textcolor="0xffffff" speed="1" delay="2" align="left" auto_translate="1"/>
  507. +
  508. +   <image image="@@file_rating" x="186" y="609" w="124" h="21"/>
  509. +   <image image="@@file_favorite" x="324" y="609" w="23" h="21"/>
  510. +   <image image="@@speed_state" x="89" y="658" w="30" h="23"/>
  511. +   <text text="@@speed_value" x="120" y="657" w="33" h="22" fontsize="20" align="left"/>
  512. +
  513. +   <progress_bar name="video_time_bar" x="162" y="662" w="832" h="14" pb_back_img="image/video_playback_playing_progress_bar_bg.png" pb_front_img="image/video_playback_playing_progress_bar.png" pb_point_img="image/playing_progress_bar_point.png" pb_delay="500"/>
  514. +
  515. +   <text text="@@current_time" x="999" y="661" w="103" h="22" fontsize="20" align="right"/>
  516. +   <text text="@@duration_time" x="1108" y="661" w="96" h="22" fontsize="20" align="left"/>
  517. +  </wrapper>
  518. +
  519. +  <text x="941" y="564" w="260" h="32" text="$$Close" align="right"
  520. +       fontsize="30" textcolor="0xc1c1c1"  active="@@act-CLOSE" selected="sel-CLOSE"
  521. +       actnoseltextcolor="0xff8400" activetextcolor="0xff8400" disable="@@disable-CLOSE"/>
  522. +  <text x="701" y="606" w="500" h="32"  text="$$Enter Desired Time" align="right"
  523. +       fontsize="30" textcolor="0xc1c1c1"  active="@@act-SKIP_TIME" selected="sel-SKIP_TIME"
  524. +       actnoseltextcolor="0xff8400" activetextcolor="0xff8400" disable="@@disable-SKIP_TIME"/>
  525. +
  526. +  <!--
  527. +  <image image="@@shufle-ico" x="1234" y="599" w="48" h="36"/>
  528. +  -->
  529. +<wrapper>
  530. +   <image image="@@wrongkeyicon" x="563" y="282" w="154" h="155" align="hcenter" />
  531. +   <image image="@@keyicon" x="1063" y="71" w="65" h="45" align="hcenter" />
  532. +   <text text="@@info_now_playing" x="65" y="18" w="243" h="31" fontsize="26"/>
  533. +</wrapper>
  534. +  <include filename="./ipcam_pip_win.xml" />
  535. +  <text text="@@mod_txt" x="162" y="186" w="958" h="34" fontsize="30" textcolor="0xffffff" align="hcenter" auto_translate="1"/>
  536. +  <text x="450" y="160" w="372" h="26" text="@@text-OPTION" fontsize="24" textcolor="0x07b5ff" align="hcenter" disable="@@disable-text-options"/>
  537. +  <image image="@@mod_img" x="1063" y="71" w="107" h="107"/>
  538. +
  539. +  <image image="@@info_mute_icon" x="1162" y="49" w="48" h="48"/>
  540. +
  541. +  <include filename="./inc_loading.xml"/>
  542. +  
  543. +</page>
Add Comment
Please, Sign In to add comment