wizard: remove default files, channels and stb presets
authorradxnl <radxnl@users.sourceforge.net>
Thu, 13 Sep 2012 20:57:07 +0000 (22:57 +0200)
committerradxnl <radxnl@users.sourceforge.net>
Thu, 13 Sep 2012 20:57:07 +0000 (22:57 +0200)
36 files changed:
configure.ac
data/Makefile.am
data/defaults/Dream/Makefile.am [deleted file]
data/defaults/Dream/bouquets.tv [deleted file]
data/defaults/Dream/dm500hd.info [deleted file]
data/defaults/Dream/dm7020hd.info [deleted file]
data/defaults/Dream/dm7025.info [deleted file]
data/defaults/Dream/dm800.info [deleted file]
data/defaults/Dream/dm8000.info [deleted file]
data/defaults/Dream/dm800se.info [deleted file]
data/defaults/Dream/hdbouquets/Makefile.am [deleted file]
data/defaults/Dream/hdbouquets/userbouquet.favourites.tv [deleted file]
data/defaults/Dream/sdbouquets/Makefile.am [deleted file]
data/defaults/Dream/sdbouquets/userbouquet.favourites.tv [deleted file]
data/defaults/Dream/settings.500hd [deleted file]
data/defaults/Dream/settings.7020hd [deleted file]
data/defaults/Dream/settings.7025 [deleted file]
data/defaults/Dream/settings.800 [deleted file]
data/defaults/Dream/settings.8000 [deleted file]
data/defaults/Dream/settings.800se [deleted file]
data/defaults/Dream/settings.c [deleted file]
data/defaults/Dream/settings.t [deleted file]
data/defaults/Makefile.am [deleted file]
data/defaultsatlists.xml [deleted file]
data/defaultwizard.xml [deleted file]
data/dreampackagewizard.xml [deleted file]
lib/python/Components/DreamInfoHandler.py [deleted file]
lib/python/Components/Makefile.am
lib/python/Plugins/SystemPlugins/SoftwareManager/SoftwareTools.py [changed mode: 0755->0644]
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Screens/DefaultWizard.py [deleted file]
lib/python/Screens/Makefile.am
lib/python/Screens/ScanSetup.py
lib/python/Screens/StartWizard.py
lib/python/Tools/Directories.py
mytest.py

index 79003ba..2141b5e 100644 (file)
@@ -155,10 +155,6 @@ Makefile
 data/Makefile
 data/fonts/Makefile
 data/countries/Makefile
-data/defaults/Makefile
-data/defaults/Dream/Makefile
-data/defaults/Dream/hdbouquets/Makefile
-data/defaults/Dream/sdbouquets/Makefile
 data/extensions/Makefile
 data/keymaps/Makefile
 data/rc_models/Makefile
index c9a7e6a..5aaa57b 100644 (file)
@@ -1,9 +1,6 @@
-SUBDIRS = countries fonts defaults extensions keymaps skin_default rc_models
+SUBDIRS = countries fonts extensions keymaps skin_default rc_models
 
 dist_pkgdata_DATA = \
-       defaultsatlists.xml \
-       defaultwizard.xml \
-       dreampackagewizard.xml \
        encoding.conf \
        keymap.xml \
        menu.xml \
diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
deleted file mode 100644 (file)
index ee66c93..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-SUBDIRS = hdbouquets sdbouquets
-
-installdir = $(pkgdatadir)/defaults/Dream
-
-dist_install_DATA = \
-       bouquets.tv \
-       dm800se.info \
-       dm500hd.info \
-       dm7020hd.info \
-       dm7025.info \
-       dm8000.info \
-       dm800.info \
-       settings.800se \
-       settings.500hd \
-       settings.7020hd \
-       settings.7025 \
-       settings.800 \
-       settings.8000 \
-       settings.c \
-       settings.t
diff --git a/data/defaults/Dream/bouquets.tv b/data/defaults/Dream/bouquets.tv
deleted file mode 100644 (file)
index fdce755..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#NAME Bouquets (TV)
-#SERVICE: 1:7:1:0:0:0:0:0:0:0:userbouquet.favourites.tv
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
deleted file mode 100644 (file)
index 29d14b6..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm500hd" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="directories">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.500hd" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info
deleted file mode 100644 (file)
index e0a1fbb..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm7020hd" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="directories">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.7020hd" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info
deleted file mode 100644 (file)
index 0211199..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm7025" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="local">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.7025" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info
deleted file mode 100644 (file)
index 39b0cb0..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm800" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="directories">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.800" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info
deleted file mode 100644 (file)
index f052226..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm8000" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="directories">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.8000" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info
deleted file mode 100644 (file)
index 1685ede..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<default>
-       <prerequisites>
-               <!-- hardware can occur more than once -->
-               <hardware type="dm800se" />
-       </prerequisites>
-       
-       <info>
-               <author>Dream Multimedia GmbH</author>
-               <name>Dream Multimedia Default</name>
-       </info>
-
-               <!-- available types: "directories" -->
-       <files type="directories">
-               <!--file type="skin" directory="test_skin/" flag="default" name="Default Skin" /-->
-               <file type="config" name="settings.800se" />
-               <!--file type="services" name="lamedb.192">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <satellite type="192" />
-                       </prerequisites>
-               </file-->
-               <file type="favourites" directory="" name="bouquets.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
-                       <prerequisites>
-                               <bcastsystem type="DVB-S" />
-                               <!--satellite type="192" /-->
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.c">
-                       <prerequisites>
-                               <bcastsystem type="DVB-C" />
-                       </prerequisites>
-               </file>
-               <file type="config" name="settings.t">
-                       <prerequisites>
-                               <bcastsystem type="DVB-T" />
-                       </prerequisites>
-               </file>
-               <!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
-       </files>
-</default>
diff --git a/data/defaults/Dream/hdbouquets/Makefile.am b/data/defaults/Dream/hdbouquets/Makefile.am
deleted file mode 100644 (file)
index 843a07d..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-installdir = $(pkgdatadir)/defaults/Dream/hdbouquets
-
-dist_install_DATA = \
-       userbouquet.favourites.tv
diff --git a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
deleted file mode 100644 (file)
index b6bc62f..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#NAME Favourites (TV)\r
-#SERVICE 1:0:19:2B5C:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:2B66:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCC:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2EE3:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445C:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2EF4:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445D:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445E:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:33:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:701:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:308:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2FC:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:F98:454:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:2B70:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D67:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7031:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7032:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7033:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E46:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCE:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DD1:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCF:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E42:431:1:C00000:0:0:0:\r
-#SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen\r
-#DESCRIPTION Doku/Wissen/Themen\r
-#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2775:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:293:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D70:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:49:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:332D:45B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3139:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0:\r
-#SERVICE 1:64:A:0:0:0:0:0:0:0::Sport\r
-#DESCRIPTION Sport\r
-#SERVICE 1:0:1:384:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:79E0:443:1:C00000:0:0:0:\r
-#SERVICE 1:64:1:0:0:0:0:0:0:0::Kinder\r
-#DESCRIPTION Kinder\r
-#SERVICE 1:0:1:2F08:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D68:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7008:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6FE0:443:1:C00000:0:0:0:\r
-#SERVICE 1:64:2:0:0:0:0:0:0:0::Nachrichten\r
-#DESCRIPTION Nachrichten\r
-#SERVICE 1:0:1:2F3A:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445F:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:79F4:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2753:402:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7035:41B:1:C00000:0:0:0:\r
-#SERVICE 1:64:3:0:0:0:0:0:0:0::Regional\r
-#DESCRIPTION Regional\r
-#SERVICE 1:0:1:3146:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:300:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2778:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:277A:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2779:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2777:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:32D6:45D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:277D:444:1:C00000:0:0:0:\r
-#SERVICE 1:64:4:0:0:0:0:0:0:0::Musik\r
-#DESCRIPTION Musik\r
-#SERVICE 1:0:1:2774:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7004:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7001:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6FE1:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2FD:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:32D5:45D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:332E:45B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:304:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:702:5:85:C00000:0:0:0:\r
-#SERVICE 1:64:5:0:0:0:0:0:0:0::Reisen\r
-#DESCRIPTION Reisen\r
-#SERVICE 1:0:1:20:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:9:0:0:0:0:0:0:0::Beratung\r
-#DESCRIPTION Beratung\r
-#SERVICE 1:0:1:295:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:6:0:0:0:0:0:0:0::Einkaufen\r
-#DESCRIPTION Einkaufen\r
-#SERVICE 1:0:1:301:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:28:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:79EA:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F44:454:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3148:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:36:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:307:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:296:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:383:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:313C:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3159:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2E:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:381:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:7:0:0:0:0:0:0:0::High Definition\r
-#DESCRIPTION High Definition\r
-#SERVICE 1:0:19:6EEC:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:EF12:421:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:EF13:421:1:C00000:0:0:0:\r
-#SERVICE 1:64:0:0:0:0:0:0:0:0::Alternativen\r
-#DESCRIPTION Alternativen\r
-#SERVICE 1:0:1:6DCB:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E44:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E45:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E41:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E40:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E43:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6EE1:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E2D:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E2E:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F46:445:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E47:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F76:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E92:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E93:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F78:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F79:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E94:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F77:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6EEB:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E97:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E96:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E95:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:64:8:0:0:0:0:0:0:0::Alternative SD services\r
-#DESCRIPTION Alternative SD services\r
-#SERVICE 1:0:1:6DCA:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D66:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7034:41B:1:C00000:0:0:0:\r
diff --git a/data/defaults/Dream/sdbouquets/Makefile.am b/data/defaults/Dream/sdbouquets/Makefile.am
deleted file mode 100644 (file)
index 50328e5..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-installdir = $(pkgdatadir)/defaults/Dream/sdbouquets
-
-dist_install_DATA = \
-       userbouquet.favourites.tv
diff --git a/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
deleted file mode 100644 (file)
index 1cea366..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-#NAME Favourites (TV)\r
-#SERVICE 1:0:1:6DCA:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D66:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCC:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2EE3:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445C:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2EF4:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445D:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445E:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:33:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:701:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:308:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2FC:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:F98:454:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7034:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D67:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7031:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7032:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7033:41B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E46:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCE:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DD1:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6DCF:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E42:431:1:C00000:0:0:0:\r
-#SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen\r
-#DESCRIPTION Doku/Wissen/Themen\r
-#SERVICE 1:0:1:6F47:445:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2775:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:293:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D70:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:49:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:332D:45B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3139:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0:\r
-#SERVICE 1:64:A:0:0:0:0:0:0:0::Sport\r
-#DESCRIPTION Sport\r
-#SERVICE 1:0:1:384:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:79E0:443:1:C00000:0:0:0:\r
-#SERVICE 1:64:1:0:0:0:0:0:0:0::Kinder\r
-#DESCRIPTION Kinder\r
-#SERVICE 1:0:1:2F08:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6D68:437:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7008:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6FE0:443:1:C00000:0:0:0:\r
-#SERVICE 1:64:2:0:0:0:0:0:0:0::Nachrichten\r
-#DESCRIPTION Nachrichten\r
-#SERVICE 1:0:1:2F3A:441:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:445F:453:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:79F4:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2753:402:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7035:41B:1:C00000:0:0:0:\r
-#SERVICE 1:64:3:0:0:0:0:0:0:0::Regional\r
-#DESCRIPTION Regional\r
-#SERVICE 1:0:1:3146:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:300:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:2778:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:277A:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2779:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2777:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:32D6:45D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:277D:444:1:C00000:0:0:0:\r
-#SERVICE 1:64:4:0:0:0:0:0:0:0::Musik\r
-#DESCRIPTION Musik\r
-#SERVICE 1:0:1:2774:444:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7004:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:7001:436:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6FE1:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2FD:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:32D5:45D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:332E:45B:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:304:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:702:5:85:C00000:0:0:0:\r
-#SERVICE 1:64:5:0:0:0:0:0:0:0::Reisen\r
-#DESCRIPTION Reisen\r
-#SERVICE 1:0:1:20:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:9:0:0:0:0:0:0:0::Beratung\r
-#DESCRIPTION Beratung\r
-#SERVICE 1:0:1:295:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:6:0:0:0:0:0:0:0::Einkaufen\r
-#DESCRIPTION Einkaufen\r
-#SERVICE 1:0:1:301:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:28:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:79EA:443:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2F44:454:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3148:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:36:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:307:7:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:296:5:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:383:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:313C:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:3159:459:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:2E:21:85:C00000:0:0:0:\r
-#SERVICE 1:0:1:381:21:85:C00000:0:0:0:\r
-#SERVICE 1:64:7:0:0:0:0:0:0:0::High Definition\r
-#DESCRIPTION High Definition\r
-#SERVICE 1:0:19:2B5C:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:2B66:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:2B70:3F3:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:6EEC:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:EF12:421:1:C00000:0:0:0:\r
-#SERVICE 1:0:19:EF13:421:1:C00000:0:0:0:\r
-#SERVICE 1:64:0:0:0:0:0:0:0:0::Alternativen\r
-#DESCRIPTION Alternativen\r
-#SERVICE 1:0:1:6DCB:44D:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E44:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E45:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E41:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E40:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E43:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6EE1:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E2D:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E2E:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F46:445:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E47:431:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F76:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E92:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E93:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F78:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F79:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E94:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6F77:457:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6EEB:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E97:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E96:4B1:1:C00000:0:0:0:\r
-#SERVICE 1:0:1:6E95:4B1:1:C00000:0:0:0:\r
diff --git a/data/defaults/Dream/settings.500hd b/data/defaults/Dream/settings.500hd
deleted file mode 100644 (file)
index ae2963b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=1
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.7020hd b/data/defaults/Dream/settings.7020hd
deleted file mode 100644 (file)
index ae2963b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=1
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.7025 b/data/defaults/Dream/settings.7025
deleted file mode 100644 (file)
index ae2963b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=1
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.800 b/data/defaults/Dream/settings.800
deleted file mode 100644 (file)
index ae2963b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=1
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.8000 b/data/defaults/Dream/settings.8000
deleted file mode 100644 (file)
index 1fe4a4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=0
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.800se b/data/defaults/Dream/settings.800se
deleted file mode 100644 (file)
index ae2963b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.misc.rcused=1
\ No newline at end of file
diff --git a/data/defaults/Dream/settings.c b/data/defaults/Dream/settings.c
deleted file mode 100644 (file)
index 72ab938..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaults/Dream/settings.t b/data/defaults/Dream/settings.t
deleted file mode 100644 (file)
index 72ab938..0000000
+++ /dev/null
@@ -1 +0,0 @@
-config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaults/Makefile.am b/data/defaults/Makefile.am
deleted file mode 100644 (file)
index a02b015..0000000
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = Dream
diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
deleted file mode 100644 (file)
index ff0ae8b..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<wizard>
-       <step id="startdefaultlists" 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="finisheddefaultsatlists"-->
-       <step id="nopackages" nextstep="scanquestion">
-               <text value="There are no default services lists in your image." />
-       </step>
-       
-       <!--step id="nothingtoinstall" nextstep="finisheddefaultsatlists"-->
-       <step id="nothingtoinstall" nextstep="scanquestion">
-               <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>
-       </step>
-       
-       <step id="install" nextstep="finisheddefaultsatlists">
-               <condition>
-self.condition = False
-if self.runWizard:
-       for x in self.packagesConfig:
-               if x.value:
-                       self.condition = True
-                       break 
-               </condition>
-               <code>
-self.disableKeys = True                        
-self.installPackages(self.indexList)
-               </code>
-               <text value="Installing default sat lists... Please wait..." />
-       </step>
-       
-       <step id="finisheddefaultsatlists">
-               <condition>
-self.markDone()
-self.condition = False
-               </condition>
-       </step>
-</wizard>
diff --git a/data/defaultwizard.xml b/data/defaultwizard.xml
deleted file mode 100644 (file)
index 92231ff..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-<wizard>
-       <step id="welcome" nextstep="nothingtoinstall">
-               <condition>
-packagelist = self.fillPackagesList()
-self.runWizard = (len(packagelist) > 0)
-self.condition = self.runWizard
-               </condition>
-               <text value="You can choose some default settings now. Please select the settings you want to be installed." />
-               <!--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">
-               <condition>
-self.condition = self.runWizard or not self.silent
-               </condition>
-               <text value="There are no default settings 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 settings. You can however install the default settings later in the settings menu." />
-               <!--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                
-self.installPackages(self.indexList)
-               </code>
-               <code>
-#print "len of packageslist", len(self.packageslist)
-#if (len(self.packageslist) == 1):
-       #self.installPackage(0)
-               </code>
-               <text value="Installing defaults... Please wait..." />
-       </step>
-</wizard>
diff --git a/data/dreampackagewizard.xml b/data/dreampackagewizard.xml
deleted file mode 100644 (file)
index d3a25e7..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<wizard>
-       <step id="welcome" nextstep="nothingtoinstall">
-               <condition>
-packagelist = self.fillPackagesList()
-self.runWizard = (len(packagelist) > 0)
-self.condition = self.runWizard
-               </condition>
-               <text value="You can choose, what 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">
-               <condition>
-self.condition = self.runWizard or not self.silent
-               </condition>
-               <text value="The package doesn't contain anything." />
-       </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 anything. Please press OK finish the install wizard." />
-               <!--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 package content... Please wait..." />
-       </step>
-</wizard>
\ No newline at end of file
diff --git a/lib/python/Components/DreamInfoHandler.py b/lib/python/Components/DreamInfoHandler.py
deleted file mode 100644 (file)
index 2b1f0a3..0000000
+++ /dev/null
@@ -1,448 +0,0 @@
-# -*- coding: iso-8859-1 -*-
-import xml.sax
-from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_CONFIG, SCOPE_SKIN, SCOPE_METADIR, copyfile, copytree
-from Components.NimManager import nimmanager
-from Components.Ipkg import IpkgComponent
-from Components.config import config, configfile
-from Tools.HardwareInfo import HardwareInfo
-from enigma import eConsoleAppContainer, eDVBDB
-import os
-from re import compile as re_compile, search as re_search, IGNORECASE
-
-class InfoHandlerParseError(Exception):
-       def __init__(self, value):
-               self.value = value
-       def __str__(self):
-               return repr(self.value)
-
-class InfoHandler(xml.sax.ContentHandler):
-       def __init__(self, prerequisiteMet, directory):
-               self.attributes = {}
-               self.directory = directory
-               self.list = []
-               self.globalprerequisites = {}
-               self.prerequisites = {}
-               self.elements = []
-               self.validFileTypes = ["skin", "config", "services", "favourites", "package"]
-               self.prerequisitesMet = prerequisiteMet
-               self.data = ""
-
-       def printError(self, error):
-               print "Error in defaults xml files:", error
-               raise InfoHandlerParseError, error
-
-       def startElement(self, name, attrs):
-               #print name, ":", attrs.items()
-               self.elements.append(name)
-
-               if name in ("hardware", "bcastsystem", "satellite", "tag", "flag"):
-                       if not attrs.has_key("type"):
-                                       self.printError(str(name) + " tag with no type attribute")
-                       if self.elements[-3] in ("default", "package"):
-                               prerequisites = self.globalprerequisites
-                       else:
-                               prerequisites = self.prerequisites
-                       if not prerequisites.has_key(name):
-                               prerequisites[name] = []
-                       prerequisites[name].append(str(attrs["type"]))
-
-               if name == "info":
-                       self.foundTranslation = None
-                       self.data = ""
-
-               if name == "files":
-                       if attrs.has_key("type"):
-                               if attrs["type"] == "directories":
-                                       self.attributes["filestype"] = "directories"
-                               elif attrs["type"] == "package":
-                                       self.attributes["filestype"] = "package"
-                               # TODO add a compressed archive type
-
-               if name == "file":
-                       self.prerequisites = {}
-                       if not attrs.has_key("type"):
-                               self.printError("file tag with no type attribute")
-                       else:
-                               if not attrs.has_key("name"):
-                                       self.printError("file tag with no name attribute")
-                               else:   
-                                       if not attrs.has_key("directory"):
-                                               directory = self.directory
-                                       type = attrs["type"]
-                                       if not type in self.validFileTypes:
-                                               self.printError("file tag with invalid type attribute")
-                                       else:
-                                               self.filetype = type
-                                               self.fileattrs = attrs
-
-               if name == "package":
-                       if attrs.has_key("details"):
-                               self.attributes["details"] = str(attrs["details"])
-                       if attrs.has_key("name"):
-                               self.attributes["name"] = str(attrs["name"])
-                       if attrs.has_key("packagename"):
-                               self.attributes["packagename"] = str(attrs["packagename"])
-                       if attrs.has_key("packagetype"):
-                               self.attributes["packagetype"] = str(attrs["packagetype"])
-                       if attrs.has_key("needsRestart"):
-                               self.attributes["needsRestart"] = str(attrs["needsRestart"])
-                       if attrs.has_key("shortdescription"):
-                               self.attributes["shortdescription"] = str(attrs["shortdescription"])
-
-               if name == "screenshot":
-                       if attrs.has_key("src"):
-                               self.attributes["screenshot"] = str(attrs["src"])
-
-       def endElement(self, name):
-               #print "endElement", name
-               #print "self.elements:", self.elements
-               self.elements.pop()
-               if name == "file":
-                       #print "prerequisites:", self.prerequisites
-                       if len(self.prerequisites) == 0 or self.prerequisitesMet(self.prerequisites):
-                               if not self.attributes.has_key(self.filetype):
-                                       self.attributes[self.filetype] = []
-                               if self.fileattrs.has_key("directory"):
-                                       directory = str(self.fileattrs["directory"])
-                                       if len(directory) < 1 or directory[0] != "/":
-                                               directory = self.directory + directory
-                               else:
-                                       directory = self.directory
-                               self.attributes[self.filetype].append({ "name": str(self.fileattrs["name"]), "directory": directory })
-
-               if name in ( "default", "package" ):
-                       self.list.append({"attributes": self.attributes, 'prerequisites': self.globalprerequisites})
-                       self.attributes = {}
-                       self.globalprerequisites = {}
-
-       def characters(self, data):
-               if self.elements[-1] == "author":
-                       self.attributes["author"] = str(data)
-               if self.elements[-1] == "name":
-                       self.attributes["name"] = str(data)
-               if self.elements[-1] == "packagename":
-                       self.attributes["packagename"] = str(data)
-               if self.elements[-1] == "needsRestart":
-                       self.attributes["needsRestart"] = str(data)
-               if self.elements[-1] == "shortdescription":
-                       self.attributes["shortdescription"] = str(data)
-               if self.elements[-1] == "description":
-                       self.data += data.strip()
-                       self.attributes["description"] = str(self.data)
-               #print "characters", data
-
-
-class DreamInfoHandler:
-       STATUS_WORKING = 0
-       STATUS_DONE = 1
-       STATUS_ERROR = 2
-       STATUS_INIT = 4
-
-       def __init__(self, statusCallback, blocking = False, neededTag = None, neededFlag = None):
-               self.hardware_info = HardwareInfo()
-               self.directory = "/"
-
-               self.neededTag = neededTag
-               self.neededFlag = neededFlag
-
-               # caution: blocking should only be used, if further execution in enigma2 depends on the outcome of
-               # the installer!
-               self.blocking = blocking
-
-               self.currentlyInstallingMetaIndex = None
-
-               self.console = eConsoleAppContainer()
-               self.console.appClosed.append(self.installNext)
-               self.reloadFavourites = False
-
-               self.statusCallback = statusCallback
-               self.setStatus(self.STATUS_INIT)
-
-               self.packageslist = []
-               self.packagesIndexlist = []
-               self.packageDetails = []
-
-       def readInfo(self, directory, file):
-               print "Reading .info file", file
-               handler = InfoHandler(self.prerequisiteMet, directory)
-               try:
-                       xml.sax.parse(file, handler)
-                       for entry in handler.list:
-                               self.packageslist.append((entry,file)) 
-               except InfoHandlerParseError:
-                       print "file", file, "ignored due to errors in the file"
-               #print handler.list
-
-       def readIndex(self, directory, file):
-               print "Reading .xml meta index file", directory, file
-               handler = InfoHandler(self.prerequisiteMet, directory)
-               try:
-                       xml.sax.parse(file, handler)
-                       for entry in handler.list:
-                               self.packagesIndexlist.append((entry,file))
-               except InfoHandlerParseError:
-                       print "file", file, "ignored due to errors in the file"
-               #print handler.list
-
-       def readDetails(self, directory, file):
-               self.packageDetails = []
-               print "Reading .xml meta details file", file
-               handler = InfoHandler(self.prerequisiteMet, directory)
-               try:
-                       xml.sax.parse(file, handler)
-                       for entry in handler.list:
-                               self.packageDetails.append((entry,file))
-               except InfoHandlerParseError:
-                       print "file", file, "ignored due to errors in the file"
-               #print handler.list
-
-       # prerequisites = True: give only packages matching the prerequisites
-       def fillPackagesList(self, prerequisites = True):
-               self.packageslist = []
-               packages = []
-               if not isinstance(self.directory, list):
-                       self.directory = [self.directory]
-
-               for directory in self.directory:
-                       packages += crawlDirectory(directory, ".*\.info$")
-
-               for package in packages:
-                       self.readInfo(package[0] + "/", package[0] + "/" + package[1])
-
-               if prerequisites:
-                       for package in self.packageslist[:]:
-                               if not self.prerequisiteMet(package[0]["prerequisites"]):
-                                       self.packageslist.remove(package)
-               return self.packageslist
-
-       # prerequisites = True: give only packages matching the prerequisites
-       def fillPackagesIndexList(self, prerequisites = True):
-               self.packagesIndexlist = []
-               indexfileList = []
-
-               if not isinstance(self.directory, list):
-                       self.directory = [self.directory]
-
-               for indexfile in os.listdir(self.directory[0]):
-                       if indexfile.startswith("index-"):
-                               if indexfile.endswith(".xml"):
-                                       if indexfile[-7:-6] == "_":
-                                               continue
-                                       indexfileList.append(indexfile)
-               if len(indexfileList):
-                       for file in indexfileList:
-                               neededFile = self.directory[0] + "/" + file
-                               if os.path.isfile(neededFile):
-                                       self.readIndex(self.directory[0] + "/" , neededFile)
-
-               if prerequisites:
-                       for package in self.packagesIndexlist[:]:
-                               if not self.prerequisiteMet(package[0]["prerequisites"]):
-                                       self.packagesIndexlist.remove(package)
-               return self.packagesIndexlist
-
-       # prerequisites = True: give only packages matching the prerequisites
-       def fillPackageDetails(self, details = None):
-               self.packageDetails = []
-               detailsfile = details
-               if not isinstance(self.directory, list):
-                       self.directory = [self.directory]
-               self.readDetails(self.directory[0] + "/", self.directory[0] + "/" + detailsfile)
-               return self.packageDetails
-                       
-       def prerequisiteMet(self, prerequisites):
-               # TODO: we need to implement a hardware detection here...
-               print "prerequisites:", prerequisites
-               met = True
-               if self.neededTag is None:
-                       if prerequisites.has_key("tag"):
-                               return False
-               elif self.neededTag == 'ALL_TAGS':
-                               return True
-               else:
-                       if prerequisites.has_key("tag"):
-                               if not self.neededTag in prerequisites["tag"]:
-                                       return False
-                       else:
-                               return False
-
-               if self.neededFlag is None:
-                       if prerequisites.has_key("flag"):
-                               return False
-               else:
-                       if prerequisites.has_key("flag"):
-                               if not self.neededFlag in prerequisites["flag"]:
-                                       return False
-                       else:
-                               return True # No flag found, assuming all flags valid
-                               
-               if prerequisites.has_key("satellite"):
-                       for sat in prerequisites["satellite"]:
-                               if int(sat) not in nimmanager.getConfiguredSats():
-                                       return False                    
-               if prerequisites.has_key("bcastsystem"):
-                       has_system = False
-                       for bcastsystem in prerequisites["bcastsystem"]:
-                               if nimmanager.hasNimType(bcastsystem):
-                                       has_system = True
-                       if not has_system:
-                               return False
-               if prerequisites.has_key("hardware"):
-                       hardware_found = False
-                       for hardware in prerequisites["hardware"]:
-                               if hardware == self.hardware_info.device_name:
-                                       hardware_found = True
-                       if not hardware_found:
-                               return False
-               return True
-       
-       def installPackages(self, indexes):
-               print "installing packages", indexes
-               if len(indexes) == 0:
-                       self.setStatus(self.STATUS_DONE)
-                       return
-               self.installIndexes = indexes
-               print "+++++++++++++++++++++++bla"
-               self.currentlyInstallingMetaIndex = 0
-               self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
-
-       def installPackage(self, index):
-               print "self.packageslist:", self.packageslist
-               if len(self.packageslist) <= index:
-                       print "no package with index", index, "found... installing nothing"
-                       return
-               print "installing package with index", index, "and name", self.packageslist[index][0]["attributes"]["name"]
-               
-               attributes = self.packageslist[index][0]["attributes"]
-               self.installingAttributes = attributes
-               self.attributeNames = ["skin", "config", "favourites", "package", "services"]
-               self.currentAttributeIndex = 0
-               self.currentIndex = -1
-               self.installNext()
-               
-       def setStatus(self, status):
-               self.status = status
-               self.statusCallback(self.status, None)
-                                               
-       def installNext(self, *args, **kwargs):
-               if self.reloadFavourites:
-                       self.reloadFavourites = False
-                       db = eDVBDB.getInstance().reloadBouquets()
-
-               self.currentIndex += 1
-               attributes = self.installingAttributes
-               #print "attributes:", attributes
-               
-               if self.currentAttributeIndex >= len(self.attributeNames): # end of package reached
-                       print "end of package reached"
-                       if self.currentlyInstallingMetaIndex is None or self.currentlyInstallingMetaIndex >= len(self.installIndexes) - 1:
-                               print "set status to DONE"
-                               self.setStatus(self.STATUS_DONE)
-                               return
-                       else:
-                               print "increment meta index to install next package"
-                               self.currentlyInstallingMetaIndex += 1
-                               self.currentAttributeIndex = 0
-                               self.installPackage(self.installIndexes[self.currentlyInstallingMetaIndex])
-                               return
-               
-               self.setStatus(self.STATUS_WORKING)             
-               
-               print "currentAttributeIndex:", self.currentAttributeIndex
-               currentAttribute = self.attributeNames[self.currentAttributeIndex]
-               
-               print "installing", currentAttribute, "with index", self.currentIndex
-               
-               if attributes.has_key(currentAttribute):
-                       if self.currentIndex >= len(attributes[currentAttribute]): # all jobs done for current attribute
-                               self.currentIndex = -1
-                               self.currentAttributeIndex += 1
-                               self.installNext()
-                               return
-               else: # nothing to install here
-                       self.currentIndex = -1
-                       self.currentAttributeIndex += 1
-                       self.installNext()
-                       return
-                       
-               if currentAttribute == "skin":
-                       skin = attributes["skin"][self.currentIndex]
-                       self.installSkin(skin["directory"], skin["name"])
-               elif currentAttribute == "config":
-                       if self.currentIndex == 0:
-                               from Components.config import configfile
-                               configfile.save()
-                       config = attributes["config"][self.currentIndex]
-                       self.mergeConfig(config["directory"], config["name"])
-               elif currentAttribute == "favourites":
-                       favourite = attributes["favourites"][self.currentIndex]
-                       self.installFavourites(favourite["directory"], favourite["name"])
-               elif currentAttribute == "package":
-                       package = attributes["package"][self.currentIndex]
-                       self.installIPK(package["directory"], package["name"])
-               elif currentAttribute == "services":
-                       service = attributes["services"][self.currentIndex]
-                       self.mergeServices(service["directory"], service["name"])
-                               
-       def readfile(self, filename):
-               if not os.path.isfile(filename):
-                       return []
-               fd = open(filename)
-               lines = fd.readlines()
-               fd.close()
-               return lines
-                       
-       def mergeConfig(self, directory, name, merge = True):
-               print "merging config:", directory, " - ", name
-               if os.path.isfile(directory + name):
-                       config.loadFromFile(directory + name, base_file=False)
-                       configfile.save()
-               self.installNext()
-               
-       def installIPK(self, directory, name):
-               if self.blocking:
-                       os.system("opkg install " + directory + name)
-                       self.installNext()
-               else:
-                       self.ipkg = IpkgComponent()
-                       self.ipkg.addCallback(self.ipkgCallback)
-                       self.ipkg.startCmd(IpkgComponent.CMD_INSTALL, {'package': directory + name})
-               
-       def ipkgCallback(self, event, param):
-               print "ipkgCallback"
-               if event == IpkgComponent.EVENT_DONE:
-                       self.installNext()
-               elif event == IpkgComponent.EVENT_ERROR:
-                       self.installNext()
-       
-       def installSkin(self, directory, name):
-               print "installing skin:", directory, " - ", name
-               print "cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))
-               if self.blocking:
-                       copytree(directory, resolveFilename(SCOPE_SKIN))
-                       self.installNext()
-               else:
-                       if self.console.execute("cp -a %s %s" % (directory, resolveFilename(SCOPE_SKIN))):
-                               print "execute failed"
-                               self.installNext()
-
-       def mergeServices(self, directory, name, merge = False):
-               print "merging services:", directory, " - ", name
-               if os.path.isfile(directory + name):
-                       db = eDVBDB.getInstance()
-                       db.reloadServicelist()
-                       db.loadServicelist(directory + name)
-                       db.saveServicelist()
-               self.installNext()
-
-       def installFavourites(self, directory, name):
-               print "installing favourites:", directory, " - ", name
-               self.reloadFavourites = True
-
-               if self.blocking:
-                       copyfile(directory + name, resolveFilename(SCOPE_CONFIG))
-                       self.installNext()
-               else:
-                       if self.console.execute("cp %s %s" % ((directory + name), resolveFilename(SCOPE_CONFIG))):
-                               print "execute failed"
-                               self.installNext()
index dba088b..c3a43e9 100644 (file)
@@ -17,6 +17,6 @@ install_PYTHON = \
        FIFOList.py ServiceEventTracker.py Input.py TimerSanityCheck.py FileList.py \
        MultiContent.py MediaPlayer.py TunerInfo.py VideoWindow.py ChoiceList.py \
        Element.py Playlist.py ParentalControl.py ParentalControlList.py \
