aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFraxinas <andreas.frisch@multimedia-labs.de>2010-04-09 08:25:08 +0200
committerFraxinas <andreas.frisch@multimedia-labs.de>2010-04-09 08:25:08 +0200
commit98c7a787df63a93f868548c2b1e357c0d873ebbe (patch)
treee8258f3e175e540e6106e0b7202abcf550b825d1 /data
parentae60e9e3642949a91b7ea4f77374495fec9a51ed (diff)
parent76250cdc36d0f0e84505d5654066229b846f035f (diff)
downloadenigma2-98c7a787df63a93f868548c2b1e357c0d873ebbe.tar.gz
enigma2-98c7a787df63a93f868548c2b1e357c0d873ebbe.zip
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'data')
-rw-r--r--data/defaults/Dream/Makefile.am5
-rw-r--r--data/defaults/Dream/dm500hd.info2
-rw-r--r--data/defaults/Dream/dm7025.info2
-rw-r--r--data/defaults/Dream/dm800.info2
-rw-r--r--data/defaults/Dream/dm8000.info2
-rw-r--r--data/defaults/Dream/hdbouquets/Makefile.am4
-rw-r--r--data/defaults/Dream/hdbouquets/userbouquet.favourites.tv129
-rw-r--r--data/defaults/Dream/sdbouquets/Makefile.am4
-rw-r--r--data/defaults/Dream/sdbouquets/userbouquet.favourites.tv (renamed from data/defaults/Dream/userbouquet.favourites.tv)0
-rwxr-xr-xdata/menu.xml6
-rw-r--r--data/setup.xml2
-rwxr-xr-xdata/skin.xml2
-rwxr-xr-xdata/skin_default/Makefile.am1
-rw-r--r--data/skin_default/celserviceeventprogressbar.pngbin0 -> 1056 bytes
14 files changed, 148 insertions, 13 deletions
diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 113442c0..31ba1c69 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = hdbouquets sdbouquets
+
installdir = $(pkgdatadir)/defaults/Dream
dist_install_DATA = \
@@ -9,5 +11,4 @@ dist_install_DATA = \
settings.500hd \
settings.7025 \
settings.800 \
- settings.8000 \
- userbouquet.favourites.tv
+ settings.8000
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
index fbf7888e..b1b4d53d 100644
--- a/data/defaults/Dream/dm500hd.info
+++ b/data/defaults/Dream/dm500hd.info
@@ -20,7 +20,7 @@
</prerequisites>
</file-->
<file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
<!--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 0461b686..a1585cfe 100644
--- a/data/defaults/Dream/dm7025.info
+++ b/data/defaults/Dream/dm7025.info
@@ -20,7 +20,7 @@
</prerequisites>
</file-->
<file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv" />
<!--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 8c68349f..4793bd85 100644
--- a/data/defaults/Dream/dm800.info
+++ b/data/defaults/Dream/dm800.info
@@ -20,7 +20,7 @@
</prerequisites>
</file-->
<file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
<!--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 8b11946f..2ef2013a 100644
--- a/data/defaults/Dream/dm8000.info
+++ b/data/defaults/Dream/dm8000.info
@@ -20,7 +20,7 @@
</prerequisites>
</file-->
<file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
<!--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
new file mode 100644
index 00000000..843a07d6
--- /dev/null
+++ b/data/defaults/Dream/hdbouquets/Makefile.am
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 00000000..91536b10
--- /dev/null
+++ b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
@@ -0,0 +1,129 @@
+#NAME Favourites (TV)
+#SERVICE 1:0:19:2B5C:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:19:2B66:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCC:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:2EE3:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445C:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:2EF4:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445D:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:445E:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:33:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:701:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:2F1C:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D6E:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:2FC:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:F98:454:1:C00000:0:0:0:
+#SERVICE 1:0:19:2B70:3F3:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D67:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7031:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:7032:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:7033:41B:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E46:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCE:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DD1:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6DCF:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E42:431:1:C00000:0:0:0:
+#SERVICE 1:64:B:0:0:0:0:0:0:0::Doku/Wissen/Themen
+#DESCRIPTION Doku/Wissen/Themen
+#SERVICE 1:0:1:6DD0:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D6B:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:2775:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:293:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:6D70:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:277B:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:332D:45B:1:C00000:0:0:0:
+#SERVICE 1:0:1:3139:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:2F5A:454:1:C00000:0:0:0:
+#SERVICE 1:64:A:0:0:0:0:0:0:0::Sport
+#DESCRIPTION Sport
+#SERVICE 1:0:1:384:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:79E0:443:1:C00000:0:0:0:
+#SERVICE 1:64:1:0:0:0:0:0:0:0::Kinder
+#DESCRIPTION Kinder
+#SERVICE 1:0:1:2F08:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D68:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7008:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:6FE0:443:1:C00000:0:0:0:
+#SERVICE 1:64:2:0:0:0:0:0:0:0::Nachrichten
+#DESCRIPTION Nachrichten
+#SERVICE 1:0:1:2F3A:441:1:C00000:0:0:0:
+#SERVICE 1:0:1:445F:453:1:C00000:0:0:0:
+#SERVICE 1:0:1:79F4:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2753:402:1:C00000:0:0:0:
+#SERVICE 1:0:1:7035:41B:1:C00000:0:0:0:
+#SERVICE 1:64:3:0:0:0:0:0:0:0::Regional
+#DESCRIPTION Regional
+#SERVICE 1:0:1:3146:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:300:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:2778:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:277A:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:2779:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:2777:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:32D6:45D:1:C00000:0:0:0:
+#SERVICE 1:0:1:277D:444:1:C00000:0:0:0:
+#SERVICE 1:64:4:0:0:0:0:0:0:0::Musik
+#DESCRIPTION Musik
+#SERVICE 1:0:1:2774:444:1:C00000:0:0:0:
+#SERVICE 1:0:1:7004:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:7001:436:1:C00000:0:0:0:
+#SERVICE 1:0:1:6FE1:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2FD:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:32D5:45D:1:C00000:0:0:0:
+#SERVICE 1:0:1:332E:45B:1:C00000:0:0:0:
+#SERVICE 1:0:1:304:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:702:5:85:C00000:0:0:0:
+#SERVICE 1:64:5:0:0:0:0:0:0:0::Reisen
+#DESCRIPTION Reisen
+#SERVICE 1:0:1:20:21:85:C00000:0:0:0:
+#SERVICE 1:64:9:0:0:0:0:0:0:0::Beratung
+#DESCRIPTION Beratung
+#SERVICE 1:0:1:295:21:85:C00000:0:0:0:
+#SERVICE 1:64:6:0:0:0:0:0:0:0::Einkaufen
+#DESCRIPTION Einkaufen
+#SERVICE 1:0:1:301:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:28:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:79EA:443:1:C00000:0:0:0:
+#SERVICE 1:0:1:2F44:454:1:C00000:0:0:0:
+#SERVICE 1:0:1:3148:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:36:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:307:7:85:C00000:0:0:0:
+#SERVICE 1:0:1:296:5:85:C00000:0:0:0:
+#SERVICE 1:0:1:383:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:313C:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:3159:459:1:C00000:0:0:0:
+#SERVICE 1:0:1:2E:21:85:C00000:0:0:0:
+#SERVICE 1:0:1:381:21:85:C00000:0:0:0:
+#SERVICE 1:64:7:0:0:0:0:0:0:0::High Definition
+#DESCRIPTION High Definition
+#SERVICE 1:0:19:6EEC:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:19:EF12:421:1:C00000:0:0:0:
+#SERVICE 1:0:19:EF13:421:1:C00000:0:0:0:
+#SERVICE 1:64:0:0:0:0:0:0:0:0::Alternativen
+#DESCRIPTION Alternativen
+#SERVICE 1:0:1:6DCB:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E44:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E45:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E41:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E40:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E43:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6EE1:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E2D:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E2E:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F46:445:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E47:431:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F76:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E92:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E93:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F78:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F79:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E94:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6F77:457:1:C00000:0:0:0:
+#SERVICE 1:0:1:6EEB:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E97:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E96:4B1:1:C00000:0:0:0:
+#SERVICE 1:0:1:6E95:4B1:1:C00000:0:0:0:
+#SERVICE 1:64:8:0:0:0:0:0:0:0::Alternative SD services
+#DESCRIPTION Alternative SD services
+#SERVICE 1:0:1:6DCA:44D:1:C00000:0:0:0:
+#SERVICE 1:0:1:6D66:437:1:C00000:0:0:0:
+#SERVICE 1:0:1:7034:41B:1:C00000:0:0:0:
diff --git a/data/defaults/Dream/sdbouquets/Makefile.am b/data/defaults/Dream/sdbouquets/Makefile.am
new file mode 100644
index 00000000..50328e55
--- /dev/null
+++ b/data/defaults/Dream/sdbouquets/Makefile.am
@@ -0,0 +1,4 @@
+installdir = $(pkgdatadir)/defaults/Dream/sdbouquets
+
+dist_install_DATA = \
+ userbouquet.favourites.tv
diff --git a/data/defaults/Dream/userbouquet.favourites.tv b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
index 5f89c48a..5f89c48a 100644
--- a/data/defaults/Dream/userbouquet.favourites.tv
+++ b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
diff --git a/data/menu.xml b/data/menu.xml
index fbc52957..b437fbc7 100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -75,12 +75,6 @@
<item weight="10" level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item>
<item weight="15" level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item>
<!--item level="0" text="Startwizard" entryID="startwizzard"><screen module="StartWizard" screen="StartWizard" /></item-->
- <item weight="20" level="0" text="Default settings" entryID="default_wizard">
- <code>
-from Screens.DefaultWizard import DefaultWizard
-self.session.open(DefaultWizard, silent = False)
-</code>
- </item>
<item weight="25" level="0" text="Factory reset" entryID="factory_reset">
<code>
from Screens.FactoryReset import FactoryReset
diff --git a/data/setup.xml b/data/setup.xml
index 9425afda..705eaf33 100644
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -31,8 +31,10 @@
<item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item>
<item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item>
<item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item>
+ <item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item>
<item level="0" text="Infobar timeout">config.usage.infobar_timeout</item>
<item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item>
+ <item level="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item>
<item level="2" text="Show infobar on channel change">config.usage.show_infobar_on_zap</item>
<item level="2" text="Show infobar on skip forward/backward">config.usage.show_infobar_on_skip</item>
<item level="2" text="Show infobar on event change">config.usage.show_infobar_on_event_change</item>
diff --git a/data/skin.xml b/data/skin.xml
index d5fe01e6..32adb2be 100755
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -323,7 +323,7 @@
</widget>
<!-- Remaining time -->
<widget source="session.CurrentService" render="Label" position="576,129" size="100,20" font="Regular;18" halign="center" valign="center" backgroundColor="#06224f" shadowColor="#1d354c" shadowOffset="-1,-1" transparent="1">
- <convert type="ServicePosition">Remaining</convert>
+ <convert type="ServicePosition">Remaining,Negate</convert>
</widget>
</screen>
</skin>
diff --git a/data/skin_default/Makefile.am b/data/skin_default/Makefile.am
index 85bb800d..6038c2e9 100755
--- a/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
@@ -23,6 +23,7 @@ dist_install_DATA = \
b_tl.png \
b_t.png \
b_tr.png \
+ celserviceeventprogressbar.png \
div-h.png \
div-v.png \
epg_more.png \
diff --git a/data/skin_default/celserviceeventprogressbar.png b/data/skin_default/celserviceeventprogressbar.png
new file mode 100644
index 00000000..7bf5c658
--- /dev/null
+++ b/data/skin_default/celserviceeventprogressbar.png
Binary files differ
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-31 09:31:48 +0000