Changeset 31304

Timestamp:

Nov 21, 2014, 11:41:51 PM (11 years ago)

Author:

tobayer

Message:

[default skins] try to fix loop in autoupdate po, next step, recover manually pending modifications (similar to r31302)

Location:

ipk/source

Files:

• skins_default/_path_/usr/local/share/titan/skin/default/skin.xml (modified) (4 diffs)
• skins_defnominitv/_path_/usr/local/share/titan/skin/defnominitv/skin.xml (modified) (6 diffs)

ipk/source/skins_default/_path_/usr/local/share/titan/skin/default/skin.xml

@@ -142 +142 @@
                         <node parent="listbox" type="menu" name="settings_pluginbutton" text="Plugin Button" picmem="skin/pluginkeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
                         <node parent="listbox" type="menu" name="settings_mediabutton" text="Media Button" picmem="skin/mediakeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
+                        <node parent="listbox" type="menu" name="settings_pip" text="PIP functions" picmem="skin/pipkeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5" hidden="yes">
                         <node parent="listbox" type="menu" name="adjust" text="Adjust" picmem="skin/adjust.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
                         <node parent="listbox" type="menu" name="skinadjust" text="Skin Adjust" picmem="skin/skinadjust.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
@@ -2579 +2580 @@
 <node parent=grid2 posy=8 posx=364 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="k" name=k>
 <node parent=grid2 posy=8 posx=416 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="l" name=l>
-<node parent=grid2 posy=8 posx=468 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="oe" name=ue>
+<node parent=grid2 posy=8 posx=468 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="oe" name=oe>
 <node parent=grid2 posy=8 posx=520 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="ae" name=ae>
 <node parent=grid2 posy=8 posx=572 width=50 height=40 fontcol=black bgcol=green halign=center valign=middle text="Ok" name=ok>
@@ -2930 +2931 @@
         <node posx="0" posy="72"  name="t2" text="size" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="94"  name="b2" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_ch_up_down_70x40.png" picwidth="70" picheight="40">
-        <node posx="0" posy="144" name="t4" text="accept" valign="middle" halign="center" width="100%" height="20">
+        <node posx="0" posy="144" name="t4" text="save" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="166" name="b4" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_ok_70x40.png" picwidth="70" picheight="40">
-        <node posx="0" posy="216" name="t5" text="exit pip" valign="middle" halign="center" width="100%" height="20">
+        <node posx="0" posy="216" name="t5" text="pip end" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="238" name="b5" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_exit_70x40.png" picwidth="70" picheight="40">
         <node posx="0" posy="287" name="x1" width="100%" height="2" bgcol="#267FB2">
@@ -2941 +2942 @@
 </screen>
 
+
+<screen name="pipsetup" fontsize="28" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
+        <node name="titletext" text="Setup PIP" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+        <node name="details" bordercol="titlebgcol" bordersize="1" borderradius="8" type="textbox" wrap="yes" fontsize="28" posx="0" posy="60" width="840" height="145" hspace="10" vspace="10" text="Here you can make your system settings. Use to navigate the control cross and the extra buttons displayed with your remote control to select.">
+                <node name="minitv" func="gettvpic" param1="494:25:210">
+                <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
+                <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" transparent="0">
+        <node name="listbox" type="listbox" scrollbar="auto" bordercol="titlebgcol" bordersize="1" fontsize="28" posx="center" posy="215" width="1000" height="385" hspace="5" vspace="5">
+                <node parent="listbox" name="pip" text="key pip" type="choicebox" valign="middle" width="100%" height="35">     
+                <node parent="listbox" name="pipzap" text="key channel up/down" type="choicebox" valign="middle" width="100%" height="35">
+                <node parent="listbox" name="null" text="key 0" type="choicebox" valign="middle" width="100%" height="35">
+        <node name="buttonbar" posx="0" posy="610" width="100%" height="50" hspace="5" fontcol="black" fontsize="25" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+                <node parent="buttonbar" name="b1" picmem="skin/key_ok_70x40.png"   valign="middle" posx="0"  posy="center" width="70" height="40">
+                <node parent="buttonbar" name="b2" picmem="skin/key_exit_70x40.png" valign="middle" posx="70" posy="center" width="70" height="40">
+                <node parent="buttonbar" name="b3" picmem="skin/key_control_cross_70x40.png" valign="middle" posx="140" posy="center" width="70" height="40">
+</screen>

ipk/source/skins_defnominitv/_path_/usr/local/share/titan/skin/defnominitv/skin.xml

@@ -142 +142 @@
                         <node parent="listbox" type="menu" name="settings_pluginbutton" text="Plugin Button" picmem="skin/pluginkeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
                         <node parent="listbox" type="menu" name="settings_mediabutton" text="Media Button" picmem="skin/mediakeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
+                        <node parent="listbox" type="menu" name="settings_pip" text="PIP functions" picmem="skin/pipkeyaction.png" textposx="120" valign="middle" width="100%" height="50" hspace="5" hidden="yes">
                         <node parent="listbox" type="menu" name="adjust" text="Adjust" picmem="skin/adjust.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
                         <node parent="listbox" type="menu" name="skinadjust" text="Skin Adjust" picmem="skin/skinadjust.png" textposx="120" valign="middle" width="100%" height="50" hspace="5">
@@ -2579 +2580 @@
 <node parent=grid2 posy=8 posx=364 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="k" name=k>
 <node parent=grid2 posy=8 posx=416 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="l" name=l>
