add satconfig

diff --git a/data/menu.xml b/data/menu.xml
index ec4c9f6..3064fdb 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -1,6 +1,7 @@
 <menu text="Mainmenu" title="Mainmenu">
                <!--<item text="Standby debug">quitMainloop()</item>
                <item text="Networksetup">self.openSetup("network")</item>-->
+               <item text="Satelliteconfig">self.openDialog(Satconfig)</item>
                <item text="Radio"></item>
                <item text="Timer">self.openDialog(TimerEditList)</item>
                <item text="Information">self.openDialog(About)</item>
@@ -12,7 +13,8 @@
                                <item text="Edit Bouquets"></item>
                        </menu>
                        <menu text="Service Searching">
-                               <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/skin.xml b/data/skin.xml
index ee764a3..ac2089d 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -32,7 +32,8 @@
                </windowstyle> """ """
                <screen name="Menu" position="210,150" size="300,220" 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" />
+                       <!--<widget name="menu" position="10,55" size="280,150" font="Arial;23" />-->
+                       <widget name="menu" position="10,55" size="280,150"/>
                </screen>
                <screen name="ScartLoopThrough" position="0,0" size="720,576">
                </screen>
@@ -51,6 +52,9 @@
                        <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" />
                </screen>
+               <screen name="Satconfig" position="140,125" size="460,280" title="Satconfig">
+                       <widget name="config" position="10,50" size="420,150" />
+               </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"/>

diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index e99782d..6ebec27 100644 (file)
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -3,4 +3,5 @@ installdir = $(LIBDIR)/enigma2/python/Screens
 install_DATA = \
        ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py    \
        MessageBox.py ScartLoopThrough.py Screen.py ServiceScan.py TimerEdit.py \
-       MovieSelection.py Setup.py About.py HarddiskSetup.py __init__.py
+       MovieSelection.py Setup.py About.py HarddiskSetup.py Satconfig.py \
+       __init__.py

diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py
index ac85ca4..4dc5faf 100644 (file)
--- a/lib/python/Screens/__init__.py
+++ b/lib/python/Screens/__init__.py
@@ -1,4 +1,4 @@
 __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu", 
        "InfoBar", "MessageBox", "Menu", "MovieSelection", 
        "ScartLoopThrough", "Screen", "ServiceScan", "About",
-       "TimerEdit", "Setup", "HarddiskSetup"]
+       "TimerEdit", "Setup", "HarddiskSetup", "Satconfig"]