aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
commitbbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch)
treec5945c791698c14723e989449e6b4bfcc275c05d /data
parent4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff)
parent5e6f814d005a01caa437a532e61f4b338617ff67 (diff)
downloadenigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz
enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts: lib/dvb/decoder.cpp
Diffstat (limited to 'data')
-rw-r--r--data/countries/x-fy.pngbin0 -> 2685 bytes
-rw-r--r--data/keymap.xml2
-rw-r--r--data/menu.xml3
-rwxr-xr-x[-rw-r--r--]data/skin.xml9
-rwxr-xr-xdata/skin_default.xml20
-rw-r--r--data/skin_default/bar_snr.pngbin2051 -> 2075 bytes
-rwxr-xr-xdata/skin_default/bottombar.pngbin13805 -> 3247 bytes
-rw-r--r--data/skin_default/icons/epgclock_add.pngbin0 -> 358 bytes
-rw-r--r--data/skin_default/icons/epgclock_post.pngbin0 -> 354 bytes
-rw-r--r--data/skin_default/icons/epgclock_pre.pngbin0 -> 360 bytes
-rw-r--r--data/skin_default/icons/epgclock_prepost.pngbin0 -> 359 bytes
-rw-r--r--data/skin_default/icons/icon_view.pngbin0 -> 376 bytes
12 files changed, 14 insertions, 20 deletions
diff --git a/data/countries/x-fy.png b/data/countries/x-fy.png
new file mode 100644
index 00000000..ac32ca28
--- /dev/null
+++ b/data/countries/x-fy.png
Binary files differ
diff --git a/data/keymap.xml b/data/keymap.xml
index 6b8b583d..0a0dc867 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -77,7 +77,7 @@
</map>
<map context="InfobarEPGActions">
- <key id="KEY_INFO" mapto="showEventView" flags="b" />
+ <key id="KEY_INFO" mapto="showEventInfo" flags="b" />
<key id="KEY_INFO" mapto="showEventInfoPlugin" flags="l" />
</map>
diff --git a/data/menu.xml b/data/menu.xml
index 369b20e0..7dc764ac 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -54,7 +54,7 @@
<item level="0" entryID="av_setup"><setup id="avsetup"/></item>
<!--<item level="0" text="Video Setup" entryID="video_setup"><screen module="VideoSetup" /></item>-->
<item level="1" entryID="rfmod_setup" requires="RfModulator"><setup id="RFmod"/></item>
- <menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisc">
+ <menu level="0" text="Harddisk" entryID="hardisk_selection" requires="Harddisk">
<id val="harddisk" />
<item level="1" entryID="harddisk_setup"><setup id="harddisk"/></item>
<item level="0" text="Initialization..." entryID="harddisk_init"><screen module="HarddiskSetup" screen="HarddiskSelection"/></item>
@@ -103,6 +103,7 @@ self.session.openWithCallback(msgClosed, MessageBox, _("When you do a factory re
<menu text="Standby / Restart" entryID="standby_restart_list">
<id val="shutdown" />
<!--<item text="Standby"><code>quitMainloop(0)</code></item>-->
+ <item text="Sleep Timer" entryID="sleep"><screen module="SleepTimerEdit" screen="SleepTimerEdit" /></item>
<item text="Standby" entryID="standby"><screen module="Standby" screen="Standby"/></item>
<item text="Restart" entryID="restart"><screen module="Standby" screen="TryQuitMainloop">2</screen></item>
<item level="2" text="Restart GUI" entryID="restart_enigma"><screen module="Standby" screen="TryQuitMainloop">3</screen></item>
diff --git a/data/skin.xml b/data/skin.xml
index 96d7067b..e2dbacdd 100644..100755
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -79,14 +79,9 @@
<widget source="session.FrontendStatus" render="Label" position="242,3" size="80,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1">
<convert type="FrontendInfo">SNRdB</convert>
</widget>
- <!-- Signal Strength -->
- <eLabel text="AGC" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" />
- <widget source="session.FrontendStatus" render="Label" position="355,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1">
- <convert type="FrontendInfo">AGC</convert>
- </widget>
<!-- Bit error rate -->
- <eLabel text="BER" position="403,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" />
- <widget source="session.FrontendStatus" render="Label" position="440,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1">
+ <eLabel text="BER" position="317,3" size="40,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#cccccc" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1" />
+ <widget source="session.FrontendStatus" render="Label" position="355,3" size="43,22" font="Regular;16" backgroundColor="#102e59" foregroundColor="#e7e7e7" shadowColor="#27384f" shadowOffset="-1,-1" transparent="1" noWrap="1">
<convert type="FrontendInfo">BER</convert>
</widget>
<!-- Channellogo (Picon) -->
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 993fd320..d60933eb 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -789,18 +789,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="Frontend" render="Label" position="460,35" size="60,22" font="Regular;21">
<convert type="FrontendInfo">SNR</convert>
</widget>
- <eLabel name="agc" text="AGC:" position="120,60" size="60,22" font="Regular;21" halign="right" transparent="1" />
- <widget source="Frontend" render="Progress" position="190,60" size="260,20" pixmap="skin_default/bar_snr.png" borderWidth="2" borderColor="#cccccc">
- <convert type="FrontendInfo">AGC</convert>
- </widget>
- <widget source="Frontend" render="Label" position="460,60" size="60,22" font="Regular;21">
- <convert type="FrontendInfo">AGC</convert>
- </widget>
- <eLabel name="ber" text="BER:" position="120,85" size="60,22" font="Regular;21" halign="right" transparent="1" />
- <widget source="Frontend" render="Progress" position="190,85" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc">
+ <eLabel name="ber" text="BER:" position="120,60" size="60,22" font="Regular;21" halign="right" transparent="1" />
+ <widget source="Frontend" render="Progress" position="190,60" size="260,20" pixmap="skin_default/bar_ber.png" borderWidth="2" borderColor="#cccccc">
<convert type="FrontendInfo">BER</convert>
</widget>
- <widget source="Frontend" render="Label" position="460,85" size="60,22" font="Regular;21">
+ <widget source="Frontend" render="Label" position="460,60" size="60,22" font="Regular;21">
<convert type="FrontendInfo">BER</convert>
</widget>
<eLabel name="lock" text="Lock:" position="120,115" size="60,22" font="Regular;21" halign="right" />
@@ -813,7 +806,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<convert type="ConditionalShowHide">Invert</convert>
</widget>
<ePixmap pixmap="skin_default/div-h.png" position="10,152" zPosition="1" size="500,2" />
- <widget name="config" position="10,165" size="500,240" scrollbarMode="showOnDemand" />
+ <widget name="config" position="10,165" size="500,225" scrollbarMode="showOnDemand" />
</screen>
<!-- Scan setup -->
<screen name="ScanSetup" position="100,115" size="520,390" title="Service scan">
@@ -947,6 +940,11 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
</screen>
<!-- Subtitle area -->
<screen name="SubtitleDisplay" position="0,0" size="720,576" zPosition="-1" flags="wfNoBorder" backgroundColor="transparent" />
+ <!-- TextBox -->
+ <screen name="TextBox" position="90,50" size="550,400" title="Message...">
+ <widget name="text" position="0,0" size="540,390" font="Regular;18" />
+ <!--widget source="text" render="Label" position="0,0" size="540,390" font="Regular;18" /-->
+ </screen>
<!-- Time & date input -->
<screen name="TimeDateInput" position="160,150" size="400,200" title="Time/Date Input">
<widget name="cancel" pixmap="skin_default/buttons/red.png" position="10,0" size="140,40" alphatest="on" />
diff --git a/data/skin_default/bar_snr.png b/data/skin_default/bar_snr.png
index 18050ed1..e4181c48 100644
--- a/data/skin_default/bar_snr.png
+++ b/data/skin_default/bar_snr.png
Binary files differ
diff --git a/data/skin_default/bottombar.png b/data/skin_default/bottombar.png
index 7bb023c9..cda483c3 100755
--- a/data/skin_default/bottombar.png
+++ b/data/skin_default/bottombar.png
Binary files differ
diff --git a/data/skin_default/icons/epgclock_add.png b/data/skin_default/icons/epgclock_add.png
new file mode 100644
index 00000000..487ac483
--- /dev/null
+++ b/data/skin_default/icons/epgclock_add.png
Binary files differ
diff --git a/data/skin_default/icons/epgclock_post.png b/data/skin_default/icons/epgclock_post.png
new file mode 100644
index 00000000..5716d99f
--- /dev/null
+++ b/data/skin_default/icons/epgclock_post.png
Binary files differ
diff --git a/data/skin_default/icons/epgclock_pre.png b/data/skin_default/icons/epgclock_pre.png
new file mode 100644
index 00000000..ff424637
--- /dev/null
+++ b/data/skin_default/icons/epgclock_pre.png
Binary files differ
diff --git a/data/skin_default/icons/epgclock_prepost.png b/data/skin_default/icons/epgclock_prepost.png
new file mode 100644
index 00000000..871b396e
--- /dev/null
+++ b/data/skin_default/icons/epgclock_prepost.png
Binary files differ
diff --git a/data/skin_default/icons/icon_view.png b/data/skin_default/icons/icon_view.png
new file mode 100644
index 00000000..988b4196
--- /dev/null
+++ b/data/skin_default/icons/icon_view.png
Binary files differ
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 10:02:08 +0000