-<node parent=grid2 posy=8 posx=468 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="oe" name=ue>
+<node parent=grid2 posy=8 posx=468 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="oe" name=oe>
 <node parent=grid2 posy=8 posx=520 width=50 height=40 fontcol=black bgcol=grey halign=center valign=middle text="ae" name=ae>
 <node parent=grid2 posy=8 posx=572 width=50 height=40 fontcol=black bgcol=green halign=center valign=middle text="Ok" name=ok>
@@ -2903 +2904 @@
 
 <screen name="cec" fontsize="28" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
-        <node name="titletext" text="Setup HDMI-CEC" fontcol="black" fontsize="36" posx="0" posy="0" width="840" height="50" valign="middle" halign="center" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
-        <node name="details" bordercol="titlebgcol" bordersize="1" borderradius="8" type="textbox" wrap="yes" fontsize="28" posx="0" posy="60" width="840" height="145" hspace="10" vspace="10" text="Here you can make your system settings. Use to navigate the control cross and the extra buttons displayed with your remote control to select.">
-                <node name="minitv" func="gettvpic" param1="494:25:210">
-                <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
-                <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" transparent="0">
+        <node name="titletext" text="Setup HDMI-CEC" fontcol="black" fontsize="36" posx="0" posy="0" width="100%" height="50" valign="middle" halign="center" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+        <node name="details" bordercol="titlebgcol" bordersize="1" borderradius="8" type="textbox" wrap="yes" fontsize="28" posx="0" posy="60" width="100%" height="145" hspace="10" vspace="10" text="Here you can make your system settings. Use to navigate the control cross and the extra buttons displayed with your remote control to select.">
+#               <node name="minitv" func="gettvpic" param1="494:25:210">
+#               <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
+#               <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" transparent="0">
         <node name="listbox" type="listbox" scrollbar="auto" bordercol="titlebgcol" bordersize="1" fontsize="28" posx="center" posy="215" width="1000" height="385" hspace="5" vspace="5">
                 <node parent="listbox" name="cecon" text="Activate" type="choicebox" valign="middle" width="100%" height="35">
@@ -2924 +2925 @@
 </screen>
 
+
 <screen name="pipscreen" fontsize="20" fontcol="ffffff" posx="25" posy="25" width="100" height="434" halign="center" vspace="10" bordersize="1" bordercol="#0F15E3" borderradius="8" bgcol="#0F15E3" bgcol2="#267FB2" gradient="topmiddle" transparent="0">
         <node posx="0" posy="0"   name="t1" text="position" valign="middle" halign="center" width="100%" height="20">
@@ -2929 +2931 @@
         <node posx="0" posy="72"  name="t2" text="size" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="94"  name="b2" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_ch_up_down_70x40.png" picwidth="70" picheight="40">
-        <node posx="0" posy="144" name="t4" text="accept" valign="middle" halign="center" width="100%" height="20">
+        <node posx="0" posy="144" name="t4" text="save" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="166" name="b4" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_ok_70x40.png" picwidth="70" picheight="40">
-        <node posx="0" posy="216" name="t5" text="exit pip" valign="middle" halign="center" width="100%" height="20">
+        <node posx="0" posy="216" name="t5" text="pip end" valign="middle" halign="center" width="100%" height="20">
         <node posx="0" posy="238" name="b5" valign="middle" halign="center" width="100%" height="40" picmem="skin/key_exit_70x40.png" picwidth="70" picheight="40">
         <node posx="0" posy="287" name="x1" width="100%" height="2" bgcol="#267FB2">
@@ -2940 +2942 @@
 </screen>
 
+
+<screen name="pipsetup" fontsize="28" fontcol="fontcol" bgcol="black" posx="left" posy="top" width="100%" height="100%" hspace="30" vspace="30">
+        <node name="titletext" text="Setup PIP" fontcol="black" fontsize="36" posx="0" posy="0" width="100%" height="50" valign="middle" halign="center" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+        <node name="details" bordercol="titlebgcol" bordersize="1" borderradius="8" type="textbox" wrap="yes" fontsize="28" posx="0" posy="60" width="100%" height="145" hspace="10" vspace="10" text="Here you can make your system settings. Use to navigate the control cross and the extra buttons displayed with your remote control to select.">
+#               <node name="minitv" func="gettvpic" param1="494:25:210">
+#               <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" bgcol="0" transparent="255">
+#               <node bordersize="5" bordercol="black" posx="850" posy="0" width="370" height="205" transparent="0">
+        <node name="listbox" type="listbox" scrollbar="auto" bordercol="titlebgcol" bordersize="1" fontsize="28" posx="center" posy="215" width="1000" height="385" hspace="5" vspace="5">
+                <node parent="listbox" name="pip" text="key pip" type="choicebox" valign="middle" width="100%" height="35">     
+                <node parent="listbox" name="pipzap" text="key channel up/down" type="choicebox" valign="middle" width="100%" height="35">
+                <node parent="listbox" name="null" text="key 0" type="choicebox" valign="middle" width="100%" height="35">
+        <node name="buttonbar" posx="0" posy="610" width="100%" height="50" hspace="5" fontcol="black" fontsize="25" bordercol="titlebgcol" bordersize="1" borderradius="8" bgcol="titlebgcol" bgcol2="white" gradient="topmiddle">
+                <node parent="buttonbar" name="b1" picmem="skin/key_ok_70x40.png"   valign="middle" posx="0"  posy="center" width="70" height="40">
+                <node parent="buttonbar" name="b2" picmem="skin/key_exit_70x40.png" valign="middle" posx="70" posy="center" width="70" height="40">
+                <node parent="buttonbar" name="b3" picmem="skin/key_control_cross_70x40.png" valign="middle" posx="140" posy="center" width="70" height="40">
+</screen>