sync

diff --git a/data/menu.xml b/data/menu.xml
index 3064fdb..7091c83 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -5,7 +5,7 @@
                <item text="Radio"></item>
                <item text="Timer">self.openDialog(TimerEditList)</item>
                <item text="Information">self.openDialog(About)</item>
-               <item text="Games / Plugins"></item>
+               <item text="Games / Plugins">self.openDialog(PluginBrowser)</item>
                <menu text="Setup">
                        <menu text="Service Organising">
                                <item text="New Bouquets"></item>
@@ -13,8 +13,8 @@
                                <item text="Edit Bouquets"></item>
                        </menu>
                        <menu text="Service Searching">
-                               <item text="Satelliteconfig">self.openDialog(Satconfig)</item>
-                               <!--<item text="Satelliteconfig">self.openSetup("satconfig")</item>-->
+                               <!--<item text="Satelliteconfig">self.openDialog(Satconfig)</item>-->
+                               <item text="Satelliteconfig">self.openSetup("satconfig")</item>
                                <item text="Automatic Scan">self.openDialog(ServiceScan)</item>
                                <item text="Manual Scan">self.openDialog(ServiceScan)</item>
                                <item text="Rotor Control"></item>

diff --git a/data/setup.xml b/data/setup.xml
index 17c3531..6251220 100644 (file)
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -59,12 +59,13 @@
                        <item text="Hide error windows">config.expert.hideerrors</item>
                        <item text="Auto show inforbar">config.expert.autoinfo</item>
                </setup>
-               <setup key="satconfig" title="Sat/Dish Setup">
-                       <item text="Tuner-A Control">config.sat.diseqcA</item>
-                       <item text="Tuner-A Position">config.sat.posA</item>
-                       <item text="Tuner-A Sat">config.sat.satA</item>
-                       <item text="Tuner-B Control">config.sat.diseqcB</item>
-                       <item text="Tuner-A Position">config.sat.posB</item>
-                       <item text="Tuner-B Sat">config.sat.satB</item>
+               <setup key="satconfig" title="Sat / Dish Setup">
+                       <item text="Tuner-Slot">config.sat.tunerslot</item>
+                       <item text="Configmode">config.sat.configmode</item>
+                       <item text="DiSEqC">config.sat.diseqc</item>
+                       <item text="Longitude">config.sat.diseqca</item>
+                       <item text="Latitude">config.sat.diseqcb</item>
+                       <item text="use power delta" >config.sat.diseqcc</item>
+                       <!--<item text="DiSEqC D">config.sat.diseqcd</item>-->
                </setup>
 </setupxml>
\ No newline at end of file

diff --git a/data/skin.xml b/data/skin.xml
index 80ca8da..6c7e218 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -30,10 +30,10 @@
                                <pixmap pos="bpBottomRight" filename="data/b_w_br.png" />
                        </borderset>
                </windowstyle> """ """
-               <screen name="Menu" position="210,150" size="300,220" title="real main menu">
+               <screen name="Menu" position="210,150" size="300,235" title="real main menu">
                        <widget name="title" position="10,10" size="280,35" font="Arial;23" />
                        <!--<widget name="menu" position="10,55" size="280,150" font="Arial;23" />-->
-                       <widget name="menu" position="10,55" size="280,150"/>
+                       <widget name="menu" position="10,55" size="280,175"/>
                </screen>
                <screen name="ScartLoopThrough" position="0,0" size="720,576">
                </screen>
@@ -48,13 +48,17 @@
                </screen>
                <screen name="Setup" position="140,125" size="460,280" title="Setup">
                        <widget name="title" position="10,10" size="280,35" font="Arial;23" />
-                       <widget name="config" position="10,50" size="420,150" />
-                       <widget name="ok" position="140,230" size="38,20" font="Arial;20" backgroundColor="green" />
-                       <widget name="cancel" position="240,230" size="70,20" font="Arial;20" backgroundColor="red" />
+                       <widget name="config" position="10,50" size="420,175" />
+                       <widget name="ok" position="140,240" size="38,20" font="Arial;20" backgroundColor="green" />
+                       <widget name="cancel" position="240,240" size="70,20" font="Arial;20" backgroundColor="red" />
                </screen>
                <screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
                        <widget name="config" position="10,50" size="420,150" />
                </screen>
+               <screen name="PluginBrowser" position="190,125" size="360,250" title="Plugins">
+                       <widget name="title" position="10,10" size="280,35" font="Arial;23" />
+                       <widget name="pluginlist" position="10,50" size="320,200" />
+               </screen>
                <screen name="About" position="140,125" size="360,250" title="About">
                        <widget name="text" position="10,30" size="420,40" font="Arial;18"/>
                        <widget name="tuner" position="10,80" size="420,20" font="Arial;18"/>