-       Ipkg.py SelectionList.py Scanner.py SystemInfo.py DreamInfoHandler.py \
+       Ipkg.py SelectionList.py Scanner.py SystemInfo.py \
        Task.py language_cache.py Console.py ResourceManager.py TuneTest.py \
        Keyboard.py Sensors.py FanControl.py HdmiCec.py RcModel.py
old mode 100755 (executable)
new mode 100644 (file)
index 291c669..bbf810b
@@ -2,7 +2,6 @@
 from enigma import eConsoleAppContainer
 from Components.Console import Console
 from Components.About import about
-from Components.DreamInfoHandler import DreamInfoHandler
 from Components.Language import language
 from Components.Sources.List import List
 from Components.Ipkg import IpkgComponent
@@ -12,7 +11,7 @@ from Tools.HardwareInfo import HardwareInfo
 from time import time
 
 
-class SoftwareTools(DreamInfoHandler):
+class SoftwareTools():
        lastDownloadDate = None
        NetworkConnectionAvailable = None
        list_updating = False
@@ -21,7 +20,7 @@ class SoftwareTools(DreamInfoHandler):
        available_packetlist  = []
        installed_packetlist = {}
 
-       
+
        def __init__(self):
                aboutInfo = about.getImageVersionString()
                if aboutInfo.startswith("dev-"):
