aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/defaults/Dream/hdbouquets/userbouquet.favourites.tv5
-rw-r--r--data/defaults/Dream/sdbouquets/userbouquet.favourites.tv5
-rwxr-xr-xdata/menu.xml3
-rwxr-xr-x[-rw-r--r--]data/setup.xml2
-rwxr-xr-xdata/skin_default.xml14
-rwxr-xr-xdata/skin_default/Makefile.am1
-rw-r--r--data/skin_default/celserviceeventprogressbar.pngbin0 -> 1056 bytes
-rwxr-xr-x[-rw-r--r--]data/skin_default/icons/Makefile.am15
-rw-r--r--data/skin_default/icons/input_keyboard-configured.pngbin0 -> 2700 bytes
-rw-r--r--data/skin_default/icons/input_keyboard.pngbin0 -> 2520 bytes
-rw-r--r--data/skin_default/icons/input_mouse-configured.pngbin0 -> 2785 bytes
-rw-r--r--data/skin_default/icons/input_mouse.pngbin0 -> 2512 bytes
-rw-r--r--data/skin_default/icons/input_rcnew-configured.pngbin0 -> 2809 bytes
-rw-r--r--data/skin_default/icons/input_rcnew.pngbin0 -> 2570 bytes
-rw-r--r--data/skin_default/icons/input_rcold-configured.pngbin0 -> 2796 bytes
-rw-r--r--data/skin_default/icons/input_rcold.pngbin0 -> 2598 bytes
-rwxr-xr-xdata/skin_default/icons/network_wired-active.pngbin0 -> 2771 bytes
-rwxr-xr-xdata/skin_default/icons/network_wired-inactive.pngbin0 -> 2745 bytes
-rwxr-xr-xdata/skin_default/icons/network_wired.pngbin0 -> 2477 bytes
-rwxr-xr-xdata/skin_default/icons/network_wireless-active.pngbin0 -> 2821 bytes
-rwxr-xr-xdata/skin_default/icons/network_wireless-inactive.pngbin0 -> 2745 bytes
-rwxr-xr-xdata/skin_default/icons/network_wireless.pngbin0 -> 2539 bytes
22 files changed, 39 insertions, 6 deletions
diff --git a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
index 91536b10..b6bc62fc 100644
--- a/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
+++ b/data/defaults/Dream/hdbouquets/userbouquet.favourites.tv
@@ -11,6 +11,7 @@
#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:308:5:85: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:
@@ -25,12 +26,12 @@
#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:6F47:445: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:49:5:85: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:
diff --git a/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
index 5f89c48a..1cea3669 100644
--- a/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
+++ b/data/defaults/Dream/sdbouquets/userbouquet.favourites.tv
@@ -11,6 +11,7 @@
#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:308:5:85: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:1:7034:41B:1:C00000:0:0:0:
@@ -25,12 +26,12 @@
#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:6F47:445: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:49:5:85: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:
diff --git a/data/menu.xml b/data/menu.xml
index b437fbc7..6507bfe3 100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -62,8 +62,9 @@
</menu>
<!--<item text="Remote Control"><setup id="rc" /></item>-->
<!--<item text="OSD"><setup id="osd" /></item>-->
- <item requires="Display"><setup level="1" id="lcd" /></item>
<item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+ <item level="1" text="Input devices" entryID="input_device_setup"><screen module="InputDeviceSetup" screen="InputDeviceSelection" /></item>
+ <item requires="Display"><setup level="1" id="lcd" /></item>
<item text="Keyboard"><setup id="keyboard" /></item>
<!--<menu level="1" text="Network..." entryID="network_setup">
<id val="network" />
diff --git a/data/setup.xml b/data/setup.xml
index 9425afda..b920edd6 100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml
@@ -33,6 +33,7 @@
<item level="1" text="Action on long powerbutton press">config.usage.on_long_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>
@@ -70,6 +71,7 @@
<item level="2" text="Behavior of 0 key in PiP-mode">config.usage.pip_zero_button</item>
<item level="2" text="Alternative services tuner priority">config.usage.alternatives_priority</item>
<item level="2" text="Limited character set for recording filenames">config.recording.ascii_filenames</item>
+ <item level="2" text="Composition of the recording filenames">config.recording.filename_composition</item>
</setup>
<setup key="harddisk" title="Harddisk setup" >
<item level="0" text="Harddisk standby after">config.usage.hdd_standby</item>
diff --git a/data/skin_default.xml b/data/skin_default.xml
index aabefec4..8e0c1562 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -571,7 +571,19 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
<widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
<widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
- <widget name="list" position="5,50" size="550,280" scrollbarMode="showOnDemand" zPosition="10"/>
+ <widget source="list" render="Listbox" position="5,50" size="550,280" zPosition="10" scrollbarMode="showOnDemand">
+ <convert type="TemplatedMultiContent"> <!-- iface, name, description, interfacepng, defaultpng, activepng, divpng -->
+ {"template": [
+ MultiContentEntryText(pos = (85, 6), size = (440, 28), font=0, flags = RT_HALIGN_LEFT|RT_VALIGN_TOP, text = 1), # index 1 is the interfacename
+ MultiContentEntryText(pos = (85, 43), size = (440, 20), font=1, flags = RT_HALIGN_LEFT|RT_VALIGN_BOTTOM, text = 2), # index 2 is the description
+ MultiContentEntryPixmapAlphaTest(pos = (2, 8), size = (54, 54), png = 3), # index 3 is the interface pixmap
+ MultiContentEntryPixmapAlphaTest(pos = (63, 46), size = (15, 16), png = 4), # index 4 is the default pixmap
+ ],
+ "fonts": [gFont("Regular", 28),gFont("Regular", 20)],
+ "itemHeight": 70
+ }
+ </convert>
+ </widget>
<ePixmap pixmap="skin_default/div-h.png" position="0,340" zPosition="1" size="560,2" />
<widget source="introduction" render="Label" position="0,350" size="560,50" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
</screen>
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
diff --git a/data/skin_default/icons/Makefile.am b/data/skin_default/icons/Makefile.am
index 8e2052b0..c6cb269e 100644..100755
--- a/data/skin_default/icons/Makefile.am
+++ b/data/skin_default/icons/Makefile.am
@@ -27,13 +27,27 @@ dist_install_DATA = \
icon_view.png \
input_error.png \
input_info.png \
+ input_keyboard-configured.png \
+ input_keyboard.png \
+ input_mouse-configured.png \
+ input_mouse.png \
input_question.png \
+ input_rcnew-configured.png \
+ input_rcnew.png \
+ input_rcold-configured.png \
+ input_rcold.png \
lock_error.png \
lock_off.png \
lock_on.png \
lock.png \
marker.png \
mp_buttons.png \
+ network_wired.png \
+ network_wired-active.png \
+ network_wired-inactive.png \
+ network_wireless.png \
+ network_wireless-active.png \
+ network_wireless-inactive.png \
plugin.png \
rass_logo.png \
rass_page1.png \
@@ -48,3 +62,4 @@ dist_install_DATA = \
scan-s.png \
scan-t.png \
selectioncross.png
+
diff --git a/data/skin_default/icons/input_keyboard-configured.png b/data/skin_default/icons/input_keyboard-configured.png
new file mode 100644
index 00000000..c6623a5c
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard-configured.png
Binary files differ
diff --git a/data/skin_default/icons/input_keyboard.png b/data/skin_default/icons/input_keyboard.png
new file mode 100644
index 00000000..a922c896
--- /dev/null
+++ b/data/skin_default/icons/input_keyboard.png
Binary files differ
diff --git a/data/skin_default/icons/input_mouse-configured.png b/data/skin_default/icons/input_mouse-configured.png
new file mode 100644
index 00000000..3db9447c
--- /dev/null
+++ b/data/skin_default/icons/input_mouse-configured.png
Binary files differ
diff --git a/data/skin_default/icons/input_mouse.png b/data/skin_default/icons/input_mouse.png
new file mode 100644
index 00000000..f70c84e2
--- /dev/null
+++ b/data/skin_default/icons/input_mouse.png
Binary files differ
diff --git a/data/skin_default/icons/input_rcnew-configured.png b/data/skin_default/icons/input_rcnew-configured.png
new file mode 100644
index 00000000..6b16d393
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew-configured.png
Binary files differ
diff --git a/data/skin_default/icons/input_rcnew.png b/data/skin_default/icons/input_rcnew.png
new file mode 100644
index 00000000..19cdeea5
--- /dev/null
+++ b/data/skin_default/icons/input_rcnew.png
Binary files differ
diff --git a/data/skin_default/icons/input_rcold-configured.png b/data/skin_default/icons/input_rcold-configured.png
new file mode 100644
index 00000000..8d626851
--- /dev/null
+++ b/data/skin_default/icons/input_rcold-configured.png
Binary files differ
diff --git a/data/skin_default/icons/input_rcold.png b/data/skin_default/icons/input_rcold.png
new file mode 100644
index 00000000..ef8680b5
--- /dev/null
+++ b/data/skin_default/icons/input_rcold.png
Binary files differ
diff --git a/data/skin_default/icons/network_wired-active.png b/data/skin_default/icons/network_wired-active.png
new file mode 100755
index 00000000..d8efc9c8
--- /dev/null
+++ b/data/skin_default/icons/network_wired-active.png
Binary files differ
diff --git a/data/skin_default/icons/network_wired-inactive.png b/data/skin_default/icons/network_wired-inactive.png
new file mode 100755
index 00000000..18f2c70f
--- /dev/null
+++ b/data/skin_default/icons/network_wired-inactive.png
Binary files differ
diff --git a/data/skin_default/icons/network_wired.png b/data/skin_default/icons/network_wired.png
new file mode 100755
index 00000000..db695ad5
--- /dev/null
+++ b/data/skin_default/icons/network_wired.png
Binary files differ
diff --git a/data/skin_default/icons/network_wireless-active.png b/data/skin_default/icons/network_wireless-active.png
new file mode 100755
index 00000000..07a21874
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-active.png
Binary files differ
diff --git a/data/skin_default/icons/network_wireless-inactive.png b/data/skin_default/icons/network_wireless-inactive.png
new file mode 100755
index 00000000..5bd69f9d
--- /dev/null
+++ b/data/skin_default/icons/network_wireless-inactive.png
Binary files differ
diff --git a/data/skin_default/icons/network_wireless.png b/data/skin_default/icons/network_wireless.png
new file mode 100755
index 00000000..629a05a6
--- /dev/null
+++ b/data/skin_default/icons/network_wireless.png
Binary files differ
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 00:06:14 +0000