diff options
| author | Eduardo Silva <edsiper@tuto.(none)> | 2007-01-04 19:29:14 (GMT) |
|---|---|---|
| committer | Eduardo Silva <edsiper@tuto.(none)> | 2007-01-04 19:29:14 (GMT) |
| commit | bcc4b4f34f511d56267a7250fc4f2fbdc1153ff1 (patch) | |
| tree | 59ed7170184ed76283acdd7355eb035e21bf93eb /shell | |
| parent | 15f586e61a14df45525fab91cc1c4adbb6a24c86 (diff) | |
| parent | 41ba004ca34eca5c9d1ab2d9c11ee8d7e877a2a6 (diff) | |
Merge branch 'master' of git://dev.laptop.org/sugar
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/view/Shell.py | 16 | ||||
| -rw-r--r-- | shell/view/dconmanager.py | 11 |
2 files changed, 15 insertions, 12 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 5bce107..f6d47fb 100644 --- a/shell/view/Shell.py +++ b/shell/view/Shell.py @@ -103,12 +103,22 @@ class Shell(gobject.GObject): elif key == 'F4': self.set_zoom_level(sugar.ZOOM_ACTIVITY) elif key == 'F5': - self._dcon_manager.decrease_brightness() + self._dcon_manager.set_brightness(0) + elif key == 'F16': + self._dcon_manager.set_brightness(3) elif key == 'F6': - self._dcon_manager.increase_brightness() + self._dcon_manager.set_brightness(5) + elif key == 'F17': + self._dcon_manager.set_brightness(7) elif key == 'F7': - self._dcon_manager.set_mode(DCONManager.COLOR_MODE) + self._dcon_manager.set_brightness(9) + elif key == 'F18': + self._dcon_manager.set_brightness(12) elif key == 'F8': + self._dcon_manager.set_brightness(15) + elif key == '<alt>F5': + self._dcon_manager.set_mode(DCONManager.COLOR_MODE) + elif key == '<alt>F8': self._dcon_manager.set_mode(DCONManager.BLACK_AND_WHITE_MODE) elif key == '<shft><alt>F9': self._frame.notify_key_press() diff --git a/shell/view/dconmanager.py b/shell/view/dconmanager.py index 2db626a..48fba73 100644 --- a/shell/view/dconmanager.py +++ b/shell/view/dconmanager.py @@ -32,12 +32,5 @@ class DCONManager(object): def set_mode(self, mode): self._service.set_mode(mode) - def increase_brightness(self): - level = self._service.get_backlight_level() - if level >= 0: - self._service.set_backlight_level(level + 1) - - def decrease_brightness(self): - level = self._service.get_backlight_level() - if level >= 0: - self._service.set_backlight_level(level - 1) + def set_brightness(self, level): + self._service.set_backlight_level(level) |