@@ -29,7 +28,6 @@ class SoftwareTools(DreamInfoHandler):
                else:
                        self.ImageVersion = 'Stable'
                self.language = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
-               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False, neededTag = 'ALL_TAGS', neededFlag = self.ImageVersion)
                self.directory = resolveFilename(SCOPE_METADIR)
                self.hardware_info = HardwareInfo()
                self.list = List([])
@@ -39,16 +37,13 @@ class SoftwareTools(DreamInfoHandler):
                self.cmdList = []
                self.unwanted_extensions = ('-dbg', '-dev', '-doc', '-staticdev')
                self.ipkg = IpkgComponent()
-               self.ipkg.addCallback(self.ipkgCallback)                
-
-       def statusCallback(self, status, progress):
-               pass            
+               self.ipkg.addCallback(self.ipkgCallback)
 
        def startSoftwareTools(self, callback = None):
                if callback is not None:
                        self.NotifierCallback = callback
                iNetwork.checkNetworkState(self.checkNetworkCB)
-               
+
        def checkNetworkCB(self,data):
                if data is not None:
                        if data <= 2:
@@ -93,7 +88,7 @@ class SoftwareTools(DreamInfoHandler):
                                if self.list_updating and callback is not None:
                                                self.NotifierCallback = callback
                                                self.startIpkgListAvailable()
