Merge remote-tracking branch 'oe_21/master' into vuplus-3.0-next
[vuplus_openvuplus_3.0] / meta-openvuplus / recipes-vuplus / enigma2 / enigma2 / enigma2_vuplus_fix_standby_name_skin.patch
1 diff --git a/data/750S/skin.xml b/data/750S/skin.xml
2 index 541df3d..3be2f88 100644
3 --- a/data/750S/skin.xml
4 +++ b/data/750S/skin.xml
5 @@ -370,7 +370,7 @@
6                         <convert type="MenuEntryCompare">setup_selection</convert>
7                         <convert type="ConditionalShowHide"/>
8                 </widget> 
9 -               <widget source="menu" render="FixedLabel" text="-Standby" position="410,324" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
10 +               <widget source="menu" render="FixedLabel" text="-Idle Server Mode" position="410,324" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
11                         <convert type="MenuEntryCompare">standby_restart_list</convert>
12                         <convert type="ConditionalShowHide"/>
13                 </widget>
14 @@ -378,7 +378,7 @@
15                         <convert type="MenuEntryCompare">standby_restart_list</convert>
16                         <convert type="ConditionalShowHide"/>
17                 </widget>
18 -               <widget source="menu" render="FixedLabel" text="-Deep Standby" position="410,374" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
19 +               <widget source="menu" render="FixedLabel" text="-Standby" position="410,374" zPosition="1" size="195,22" font="Regular;19" backgroundColor="#182946" foregroundColor="#998462" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
20                         <convert type="MenuEntryCompare">standby_restart_list</convert>
21                         <convert type="ConditionalShowHide"/>
22                 </widget>
23 @@ -2612,7 +2612,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
24         </screen>
25  
26         <!-- Fancontrol Plugin -->
27 -       <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
28 +       <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
29                 <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
30                 <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
31  
32 @@ -2678,7 +2678,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
33         </screen>
34  
35         <!-- Manual Fancontrol Plugin -->
36 -       <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
37 +       <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Idle Server Mode" >
38                 <ePixmap pixmap="750S/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
39                 <ePixmap pixmap="750S/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
40  
41 diff --git a/data/Vu_HD/skin.xml b/data/Vu_HD/skin.xml
42 index 3e35405..a29a177 100644
43 --- a/data/Vu_HD/skin.xml
44 +++ b/data/Vu_HD/skin.xml
45 @@ -3135,7 +3135,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
46         </screen>
47  
48         <!-- Fancontrol Plugin -->
49 -       <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Standbymode Fancontrol settings" >
50 +       <screen name="FancontrolConfiguration" position="center,center" size="560,300" title="Idle Server Mode Fancontrol settings" >
51                 <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="30,40" alphatest="on" />
52                 <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="30,40" alphatest="on" />
53  
54 @@ -3202,7 +3202,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y() + (or
55         </screen>
56  
57         <!-- Manual Fancontrol Plugin -->
58 -       <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Standby mode" >
59 +       <screen name="ManualFancontrol" position="center,center" size="560,300" title="Fancontrol Settings in Idle Server Mode" >
60                 <ePixmap pixmap="Vu_HD/buttons/red.png" position="110,10" size="140,40" alphatest="on" />
61                 <ePixmap pixmap="Vu_HD/buttons/green.png" position="310,10" size="140,40" alphatest="on" />
62