add default services lists as a scan alternative

diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
new file mode 100644 (file)
index 0000000..2902d1d
--- /dev/null
+++ b/data/defaultsatlists.xml
@@ -0,0 +1,59 @@
+<wizard>
+       <step id="welcome" nextstep="nothingtoinstall">
+               <condition>
+packagelist = self.fillPackagesList()
+self.runWizard = (len(packagelist) > 0)
+self.condition = self.runWizard
+               </condition>
+               <text value="Please choose the default services lists you want to install." />
+               <!--list type="dynamic" source="listDefaults" evaluation="selectionMade" /-->
+               <config type="dynamic" source="getConfigList" evaluation="selectionMade" />
+               <code pos="after">
+self.disableKeys = True
+               </code>
+       </step>
+       <step id="nopackages" nextstep="install">
+               <text value="There are no default services lists in your image." />
+       </step>
+       
+       <step id="nothingtoinstall" nextstep="install">
+               <condition>
+if self.runWizard:
+       self.condition = True
+       for x in self.packagesConfig:
+               if x.value:
+                       self.condition = False
+                       break
+else:
+       self.condition = False
+               </condition>
+               <text value="You chose not to install any default services lists." />
+               <!--list type="dynamic" source="listDefaults" evaluation="selectionMade" /-->
+               <code>
+self.disableKeys = False
+               </code>
+               <code pos="after">
+self.markDone()
+               </code>
+       </step>
+       
+       <step id="install">
+               <condition>
+self.condition = False
+if self.runWizard:
+       for x in self.packagesConfig:
+               if x.value:
+                       self.condition = True
+                       break 
+               </condition>
+               <code>
+self.disableKeys = True                        
+               </code>
+               <code>
+#print "len of packageslist", len(self.packageslist)
+#if (len(self.packageslist) == 1):
+       #self.installPackage(0)
+               </code>
+               <text value="Installing default sat lists... Please wait..." />
+       </step>
+</wizard>

diff --git a/data/menu.xml b/data/menu.xml
index 43e2c3c..2ff3a23 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -38,6 +38,7 @@
                        <menu level="0" text="Service Searching" entryID="service_searching_selection">
                                <id val="scan" />
                                <item text="Tuner configuration" entryID="tuner_setup"><screen module="Satconfig" screen="NimSelection" /></item>
+                               <item text="Default services lists" entryID="default_lists"><screen module="ScanSetup" screen="DefaultSatLists" /></item>
                                <item text="Automatic Scan" entryID="auto_scan"><screen module="ScanSetup" screen="ScanSimple" /></item>
                                <!--<item text="Automatic Scan"><screen module="ServiceScan" /></item>-->
                                <item text="Manual Scan" entryID="manual_scan"><screen module="ScanSetup" /></item>

diff --git a/data/skin_default.xml b/data/skin_default.xml
index 054167a..679e2f9 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -184,6 +184,21 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
                        <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
                        <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
        </screen>
+       <screen name="DefaultSatLists" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
+                       <widget name="text" position="153,50" size="340,270" font="Regular;23" />
+                       <widget source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand" >
+                               <convert type="StringList" />
+                       </widget>
+                       <ePixmap pixmap="skin_default/buttons/button_red.png" position="40,225" size="15,16" alphatest="on" />
+                       <widget name="languagetext" position="55,225" size="95,30" font="Regular;18" />
+                       <widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" scrollbarMode="showOnDemand" />            
+                       <!--widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" /-->
+                       <widget name="wizard" pixmap="skin_default/wizard.png" position="40,50" zPosition="10" size="110,174" transparent="1" alphatest="on"/>
+                       <widget name="rc" pixmap="skin_default/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
+                       <widget name="arrowdown" pixmap="skin_default/arrowdown.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowup" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+                       <widget name="arrowup2" pixmap="skin_default/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
+       </screen>
        <screen name="DreamPackageWizard" position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
                        <widget name="text" position="153,50" size="340,270" font="Regular;23" />
                        <widget source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand" >

diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py
index be0f87e..d7e6f66 100644 (file)
--- a/lib/python/Screens/ScanSetup.py
+++ b/lib/python/Screens/ScanSetup.py
@@ -1,4 +1,5 @@
 from Screen import Screen
+from Screens.DefaultWizard import DefaultWizard
 from ServiceScan import ServiceScan
 from Components.config import config, ConfigSubsection, ConfigSelection, \
        ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigEnableDisable
@@ -6,6 +7,7 @@ from Components.ActionMap import NumberActionMap, ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.NimManager import nimmanager, getConfigSatlist
 from Components.Label import Label
+from Tools.Directories import resolveFilename, SCOPE_DEFAULTPARTITIONMOUNTDIR
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, \
        eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, \
@@ -277,6 +279,14 @@ class CableTransponderSearchSupport:
                tmpstr += "\n\n..."
                self.cable_search_session = self.session.openWithCallback(self.cableTransponderSearchSessionClosed, MessageBox, tmpstr, MessageBox.TYPE_INFO)
 
+class DefaultSatLists(DefaultWizard):
+       def __init__(self, session, silent = True, showSteps = False):
+               DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
+
+       def setDirectory(self):
+               self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
+               self.xmlfile = "defaultsatlists.xml"            
+
 class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
        def __init__(self, session):
                Screen.__init__(self, session)