-                               else:   
+                               else:
                                        self.list_updating = False
                                        if callback is not None:
                                                callback(False)
@@ -108,7 +103,6 @@ class SoftwareTools(DreamInfoHandler):
                elif event == IpkgComponent.EVENT_DONE:
                        if self.list_updating:
                                self.startIpkgListAvailable()
-               #print event, "-", param                
                pass
 
        def startIpkgListAvailable(self, callback = None):
index 1265992..0869cee 100644 (file)
@@ -3,7 +3,7 @@ from Screens.Console import Console
 from Screens.ChoiceBox import ChoiceBox
 from Screens.MessageBox import MessageBox
 from Screens.Screen import Screen
-from Screens.Standby import TryQuitMainloop 
+from Screens.Standby import TryQuitMainloop
 from Screens.Ipkg import Ipkg
 from Screens.SoftwareUpdate import UpdatePlugin
 from Components.ActionMap import ActionMap, NumberActionMap
@@ -23,7 +23,6 @@ from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixm
 from Components.SelectionList import SelectionList
 from Components.PluginComponent import plugins
 from Components.About import about
-from Components.DreamInfoHandler import DreamInfoHandler
 from Components.Language import language
 from Components.AVSwitch import AVSwitch
 from Components.Task import job_manager
@@ -51,7 +50,7 @@ config.plugins.softwaremanager = ConfigSubsection()
 config.plugins.softwaremanager.overwriteConfigFiles = ConfigSelection(
                                [
                                 ("Y", _("Yes, always")),
-                                ("N", _("No, never")),                          
+                                ("N", _("No, never")),
                                 ("ask", _("Always ask"))
                                ], "Y")
 config.plugins.softwaremanager.onSetupMenu = ConfigYesNo(default=False)
@@ -116,7 +115,7 @@ class UpdatePluginMenu(Screen):
                        </widget>
                        <widget source="status" render="Label" position="5,360" zPosition="10" size="600,50" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
                </screen>"""
-               
+
        def __init__(self, session, args = 0):
                Screen.__init__(self, session)
                self.skin_path = plugin_path
@@ -239,7 +238,7 @@ class UpdatePluginMenu(Screen):
 
        def handleMenu(self):
                self.session.open(SoftwareManagerSetup)
-               
+
        def handleInfo(self):
                current = self["menu"].getCurrent()
                if current:
@@ -306,7 +305,7 @@ class UpdatePluginMenu(Screen):
                config.plugins.configurationbackup.backupdirs.save()
                config.plugins.configurationbackup.save()
                config.save()
-               
+
        def backuplocation_choosen(self, option):
                oldpath = config.plugins.configurationbackup.backuplocation.getValue()
                if option is not None:
@@ -391,7 +390,7 @@ class SoftwareManagerSetup(Screen, ConfigListScreen):
        def createSetup(self):
                self.list = [ ]
                self.overwriteConfigfilesEntry = getConfigListEntry(_("Overwrite configuration files ?"), config.plugins.softwaremanager.overwriteConfigFiles)
-               self.list.append(self.overwriteConfigfilesEntry)        
+               self.list.append(self.overwriteConfigfilesEntry)
                self.list.append(getConfigListEntry(_("show softwaremanager in setup menu"), config.plugins.softwaremanager.onSetupMenu))
                self.list.append(getConfigListEntry(_("show softwaremanager on blue button"), config.plugins.softwaremanager.onBlueButton))
 
@@ -500,7 +499,7 @@ class SoftwareManagerInfo(Screen):
 
                self.list = []
                self["list"] = List(self.list)
-               
+
                self["key_red"] = StaticText(_("Close"))
                self["key_green"] = StaticText()
                self["key_yellow"] = StaticText()
@@ -521,9 +520,9 @@ class SoftwareManagerInfo(Screen):
                        for entry in backupfiles:
                                self.list.append((entry,))
                        self['list'].setList(self.list)
-                       
 
-class PluginManager(Screen, DreamInfoHandler):
+
+class PluginManager(Screen):
 
        skin = """
                <screen name="PluginManager" position="center,center" size="560,440" title="Extensions management" >
@@ -599,7 +598,7 @@ class PluginManager(Screen, DreamInfoHandler):
                self.currentSelectedPackage = None
                self.saved_currentSelectedPackage = None
                self.restartRequired = False
-               
+
                self.onShown.append(self.setWindowTitle)
                self.onLayoutFinish.append(self.getUpdateInfos)
 
@@ -675,7 +674,7 @@ class PluginManager(Screen, DreamInfoHandler):
                                        iSoftwareTools.lastDownloadDate = time()
                                        iSoftwareTools.list_updating = True
                                        self.setState('update')
-                                       iSoftwareTools.getUpdates(self.getUpdateInfosCB)                                        
+                                       iSoftwareTools.getUpdates(self.getUpdateInfosCB)
 
        def rebuildList(self, retval = None):
                if self.currentSelectedTag is None:
