aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/defaults/Dream/Makefile.am4
-rw-r--r--data/defaults/Dream/dm500hd.info24
-rw-r--r--data/defaults/Dream/dm7020hd.info24
-rw-r--r--data/defaults/Dream/dm7025.info24
-rw-r--r--data/defaults/Dream/dm800.info24
-rw-r--r--data/defaults/Dream/dm8000.info24
-rw-r--r--data/defaults/Dream/dm800se.info24
-rw-r--r--data/defaults/Dream/settings.c1
-rw-r--r--data/defaults/Dream/settings.t1
-rw-r--r--data/defaultsatlists.xml3
-rwxr-xr-xdata/skin_default.xml6
11 files changed, 142 insertions, 17 deletions
diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 1758f67d..ee66c93a 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -15,4 +15,6 @@ dist_install_DATA = \
settings.7020hd \
settings.7025 \
settings.800 \
- settings.8000
+ settings.8000 \
+ settings.c \
+ settings.t
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
index b1b4d53d..9743c1f1 100644
--- a/data/defaults/Dream/dm500hd.info
+++ b/data/defaults/Dream/dm500hd.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <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
index 3af46795..c0b89452 100644
--- a/data/defaults/Dream/dm7020hd.info
+++ b/data/defaults/Dream/dm7020hd.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <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
index a1585cfe..9201aa17 100644
--- a/data/defaults/Dream/dm7025.info
+++ b/data/defaults/Dream/dm7025.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv" />
+ <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
index 4793bd85..b91f7a74 100644
--- a/data/defaults/Dream/dm800.info
+++ b/data/defaults/Dream/dm800.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <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
index 2ef2013a..ff60dd57 100644
--- a/data/defaults/Dream/dm8000.info
+++ b/data/defaults/Dream/dm8000.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <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
index 6974b120..2e11cdcb 100644
--- a/data/defaults/Dream/dm800se.info
+++ b/data/defaults/Dream/dm800se.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <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/settings.c b/data/defaults/Dream/settings.c
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.c
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.t
@@ -0,0 +1 @@
+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/defaultsatlists.xml b/data/defaultsatlists.xml
index 132b427c..f8bee5fe 100644
--- a/data/defaultsatlists.xml
+++ b/data/defaultsatlists.xml
@@ -16,7 +16,8 @@ self.disableKeys = True
<text value="There are no default services lists in your image." />
</step>
- <step id="nothingtoinstall" nextstep="finisheddefaultsatlists">
+ <!--step id="nothingtoinstall" nextstep="finisheddefaultsatlists"-->
+ <step id="nothingtoinstall" nextstep="scanquestion">
<condition>
if self.runWizard:
self.condition = True
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 272fdcf9..dcd2e8bb 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1205,7 +1205,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
<convert type="ClockToText">Format:%S</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="126,32">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>
@@ -1221,7 +1221,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
<convert type="ClockToText">Format:%H:%M</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>
@@ -1253,7 +1253,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
<convert type="ClockToText">Format:%H:%M</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>