diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-15 22:55:59 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2006-01-15 22:55:59 +0000 |
| commit | 49b1d6023e84aa49b29bc0c0cd2e293b3a7e360c (patch) | |
| tree | 6fe30d26a34fab1e7b42ad2d4f00b6f3eebcb6e6 | |
| parent | 2d5b15f3ca1f7f92f949906d0199f9266d845e31 (diff) | |
| download | enigma2-49b1d6023e84aa49b29bc0c0cd2e293b3a7e360c.tar.gz enigma2-49b1d6023e84aa49b29bc0c0cd2e293b3a7e360c.zip | |
add a global ActionMap
make volumeActions global
| -rw-r--r-- | GlobalActions.py | 4 | ||||
| -rw-r--r-- | data/keymap.xml | 2 | ||||
| -rw-r--r-- | data/skin.xml | 5 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 15 |
4 files changed, 15 insertions, 11 deletions
diff --git a/GlobalActions.py b/GlobalActions.py new file mode 100644 index 00000000..4c5d05de --- /dev/null +++ b/GlobalActions.py @@ -0,0 +1,4 @@ +from Components.ActionMap import ActionMap + +globalActionMap = ActionMap( ["GlobalActions"] ) +globalActionMap.execBegin() diff --git a/data/keymap.xml b/data/keymap.xml index b7ea52b2..39ded6a8 100644 --- a/data/keymap.xml +++ b/data/keymap.xml @@ -108,7 +108,7 @@ <key id="KEY_GREEN" mapto="subserviceSelection" flags="m" /> </map> - <map context="InfobarVolumeActions"> + <map context="GlobalActions"> <key id="KEY_VOLUMEUP" mapto="volumeUp" flags="mr" /> <key id="KEY_VOLUMEDOWN" mapto="volumeDown" flags="mr" /> <key id="KEY_MUTE" mapto="volumeMute" flags="mr" /> diff --git a/data/skin.xml b/data/skin.xml index a9398fd7..bac9742a 100644 --- a/data/skin.xml +++ b/data/skin.xml @@ -214,12 +214,11 @@ <screen name="MinuteInput" position="200,140" size="280,60" title="Seek"> <widget name="minutes" position="80,15" size="160,25" halign="right" font="Regular;23" /> </screen> - <screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume"> + <screen name="Volume" flags="wfNoBorder" position="450,50" size="180,60" title="Volume" zPosition="99" > <ePixmap position="0,0" zPosition="0" size="180,60" pixmap="/usr/share/enigma2/volumeslider-fs8.png" /> - <widget name="Volume" zPosition="1" position="8,38" size="164,11" backgroundColor="dark" /> </screen> - <screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute"> + <screen name="Mute" flags="wfNoBorder" position="100,100" size="59,80" title="Mute" zPosition="99" > <ePixmap position="0,0" size="59,80" pixmap="/usr/share/enigma2/mute-fs8.png" /> </screen> <screen name="Dish" flags="wfNoBorder" position="300,100" size="100,107" title="Dish"> diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index de12c093..a627cdb4 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -38,20 +38,21 @@ from Components.config import config, currentConfigSelectionElement # hack alert! from Menu import MainMenu, mdom +from GlobalActions import globalActionMap + class InfoBarVolumeControl: """Volume control, handles volUp, volDown, volMute actions and display a corresponding dialog""" + def __init__(self): + global globalActionMap + globalActionMap.actions["volumeUp"]=self.volUp + globalActionMap.actions["volumeDown"]=self.volDown + globalActionMap.actions["volumeMute"]=self.volMute + config.audio = ConfigSubsection() config.audio.volume = configElement("config.audio.volume", configSequence, [100], configsequencearg.get("INTEGER", (0, 100))) - self["VolumeActions"] = ActionMap( ["InfobarVolumeActions"] , - { - "volumeUp": self.volUp, - "volumeDown": self.volDown, - "volumeMute": self.volMute, - }) - self.volumeDialog = self.session.instantiateDialog(Volume) self.muteDialog = self.session.instantiateDialog(Mute) |