@@ -774,7 +773,7 @@ class PluginManager(Screen, DreamInfoHandler):
                                iSoftwareTools.list_updating = True
                                self.setState('update')
                                iSoftwareTools.getUpdates(self.getUpdateInfosCB)
-                               
+
        def handleSelected(self):
                current = self["list"].getCurrent()
                if current:
@@ -1151,7 +1150,7 @@ class PluginManagerHelp(Screen):
                self.close()
 
 
-class PluginDetails(Screen, DreamInfoHandler):
+class PluginDetails(Screen):
        skin = """
                <screen name="PluginDetails" position="center,center" size="600,440" title="Plugin details" >
                        <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
@@ -1169,7 +1168,6 @@ class PluginDetails(Screen, DreamInfoHandler):
                self.skin_path = plugin_path
                self.language = language.getLanguage()[:2] # getLanguage returns e.g. "fi_FI" for "language_country"
                self.attributes = None
-               DreamInfoHandler.__init__(self, self.statusCallback, blocking = False)
                self.directory = resolveFilename(SCOPE_METADIR)
                if packagedata:
                        self.pluginname = packagedata[0]
@@ -1227,9 +1225,6 @@ class PluginDetails(Screen, DreamInfoHandler):
        def pageDown(self):
                self["detailtext"].pageDown()
 
-       def statusCallback(self, status, progress):
-               pass
-
        def setInfos(self):
                if self.attributes.has_key("screenshot"):
                        self.loadThumbnail(self.attributes)
@@ -1364,7 +1359,7 @@ class IPKGMenu(Screen):
        def __init__(self, session, plugin_path):
                Screen.__init__(self, session)
                self.skin_path = plugin_path
-               
+
                self["key_red"] = StaticText(_("Close"))
                self["key_green"] = StaticText(_("Edit"))
 
@@ -1372,7 +1367,7 @@ class IPKGMenu(Screen):
                self.val = []
                self.entry = False
                self.exe = False
-               
+
                self.path = ""
 
                self["actions"] = NumberActionMap(["SetupActions"],
@@ -1459,7 +1454,7 @@ class IPKGSource(Screen):
                else:
                        self["text"] = Input(text, maxSize=False, visible_width = 55, type=Input.TEXT)
 
-               self["actions"] = NumberActionMap(["WizardActions", "InputActions", "TextEntryActions", "KeyboardInputActions","ShortcutActions"], 
+               self["actions"] = NumberActionMap(["WizardActions", "InputActions", "TextEntryActions", "KeyboardInputActions","ShortcutActions"],
                {
                        "ok": self.go,
                        "back": self.close,
@@ -1503,22 +1498,22 @@ class IPKGSource(Screen):
 
        def keyLeft(self):
                self["text"].left()
-       
+
        def keyRight(self):
                self["text"].right()
-       
+
        def keyHome(self):
                self["text"].home()
-       
+
        def keyEnd(self):
                self["text"].end()
-       
+
        def keyDeleteForward(self):
                self["text"].delete()
-       
+
        def keyDeleteBackward(self):
                self["text"].deleteBackward()
-       
+
        def keyNumberGlobal(self, number):
                self["text"].number(number)
 
@@ -1544,7 +1539,7 @@ class PacketManager(Screen, NumericalTextInput):
                                </convert>
                        </widget>
                </screen>"""
-               
+
        def __init__(self, session, plugin_path, args = None):
                Screen.__init__(self, session)
                NumericalTextInput.__init__(self)
@@ -1571,7 +1566,7 @@ class PacketManager(Screen, NumericalTextInput):
                        "9": self.keyNumberGlobal,
                        "0": self.keyNumberGlobal
                }, -1)
-               
+
                self.list = []
                self.statuslist = []
                self["list"] = List(self.list)
@@ -1596,7 +1591,7 @@ class PacketManager(Screen, NumericalTextInput):
                self.onLayoutFinish.append(self.rebuildList)
 
                rcinput = eRCInput.getInstance()
-               rcinput.setKeyboardMode(rcinput.kmAscii)                
+               rcinput.setKeyboardMode(rcinput.kmAscii)
 
        def keyNumberGlobal(self, val):
                key = self.getKey(val)
@@ -1604,12 +1599,12 @@ class PacketManager(Screen, NumericalTextInput):
                        keyvalue = key.encode("utf-8")
                        if len(keyvalue) == 1:
                                self.setNextIdx(keyvalue[0])
-               
+
        def keyGotAscii(self):
                keyvalue = unichr(getPrevAsciiCode()).encode("utf-8")
                if len(keyvalue) == 1:
                        self.setNextIdx(keyvalue[0])
-               
+
        def setNextIdx(self,char):
                if char in ("0", "1", "a"):
                        self["list"].setIndex(0)
@@ -1638,7 +1633,7 @@ class PacketManager(Screen, NumericalTextInput):
                        remove(self.cache_file)
                        self.list_updating = True
                        self.rebuildList()
-                       
+
        def setWindowTitle(self):
                self.setTitle(_("Packet manager"))
 
@@ -1649,11 +1644,11 @@ class PacketManager(Screen, NumericalTextInput):
                        if status == 'update':
                                statuspng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager/upgrade.png"))
                                self.statuslist.append(( _("Package list update"), '', _("Trying to download a new packetlist. Please wait..." ),'',statuspng, divpng ))
-                               self['list'].setList(self.statuslist)   
+                               self['list'].setList(self.statuslist)
                        elif status == 'error':
                                statuspng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager/remove.png"))
                                self.statuslist.append(( _("Error"), '', _("There was an error downloading the packetlist. Please try again." ),'',statuspng, divpng ))
-                               self['list'].setList(self.statuslist)                           
+                               self['list'].setList(self.statuslist)
 
        def rebuildList(self):
                self.setStatus('update')
@@ -1715,7 +1710,7 @@ class PacketManager(Screen, NumericalTextInput):
 
        def runUpgradeFinished(self):
                self.session.openWithCallback(self.UpgradeReboot, MessageBox, _("Upgrade finished.") +" "+_("Do you want to reboot your receiver?"), MessageBox.TYPE_YESNO)
-               
+
        def UpgradeReboot(self, result):
                if result is None:
                        return
@@ -1742,7 +1737,6 @@ class PacketManager(Screen, NumericalTextInput):
                                        self.Console = Console()
                                cmd = self.ipkg.ipkg + " list"
                                self.Console.ePopen(cmd, self.IpkgList_Finished)
-               #print event, "-", param
                pass
 
        def IpkgList_Finished(self, result, retval, extra_args = None):
@@ -1750,7 +1744,7 @@ class PacketManager(Screen, NumericalTextInput):
                        self.packetlist = []
                        last_name = ""
                        for x in result.splitlines():
-                               tokens = x.split(' - ') 
+                               tokens = x.split(' - ')
                                name = tokens[0].strip()
                                if not any(name.endswith(x) for x in self.unwanted_extensions):
                                        l = len(tokens)
@@ -1758,7 +1752,7 @@ class PacketManager(Screen, NumericalTextInput):
                                        descr = l > 2 and tokens[2].strip() or ""
                                        if name == last_name:
                                                continue
-                                       last_name = name 
+                                       last_name = name
                                        self.packetlist.append([name, version, descr])
 
                if not self.Console:
@@ -1792,17 +1786,17 @@ class PacketManager(Screen, NumericalTextInput):
                                        version = l > 2 and tokens[2].strip() or ""
                                        self.upgradeable_packages[name] = version
                self.buildPacketList()
-       
+
        def buildEntryComponent(self, name, version, description, state):
                divpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/div-h.png"))
                if not description:
                        description = "No description available."
                if state == 'installed':
                        installedpng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager/installed.png"))
-                       return((name, version, _(description), state, installedpng, divpng))    
+                       return((name, version, _(description), state, installedpng, divpng))
                elif state == 'upgradeable':
                        upgradeablepng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager/upgradeable.png"))
-                       return((name, version, _(description), state, upgradeablepng, divpng))  
+                       return((name, version, _(description), state, upgradeablepng, divpng))
                else:
                        installablepng = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_PLUGIN, "SystemPlugins/SoftwareManager/installable.png"))
                        return((name, version, _(description), state, installablepng, divpng))
@@ -1832,7 +1826,7 @@ class PacketManager(Screen, NumericalTextInput):
                                                status = "installed"
                                else:
                                        status = "installable"
-                               self.list.append(self.buildEntryComponent(x[0], x[1], x[2], status))    
+                               self.list.append(self.buildEntryComponent(x[0], x[1], x[2], status))
                                self.cachelist.append([x[0], x[1], x[2], status])
                        write_cache(self.cache_file, self.cachelist)
                        self['list'].setList(self.list)
