aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-11-10 02:08:03 +0000
committerStefan Pluecken <stefan.pluecken@multimedia-labs.de>2005-11-10 02:08:03 +0000
commit7f56f0647d4cb7e1ea77fca1af0d8c5999e5d880 (patch)
tree74eb48f2dd1a2ef9feac4cb8eab729c91a6bed50 /lib/python
parentda38af8cb692a5ea3125755e7a4e887f23864593 (diff)
downloadenigma2-7f56f0647d4cb7e1ea77fca1af0d8c5999e5d880.tar.gz
enigma2-7f56f0647d4cb7e1ea77fca1af0d8c5999e5d880.zip
use mute.png for volume muting
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/InfoBar.py12
-rw-r--r--lib/python/Screens/Makefile.am2
-rw-r--r--lib/python/Screens/Mute.py7
-rw-r--r--lib/python/Screens/__init__.py2
4 files changed, 17 insertions, 6 deletions
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 2dc7fcee..9892e40b 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -11,6 +11,7 @@ from Components.config import configfile
from Screens.MessageBox import MessageBox
from Screens.MovieSelection import MovieSelection
from Screens.Volume import Volume
+from Screens.Mute import Mute
from enigma import *
@@ -34,6 +35,7 @@ class InfoBar(Screen):
self.state = self.STATE_HIDDEN
self.volumeDialog = self.session.instantiateDialog(Volume)
+ self.muteDialog = self.session.instantiateDialog(Mute)
self.hideTimer = eTimer()
self.hideTimer.timeout.get().append(self.doTimerHide)
@@ -144,11 +146,13 @@ class InfoBar(Screen):
def volMute(self):
eDVBVolumecontrol.getInstance().volumeToggleMute()
- #self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume())
- self.volumeDialog.instance.show()
self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume())
- self.hideVolTimer.start(3000)
-
+
+ if (eDVBVolumecontrol.getInstance().isMuted()):
+ self.muteDialog.instance.show()
+ else:
+ self.muteDialog.instance.hide()
+
def quit(self):
configfile.save()
quitMainloop()
diff --git a/lib/python/Screens/Makefile.am b/lib/python/Screens/Makefile.am
index b300d879..f77e1524 100644
--- a/lib/python/Screens/Makefile.am
+++ b/lib/python/Screens/Makefile.am
@@ -4,4 +4,4 @@ install_PYTHON = \
ChannelSelection.py ClockDisplay.py ConfigMenu.py InfoBar.py Menu.py \
MessageBox.py ScartLoopThrough.py Screen.py ServiceScan.py TimerEdit.py \
MovieSelection.py Setup.py About.py HarddiskSetup.py FixedMenu.py \
- Satconfig.py ScanSetup.py NetworkSetup.py Ci.py TimerEntry.py Volume.py __init__.py
+ Satconfig.py ScanSetup.py NetworkSetup.py Ci.py TimerEntry.py Volume.py Mute.py __init__.py
diff --git a/lib/python/Screens/Mute.py b/lib/python/Screens/Mute.py
new file mode 100644
index 00000000..7f4f52da
--- /dev/null
+++ b/lib/python/Screens/Mute.py
@@ -0,0 +1,7 @@
+from Screen import Screen
+from Components.VolumeBar import VolumeBar
+
+class Mute(Screen):
+ def __init__(self, session):
+ Screen.__init__(self, session)
+
diff --git a/lib/python/Screens/__init__.py b/lib/python/Screens/__init__.py
index dfb78a63..fd5811c4 100644
--- a/lib/python/Screens/__init__.py
+++ b/lib/python/Screens/__init__.py
@@ -2,4 +2,4 @@ __all__ = ["ChannelSelection", "ClockDisplay", "ConfigMenu",
"InfoBar", "MessageBox", "Menu", "MovieSelection",
"ScartLoopThrough", "Screen", "ServiceScan", "About",
"TimerEdit", "Setup", "HarddiskSetup", "FixedMenu",
- "Satconfig", "Scanconfig", "Ci.py", "Volume.py" ]
+ "Satconfig", "Scanconfig", "Ci.py", "Volume.py", "Mute.py" ]