git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2fa2790
)
make messagebox look better and translate it
author
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Thu, 24 Nov 2005 02:45:08 +0000
(
02:45
+0000)
committer
Stefan Pluecken
<stefan.pluecken@multimedia-labs.de>
Thu, 24 Nov 2005 02:45:08 +0000
(
02:45
+0000)
data/keymap.xml
patch
|
blob
|
history
data/skin.xml
patch
|
blob
|
history
lib/python/Screens/InfoBarGenerics.py
patch
|
blob
|
history
lib/python/Screens/MessageBox.py
patch
|
blob
|
history
po/Makefile
patch
|
blob
|
history
po/de.po
patch
|
blob
|
history
diff --git
a/data/keymap.xml
b/data/keymap.xml
index c6160b2dc6e36b90b15a0722d75c21e44e6a8b96..1275e2a5ad41cae2f6fe9bbf6670f03c276de30a 100644
(file)
--- a/
data/keymap.xml
+++ b/
data/keymap.xml
@@
-157,9
+157,12
@@
<key id="\x1b" mapto="cancel" flags="m" />
<!-- use this on rcu, ok? -->
<key id="\x1b" mapto="cancel" flags="m" />
<!-- use this on rcu, ok? -->
- <key id="KEY_OK" mapto="ok" flags="m" />
+ <key id="KEY_GREEN" mapto="ok" flags="m" />
+ <key id="KEY_OK" mapto="ok" flags="m" />
+ <key id="KEY_RED" mapto="cancel" flags="m" />
<key id="KEY_EXIT" mapto="cancel" flags="m" />
<key id="KEY_EXIT" mapto="cancel" flags="m" />
+
<key id="KEY_ENTER" mapto="ok" flags="m" />
<key id="KEY_ESC" mapto="cancel" flags="m" />
</map>
<key id="KEY_ENTER" mapto="ok" flags="m" />
<key id="KEY_ESC" mapto="cancel" flags="m" />
</map>
diff --git
a/data/skin.xml
b/data/skin.xml
index d19e0fa3381e85d8478a2ee409ad086f81f709d7..66bcd202e923e8e6974228db981f40cbcf02d027 100644
(file)
--- a/
data/skin.xml
+++ b/
data/skin.xml
@@
-225,7
+225,9
@@
<eLabel position="500,40" size="220,60" text="help..." font="Arial;50" />
</screen>
<screen name="MessageBox" position="0,300" size="720,10" title="Message">
<eLabel position="500,40" size="220,60" text="help..." font="Arial;50" />
</screen>
<screen name="MessageBox" position="0,300" size="720,10" title="Message">
- <widget name="text" position="0,0" size="650,0" font="Arial;22" />
+ <widget name="text" position="0,35" size="650,0" font="Arial;22" />
+ <widget name="key_red" position="0,0" size="140,30" backgroundColor="red" font="Arial;21" />
+ <widget name="key_green" position="140,0" size="140,30" backgroundColor="green" font="Arial;21" />
<applet type="onLayoutFinish">
# this should be factored out into some helper code, but currently demonstrates applets.
from enigma import eSize, ePoint
<applet type="onLayoutFinish">
# this should be factored out into some helper code, but currently demonstrates applets.
from enigma import eSize, ePoint
@@
-236,7
+238,12
@@
textsize = self["text"].getSize()
# y size still must be fixed in font stuff...
textsize = (textsize[0], textsize[1] + 50)
# y size still must be fixed in font stuff...
textsize = (textsize[0], textsize[1] + 50)
-wsize = (textsize[0] + 50, textsize[1] + 50)
+wsizex = textsize[0] + 50
+wsizey = textsize[1] + 50
+if (280 > wsizex):
+ wsizex = 280
+wsize = (wsizex, wsizey)
+
# resize
self.instance.resize(eSize(*wsize))
# resize
self.instance.resize(eSize(*wsize))
diff --git
a/lib/python/Screens/InfoBarGenerics.py
b/lib/python/Screens/InfoBarGenerics.py
index a9f7754bc06b901df488d835f993603984724a5d..18ae105949fff07af66de2c153f72bb3b9c38104 100644
(file)
--- a/
lib/python/Screens/InfoBarGenerics.py
+++ b/
lib/python/Screens/InfoBarGenerics.py
@@
-430,9
+430,9
@@
class InfoBarInstantRecord:
return
if self.recording != None:
return
if self.recording != None:
- self.session.openWithCallback(self.recordQuestionCallback, MessageBox,
"Do you want to stop the current\n(instant) recording?"
)
+ self.session.openWithCallback(self.recordQuestionCallback, MessageBox,
_("Do you want to stop the current\n(instant) recording?")
)
else:
else:
- self.session.openWithCallback(self.recordQuestionCallback, MessageBox,
"Start recording?"
)
+ self.session.openWithCallback(self.recordQuestionCallback, MessageBox,
_("Start recording?")
)
from Screens.AudioSelection import AudioSelection
from Screens.AudioSelection import AudioSelection
diff --git
a/lib/python/Screens/MessageBox.py
b/lib/python/Screens/MessageBox.py
index bde31e835e8f91b4091f6dfacb8e58b111affaf4..872996571c4e68d3a88778efff2530247139d59f 100644
(file)
--- a/
lib/python/Screens/MessageBox.py
+++ b/
lib/python/Screens/MessageBox.py
@@
-1,18
+1,24
@@
from Screen import Screen
from Components.ActionMap import ActionMap
from Components.Label import Label
from Screen import Screen
from Components.ActionMap import ActionMap
from Components.Label import Label
+from Components.Button import Button
+from enigma import eSize, ePoint
class MessageBox(Screen):
def __init__(self, session, text):
Screen.__init__(self, session)
self["text"] = Label(text)
class MessageBox(Screen):
def __init__(self, session, text):
Screen.__init__(self, session)
self["text"] = Label(text)
+
+ self["key_green"] = Button("OK")
+ self["key_red"] = Button("Exit")
self["actions"] = ActionMap(["OkCancelActions"],
{
"cancel": self.cancel,
"ok": self.ok
})
self["actions"] = ActionMap(["OkCancelActions"],
{
"cancel": self.cancel,
"ok": self.ok
})
+
def cancel(self):
self.close(False)
def cancel(self):
self.close(False)
diff --git
a/po/Makefile
b/po/Makefile
index dfbb70046c98ac3b6edbd6d8dcc4f4939db348e6..9aabdeb19b03a68c7b7d9c5a898433307eff7208 100644
(file)
--- a/
po/Makefile
+++ b/
po/Makefile
@@
-37,6
+37,7
@@
enigma2.pot:
../lib/python/Screens/TimerEntry.py \
../lib/python/Screens/Wizard.py \
../lib/python/Screens/ServiceScan.py \
../lib/python/Screens/TimerEntry.py \
../lib/python/Screens/Wizard.py \
../lib/python/Screens/ServiceScan.py \
+ ../lib/python/Screens/InfoBarGenerics.py \
../lib/python/Components/ServiceScan.py \
../lib/python/Components/Lcd.py \
../lib/python/Components/SetupDevices.py \
../lib/python/Components/ServiceScan.py \
../lib/python/Components/Lcd.py \
../lib/python/Components/SetupDevices.py \
diff --git
a/po/de.po
b/po/de.po
index c05cc7f1793c42757a6d2f1be62b43f8eb72eaae..749b899bca167a71d1b5c71a5d1373b13491da4f 100644
(file)
--- a/
po/de.po
+++ b/
po/de.po
@@
-7,7
+7,7
@@
msgid ""
msgstr ""
"Project-Id-Version: tuxbox-enigma 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: tuxbox-enigma 0.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-2
3 12:33
+0100\n"
+"POT-Creation-Date: 2005-11-2
4 03:42
+0100\n"
"PO-Revision-Date: 2005-11-17 20:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"PO-Revision-Date: 2005-11-17 20:53+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@
-16,7
+16,7
@@
msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../lib/python/Screens/EventView.py:
58
+#: ../lib/python/Screens/EventView.py:
89
#, python-format
msgid "%d min"
msgstr ""
#, python-format
msgid "%d min"
msgstr ""
@@
-75,6
+75,10
@@
msgstr "Kapazitaet"
msgid "Channel"
msgstr "Kanal"
msgid "Channel"
msgstr "Kanal"
+#: ../lib/python/Screens/InfoBarGenerics.py:164
+msgid "Channel:"
+msgstr "Kanal:"
+
#: ../lib/python/Components/SetupDevices.py:21
msgid "Classic"
msgstr "klassisch"
#: ../lib/python/Components/SetupDevices.py:21
msgid "Classic"
msgstr "klassisch"
@@
-116,11
+120,11
@@
msgstr "Erkannte Festplatten"
msgid "Detected NIMs:"
msgstr "Erkannte Tuner:"
msgid "Detected NIMs:"
msgstr "Erkannte Tuner:"
-#: ../lib/python/Components/NimManager.py:3
79
+#: ../lib/python/Components/NimManager.py:3
86
msgid "DiSEqC A/B"
msgstr ""
msgid "DiSEqC A/B"
msgstr ""
-#: ../lib/python/Components/NimManager.py:3
79
+#: ../lib/python/Components/NimManager.py:3
86
msgid "DiSEqC A/B/C/D"
msgstr ""
msgid "DiSEqC A/B/C/D"
msgstr ""
@@
-140,12
+144,20
@@
msgstr "Aus"
msgid "Diseqcmode"
msgstr "Diseqcmodus"
msgid "Diseqcmode"
msgstr "Diseqcmodus"
+#: ../lib/python/Screens/InfoBarGenerics.py:433
+msgid ""
+"Do you want to stop the current\n"
+"(instant) recording?"
+msgstr ""
+"Die aktuelle Direktaufnahme\n"
+"abbrechen?"
+
#: ../lib/python/Components/ServiceScan.py:35
#, python-format
msgid "ERROR - failed to scan (%s)!"
msgstr "FEHLER - Suche fehlgeschlagen (%s)!"
#: ../lib/python/Components/ServiceScan.py:35
#, python-format
msgid "ERROR - failed to scan (%s)!"
msgstr "FEHLER - Suche fehlgeschlagen (%s)!"
-#: ../lib/python/Components/NimManager.py:3
86
+#: ../lib/python/Components/NimManager.py:3
93
msgid "East"
msgstr "Ost"
msgid "East"
msgstr "Ost"
@@
-235,7
+247,7
@@
msgstr "Breitengrad"
msgid "Linked to"
msgstr "Verbunden mit"
msgid "Linked to"
msgstr "Verbunden mit"
-#: ../lib/python/Components/NimManager.py:3
78
+#: ../lib/python/Components/NimManager.py:3
85
msgid "Linked tuner"
msgstr "Verbundene Tuner"
msgid "Linked tuner"
msgstr "Verbundene Tuner"
@@
-261,7
+273,7
@@
msgstr "Montag bis Freitag"
msgid "Monday"
msgstr "Montag"
msgid "Monday"
msgstr "Montag"
-#: ../lib/python/Components/NimManager.py:2
36
+#: ../lib/python/Components/NimManager.py:2
43
msgid "N/A"
msgstr "Nicht verfuegbar"
msgid "N/A"
msgstr "Nicht verfuegbar"
@@
-280,7
+292,7
@@
msgstr "Netzmaske"
msgid "None"
msgstr "Keins"
msgid "None"
msgstr "Keins"
-#: ../lib/python/Components/NimManager.py:3
88
+#: ../lib/python/Components/NimManager.py:3
95
msgid "North"
msgstr "Nord"
msgid "North"
msgstr "Nord"
@@
-304,7
+316,7
@@
msgstr ""
msgid "Port D"
msgstr ""
msgid "Port D"
msgstr ""
-#: ../lib/python/Components/NimManager.py:3
79
+#: ../lib/python/Components/NimManager.py:3
86
msgid "Positioner"
msgstr "Motor"
msgid "Positioner"
msgstr "Motor"
@@
-334,23
+346,23
@@
msgstr "Samstag"
msgid "Select channel to record from"
msgstr "Kanal auswahlen, von dem aufgenommen werden soll"
msgid "Select channel to record from"
msgstr "Kanal auswahlen, von dem aufgenommen werden soll"
-#: ../lib/python/Components/NimManager.py:3
78
+#: ../lib/python/Components/NimManager.py:3
85
msgid "Simple"
msgstr "Einfach"
msgid "Simple"
msgstr "Einfach"
-#: ../lib/python/Components/NimManager.py:3
79
+#: ../lib/python/Components/NimManager.py:3
86
msgid "Single"
msgstr "Einzeln"
msgid "Single"
msgstr "Einzeln"
-#: ../lib/python/Components/NimManager.py:39
2
+#: ../lib/python/Components/NimManager.py:39
9
msgid "Slot "
msgstr ""
msgid "Slot "
msgstr ""
-#: ../lib/python/Components/NimManager.py:
297
+#: ../lib/python/Components/NimManager.py:
304
msgid "Socket "
msgstr "Sockel "
msgid "Socket "
msgstr "Sockel "
-#: ../lib/python/Components/NimManager.py:3
88
+#: ../lib/python/Components/NimManager.py:3
95
msgid "South"
msgstr "Sued"
msgid "South"
msgstr "Sued"
@@
-358,6
+370,10
@@
msgstr "Sued"
msgid "Start"
msgstr ""
msgid "Start"
msgstr ""
+#: ../lib/python/Screens/InfoBarGenerics.py:435
+msgid "Start recording?"
+msgstr "Aufnahme beginnen?"
+
#: ../lib/python/Screens/TimerEntry.py:147
msgid "StartTime"
msgstr "Startzeit"
#: ../lib/python/Screens/TimerEntry.py:147
msgid "StartTime"
msgstr "Startzeit"
@@
-390,7
+406,7
@@
msgstr "Donnerstag"
msgid "TimerType"
msgstr "Timer-Art"
msgid "TimerType"
msgstr "Timer-Art"
-#: ../lib/python/Components/NimManager.py:3
79
+#: ../lib/python/Components/NimManager.py:3
86
msgid "Toneburst A/B"
msgstr ""
msgid "Toneburst A/B"
msgstr ""
@@
-414,7
+430,7
@@
msgstr ""
msgid "Type of scan"
msgstr "Art der Suche"
msgid "Type of scan"
msgstr "Art der Suche"
-#: ../lib/python/Components/NimManager.py:3
84
+#: ../lib/python/Components/NimManager.py:3
91
msgid "USALS"
msgstr ""
msgid "USALS"
msgstr ""
@@
-446,7
+462,7
@@
msgstr ""
"\n"
"Bitte zuerst eine Kanalsuche durchfuehren!"
"\n"
"Bitte zuerst eine Kanalsuche durchfuehren!"
-#: ../lib/python/Components/NimManager.py:3
86
+#: ../lib/python/Components/NimManager.py:3
93
msgid "West"
msgstr ""
msgid "West"
msgstr ""
@@
-462,7
+478,7
@@
msgstr ""
msgid "daily"
msgstr "taeglich"
msgid "daily"
msgstr "taeglich"
-#: ../lib/python/Components/NimManager.py:
299
+#: ../lib/python/Components/NimManager.py:
306
msgid "empty/unknown"
msgstr "leer/unbekannt"
msgid "empty/unknown"
msgstr "leer/unbekannt"
@@
-470,10
+486,14
@@
msgstr "leer/unbekannt"
msgid "horizontal"
msgstr ""
msgid "horizontal"
msgstr ""
-#: ../lib/python/Components/NimManager.py:3
84
+#: ../lib/python/Components/NimManager.py:3
91
msgid "manual"
msgstr "manuell"
msgid "manual"
msgstr "manuell"
+#: ../lib/python/Screens/InfoBarGenerics.py:260
+msgid "next channel"
+msgstr "n?chster Kanal"
+
#: ../lib/python/Screens/ScanSetup.py:196
#: ../lib/python/Screens/TimerEntry.py:94
#: ../lib/python/Components/Network.py:134
#: ../lib/python/Screens/ScanSetup.py:196
#: ../lib/python/Screens/TimerEntry.py:94
#: ../lib/python/Components/Network.py:134
@@
-504,6
+524,10
@@
msgstr "an"
msgid "once"
msgstr "einmalig"
msgid "once"
msgstr "einmalig"
+#: ../lib/python/Screens/InfoBarGenerics.py:261
+msgid "previous channel"
+msgstr "vorheriger Kanal"
+
#: ../lib/python/Screens/TimerEntry.py:79
msgid "repeated"
msgstr "wiederholend"
#: ../lib/python/Screens/TimerEntry.py:79
msgid "repeated"
msgstr "wiederholend"
@@
-525,7
+549,11
@@
msgstr ""
msgid "scan state"
msgstr "Status"
msgid "scan state"
msgstr "Status"
-#: ../lib/python/Screens/EventView.py:43
+#: ../lib/python/Screens/InfoBarGenerics.py:303
+msgid "show EPG..."
+msgstr "zeige EPG..."
+
+#: ../lib/python/Screens/EventView.py:73
msgid "unknown service"
msgstr "unbekannter Service"
msgid "unknown service"
msgstr "unbekannter Service"