@@ -1856,7 +1850,7 @@ class IpkgInstaller(Screen):
                        <ePixmap pixmap="skin_default/div-h.png" position="0,410" zPosition="10" size="560,2" transparent="1" alphatest="on" />
                        <widget source="introduction" render="Label" position="5,420" zPosition="10" size="550,30" halign="center" valign="center" font="Regular;22" transparent="1" shadowColor="black" shadowOffset="-1,-1" />
                </screen>"""
-       
+
        def __init__(self, session, list):
                Screen.__init__(self, session)
 
@@ -1870,8 +1864,8 @@ class IpkgInstaller(Screen):
                self["key_yellow"] = StaticText()
                self["key_blue"] = StaticText(_("Invert"))
                self["introduction"] = StaticText(_("Press OK to toggle the selection."))
-               
-               self["actions"] = ActionMap(["OkCancelActions", "ColorActions"], 
+
+               self["actions"] = ActionMap(["OkCancelActions", "ColorActions"],
                {
                        "ok": self.list.toggleSelection,
                        "cancel": self.close,
@@ -1895,13 +1889,13 @@ def filescan_open(list, session, **kwargs):
 def filescan(**kwargs):
        from Components.Scanner import Scanner, ScanPath
        return \
-               Scanner(mimetypes = ["application/x-debian-package"], 
-                       paths_to_scan = 
+               Scanner(mimetypes = ["application/x-debian-package"],
+                       paths_to_scan =
                                [
-                                       ScanPath(path = "ipk", with_subdirs = True), 
-                                       ScanPath(path = "", with_subdirs = False), 
-                               ], 
-                       name = "Ipkg", 
+                                       ScanPath(path = "ipk", with_subdirs = True),
+                                       ScanPath(path = "", with_subdirs = False),
+                               ],
+                       name = "Ipkg",
                        description = _("Install extensions."),
                        openfnc = filescan_open, )
 
@@ -1909,7 +1903,7 @@ def UpgradeMain(session, **kwargs):
        session.open(UpdatePluginMenu)
 
 def startSetup(menuid):
-       if menuid == "setup" and config.plugins.softwaremanager.onSetupMenu.value: 
+       if menuid == "setup" and config.plugins.softwaremanager.onSetupMenu.value:
                return [(_("Software management"), UpgradeMain, "software_manager", 50)]
        return [ ]
 
diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py
deleted file mode 100644 (file)
index 6f379ed..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-from Wizard import wizardManager
-from Screens.WizardLanguage import WizardLanguage
-from Tools.Directories import pathExists, resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION
-
-from Components.Pixmap import Pixmap, MovingPixmap
-from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, getConfigListEntry
-from Components.DreamInfoHandler import DreamInfoHandler
-from Components.PluginComponent import plugins
-from Plugins.Plugin import PluginDescriptor
-from os import system as os_system, path as os_path, mkdir
-
-config.misc.defaultchosen = ConfigBoolean(default = True)
-
-class DefaultWizard(WizardLanguage, DreamInfoHandler):
-       def __init__(self, session, silent = True, showSteps = False, neededTag = None):
-               DreamInfoHandler.__init__(self, self.statusCallback, neededTag = neededTag)
-               self.silent = silent
-               self.setDirectory()
-        
-               WizardLanguage.__init__(self, session, showSteps = False)
-               self["wizard"] = Pixmap()
-               self["rc"] = MovingPixmap()
-               self["arrowdown"] = MovingPixmap()
-               self["arrowup"] = MovingPixmap()
-               self["arrowup2"] = MovingPixmap()
-       
-       def setDirectory(self):
-               self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
-               self.xmlfile = "defaultwizard.xml"
-               if self.directory:
-                       os_system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), self.directory))
-        
-       def markDone(self):
-               config.misc.defaultchosen.value = 0
-               config.misc.defaultchosen.save()
-               configfile.save()
-               
-       def statusCallback(self, status, progress):
-               print "statusCallback:", status, progress
-               if status == DreamInfoHandler.STATUS_DONE:
-                       self["text"].setText(_("The installation of the default settings is finished. You can now continue configuring your receiver by pressing the OK button on the remote control."))
-                       self.markDone()
-                       self.disableKeys = False
-
-       def getConfigList(self):
-               self.packageslist = []
-               configList = []
-               self.fillPackagesList()
-               self.packagesConfig = []
-               for x in range(len(self.packageslist)):
-                       entry = ConfigYesNo()
-                       self.packagesConfig.append(entry)
-                       configList.append(getConfigListEntry(self.packageslist[x][0]["attributes"]["name"], entry))
-               return configList
-
-       def selectionMade(self):
-               print "selection made"
-               #self.installPackage(int(index))
-               self.indexList = []
-               for x in range(len(self.packagesConfig)):
-                       if self.packagesConfig[x].value:
-                               self.indexList.append(x)
-
-class DreamPackageWizard(DefaultWizard):
-       def __init__(self, session, packagefile, silent = False):
-               if not pathExists("/tmp/package"):
-                       mkdir("/tmp/package")
-               os_system("tar xpzf %s -C /tmp/package" % packagefile)
-               self.packagefile = packagefile
-               DefaultWizard.__init__(self, session, silent)
-               
-       def setDirectory(self):
-               self.directory = "/tmp/package"
-               self.xmlfile = "dreampackagewizard.xml"
-               
-class ImageDefaultInstaller(DreamInfoHandler):
-       def __init__(self):
-               DreamInfoHandler.__init__(self, self.statusCallback, blocking = True)
-               self.directory = resolveFilename(SCOPE_DEFAULTDIR)
-               self.fillPackagesList()
-               self.installPackage(0)
-               
-       def statusCallback(self, status, progress):
-               pass
-
-def install(choice):
-       if choice is not None:
-               #os_system("mkdir /tmp/package && tar xpzf %s ")
-               choice[2].open(DreamPackageWizard, choice[1])
-
-def filescan_open(list, session, **kwargs):
-       from Screens.ChoiceBox import ChoiceBox
-       print "open default wizard"
-       filelist = [(os_path.split(x.path)[1], x.path, session) for x in list]
-       print filelist
-       session.openWithCallback(install, ChoiceBox, title = _("Please choose he package..."), list=filelist)
-
-def filescan(**kwargs):
-       from Components.Scanner import Scanner, ScanPath
-       return \
-               Scanner(mimetypes = ["application/x-dream-package"], 
-                       paths_to_scan = 
-                               [
-                                       ScanPath(path = "dmpkg", with_subdirs = True), 
-                                       ScanPath(path = "", with_subdirs = False), 
-                               ], 
-                       name = "Dream-Package", 
-                       description = _("Install settings, skins, software..."), 
-                       openfnc = filescan_open, )
-
-print "add dreampackage scanner plugin"
-plugins.addPlugin(PluginDescriptor(name="Dream-Package", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan, internal = True))
-print "added"
-
-wizardManager.registerWizard(DefaultWizard, config.misc.defaultchosen.value, priority = 6)
-
-if config.misc.defaultchosen.value:
-       print "Installing image defaults"
-       installer = ImageDefaultInstaller()
-       print "installing done!"
index 5ba9264..adbdeac 100755 (executable)
@@ -12,7 +12,7 @@ install_PYTHON = \
        Console.py InputBox.py ChoiceBox.py SimpleSummary.py \
        TimerSelection.py PictureInPicture.py TimeDateInput.py \
        SubtitleDisplay.py SubservicesQuickzap.py ParentalControlSetup.py NumericalTextInputHelpDialog.py \
-       SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py DefaultWizard.py \
+       SleepTimerEdit.py Ipkg.py RdsDisplay.py Globals.py \
        SessionGlobals.py LocationBox.py WizardLanguage.py TaskView.py Rc.py VirtualKeyBoard.py \
        TextBox.py FactoryReset.py RecordPaths.py UnhandledKey.py ServiceStopScreen.py \
        InputDeviceSetup.py DVD.py SoftwareUpdate.py
index 2c0ecfc..1e066a1 100644 (file)
@@ -1,5 +1,4 @@
 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
@@ -7,14 +6,13 @@ 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, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITION
 from Tools.HardwareInfo import HardwareInfo
 from Screens.MessageBox import MessageBox
 from enigma import eTimer, eDVBFrontendParametersSatellite, eComponentScan, \
        eDVBSatelliteEquipmentControl, eDVBFrontendParametersTerrestrial, \
        eDVBFrontendParametersCable, eConsoleAppContainer, eDVBResourceManager
 
-def buildTerTransponder(frequency, 
+def buildTerTransponder(frequency,
                inversion=2, bandwidth = 7000000, fechigh = 6, feclow = 6,
                modulation = 2, transmission = 2, guard = 4,
                hierarchy = 4, system = 0):
@@ -104,7 +102,7 @@ class CableTransponderSearchSupport:
                        if raw_channel:
                                frontend = raw_channel.getFrontend()
                                if frontend:
-                                       frontend.closeFrontend() # immediate close... 
+                                       frontend.closeFrontend() # immediate close...
                                        del frontend
                                        del raw_channel
                                        return True
@@ -176,7 +174,7 @@ class CableTransponderSearchSupport:
                                tmpstr += " kHz "
                                tmpstr += data[0]
                                self.cable_search_session["text"].setText(tmpstr)
-               
+
        def startCableTransponderSearch(self, nim_idx):
                if not self.tryGetRawFrontend(nim_idx):
                        self.session.nav.stopService()
@@ -218,7 +216,7 @@ class CableTransponderSearchSupport:
                        cmd = "mediaclient --blindscan %d" % nim_idx
                else:
                        cmd = "tda1002x --init --scan --verbose --wakeup --inv 2 --bus %d" % bus
-               
+
                if cableConfig.scan_type.value == "bands":
                        cmd += " --scan-bands "
                        bands = 0
@@ -279,27 +277,6 @@ 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):
-               self.xmlfile = "defaultsatlists.xml"
-               DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
-               print "configuredSats:", nimmanager.getConfiguredSats()
-
-       def setDirectory(self):
-               self.directory = []
-               self.directory.append(resolveFilename(SCOPE_DEFAULTDIR))
-               import os
-               os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
-               self.directory.append(resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR))
-                               
-       def statusCallback(self, status, progress):
-               print "statusCallback:", status, progress
-               from Components.DreamInfoHandler import DreamInfoHandler
-               if status == DreamInfoHandler.STATUS_DONE:
-                       self["text"].setText(_("The installation of the default services lists is finished.") + "\n\n" + _("Please press OK to continue."))
-                       self.markDone()
-                       self.disableKeys = False        
-
 class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -313,7 +290,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
                if self.service is not None:
                        self.feinfo = self.service.frontendInfo()
                        frontendData = self.feinfo and self.feinfo.getAll(True)
-               
+
                self.createConfig(frontendData)
 
                del self.feinfo
@@ -360,10 +337,10 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
                self.tunerEntry = getConfigListEntry(_("Tuner"), self.scan_nims)
                self.list.append(self.tunerEntry)
-               
+
                if self.scan_nims == [ ]:
                        return
-               
+
                self.typeOfScanEntry = None
                self.systemEntry = None
                self.modulationEntry = None
@@ -784,7 +761,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
                startScan = True
                removeAll = True
                index_to_scan = int(self.scan_nims.value)
-               
+
                if self.scan_nims == [ ]:
                        self.session.open(MessageBox, _("No tuner is enabled!\nPlease setup your tuner settings before you start a service scan."), MessageBox.TYPE_ERROR)
                        return
@@ -797,7 +774,7 @@ class ScanSetup(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                # these lists are generated for each tuner, so this has work.
                                assert len(self.satList) > index_to_scan
                                assert len(self.scan_satselection) > index_to_scan
-                               
+
                                nimsats = self.satList[index_to_scan]
                                selsatidx = self.scan_satselection[index_to_scan].index
 
@@ -953,7 +930,7 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
 
                        need_scan = False
                        networks = self.getNetworksForNim(nim)
-                       
+
                        print "nim %d provides" % nim.slot, networks
                        print "known:", known_networks
 
@@ -964,10 +941,10 @@ class ScanSimple(ConfigListScreen, Screen, CableTransponderSearchSupport):
                                        need_scan = True
                                        print x, "not in ", known_networks
                                        known_networks.append(x)
-                                       
+
                        # don't offer to scan nims if nothing is connected
                        if not nimmanager.somethingConnected(nim.slot):
-                               need_scan = False                               
+                               need_scan = False
 
                        if need_scan:
                                nims_to_scan.append(nim)
index aab81f6..7732fd0 100644 (file)
@@ -1,7 +1,5 @@
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
-from Screens.ScanSetup import DefaultSatLists
-from Screens.DefaultWizard import DefaultWizard
 from Screens.Rc import Rc
 
 from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
@@ -15,18 +13,29 @@ config.misc.startwizard.shownimconfig = ConfigBoolean(default = True)
 config.misc.startwizard.doservicescan = ConfigBoolean(default = True)
 config.misc.languageselected = ConfigBoolean(default = True)
 
-class StartWizard(DefaultSatLists, Rc):
+class StartWizard(WizardLanguage, Rc):
        def __init__(self, session, silent = True, showSteps = False, neededTag = None):
-               self.xmlfile = ["startwizard.xml", "defaultsatlists.xml"]
+               self.xmlfile = ["startwizard.xml"]
                WizardLanguage.__init__(self, session, showSteps = False)
-               DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
                Rc.__init__(self)
                self["wizard"] = Pixmap()
-                               
+
        def markDone(self):
+               # setup remote control, all stb have same settings except dm8000 which uses a different settings
+               import os
+               boxType = ''
+               if os.path.isfile("/proc/stb/info/model"):
+                       boxType = open("/proc/stb/info/model").read().strip().lower()
+
+               if 'dm8000' in boxType:
+                       config.misc.rcused.value = 0
+               else:
+                       config.misc.rcused.value = 1
+               config.misc.rcused.save()
+
                config.misc.firstrun.value = 0
                config.misc.firstrun.save()
                configfile.save()
-               
+
 wizardManager.registerWizard(LanguageWizard, config.misc.languageselected.value, priority = 5)
 wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)
index 2e28034..2fed350 100755 (executable)
@@ -30,9 +30,6 @@ SCOPE_PLUGINS = 9
 SCOPE_MEDIA = 10
 SCOPE_PLAYLIST = 11
 SCOPE_CURRENT_SKIN = 12
-SCOPE_DEFAULTDIR = 13
-SCOPE_DEFAULTPARTITION = 14
-SCOPE_DEFAULTPARTITIONMOUNTDIR = 15
 SCOPE_METADIR = 16
 SCOPE_CURRENT_PLUGIN = 17
 
@@ -53,12 +50,9 @@ defaultPaths = {
                SCOPE_HDD: ("/hdd/movie/", PATH_DONTCREATE),
                SCOPE_MEDIA: ("/media/", PATH_DONTCREATE),
                SCOPE_PLAYLIST: (eEnv.resolve("${sysconfdir}/enigma2/playlist/"), PATH_CREATE),
-               
+
                SCOPE_USERETC: ("", PATH_DONTCREATE), # user home directory
-               
-               SCOPE_DEFAULTDIR: (eEnv.resolve("${datadir}/enigma2/defaults/"), PATH_CREATE),
-               SCOPE_DEFAULTPARTITION: ("/dev/mtdblock6", PATH_DONTCREATE),
-               SCOPE_DEFAULTPARTITIONMOUNTDIR: (eEnv.resolve("${datadir}/enigma2/dealer"), PATH_CREATE),
+
                SCOPE_METADIR: (eEnv.resolve("${datadir}/meta"), PATH_CREATE),
        }
 
@@ -197,9 +191,9 @@ def getRecordingFilename(basename, dirname = None):
        # filter out non-allowed characters
        non_allowed_characters = "/.\\:*?<>|\""
        filename = ""
-       
+
        basename = basename.replace('\xc2\x86', '').replace('\xc2\x87', '')
-       
+
        for c in basename:
                if c in non_allowed_characters or ord(c) < 32:
                        c = "_"
index 9248b7c..38962c5 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -90,7 +90,6 @@ from Components.PluginComponent import plugins
 
 profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
-from Screens.DefaultWizard import *
 from Screens.StartWizard import *
 from Screens.TutorialWizard import *
 import Screens.Rc
@@ -194,7 +193,7 @@ class Session:
                        callback(*retval)
 
        def execBegin(self, first=True, do_show = True):
-               assert not self.in_exec 
+               assert not self.in_exec
                self.in_exec = True
                c = self.current_dialog
 
@@ -535,7 +534,7 @@ def runScreenTest():
        configfile.save()
        from Screens import InfoBarGenerics
        InfoBarGenerics.saveResumePoints()
-       
+
        return 0
 
 profile("Init:skin")