diff options
Diffstat (limited to 'src/jarabe/view')
| -rw-r--r-- | src/jarabe/view/keyhandler.py | 76 | ||||
| -rw-r--r-- | src/jarabe/view/palettes.py | 76 |
2 files changed, 2 insertions, 150 deletions
diff --git a/src/jarabe/view/keyhandler.py b/src/jarabe/view/keyhandler.py index 5634ef4..0505c52 100644 --- a/src/jarabe/view/keyhandler.py +++ b/src/jarabe/view/keyhandler.py @@ -28,7 +28,6 @@ import gtk from sugar._sugarext import KeyGrabber -from jarabe.model import screen from jarabe.model import sound from jarabe.model import shell from jarabe.model import session @@ -37,9 +36,7 @@ from jarabe.model.shell import ShellModel from jarabe import config from jarabe.journal import journalactivity -_BRIGHTNESS_STEP = 2 _VOLUME_STEP = sound.VOLUME_STEP -_BRIGHTNESS_MAX = 15 _VOLUME_MAX = 100 _TABBING_MODIFIER = gtk.gdk.MOD1_MASK @@ -48,10 +45,6 @@ _actions_table = { 'F2' : 'zoom_group', 'F3' : 'zoom_home', 'F4' : 'zoom_activity', - 'F9' : 'brightness_down', - 'F10' : 'brightness_up', - '<alt>F9' : 'brightness_min', - '<alt>F10' : 'brightness_max', 'XF86AudioMute' : 'volume_mute', 'F11' : 'volume_down', 'XF86AudioLowerVolume' : 'volume_down', @@ -60,7 +53,6 @@ _actions_table = { '<alt>F11' : 'volume_min', '<alt>F12' : 'volume_max', '0x93' : 'frame', - '0xEB' : 'rotate', '<alt>Tab' : 'next_window', '<alt><shift>Tab' : 'previous_window', '<alt>Escape' : 'close_window', @@ -70,7 +62,6 @@ _actions_table = { '<alt><shift>q' : 'quit_emulator', 'XF86Search' : 'open_search', '<alt><shift>o' : 'open_search', - '<alt><shift>r' : 'rotate', '<alt><shift>s' : 'say_text', } @@ -81,7 +72,6 @@ SPEECH_DBUS_INTERFACE = 'org.laptop.Speech' class KeyHandler(object): def __init__(self, frame): self._frame = frame - self._screen_rotation = 0 self._key_pressed = None self._keycode_pressed = 0 self._keystate_pressed = 0 @@ -134,20 +124,6 @@ class KeyHandler(object): sound.set_volume(volume) sound.set_muted(volume == 0) - def _change_brightness(self, step=None, value=None): - if step is not None: - level = screen.get_display_brightness() + step - elif value is not None: - level = value - - level = min(max(0, level), _BRIGHTNESS_MAX) - - screen.set_display_brightness(level) - if level == 0: - screen.set_display_mode(screen.B_AND_W_MODE) - else: - screen.set_display_mode(screen.COLOR_MODE) - def _get_speech_proxy(self): if self._speech_proxy is None: bus = dbus.SessionBus() @@ -195,24 +171,12 @@ class KeyHandler(object): def handle_zoom_activity(self, event_time): shell.get_model().zoom_level = ShellModel.ZOOM_ACTIVITY - def handle_brightness_max(self, event_time): - self._change_brightness(value=_BRIGHTNESS_MAX) - - def handle_brightness_min(self, event_time): - self._change_brightness(value=0) - def handle_volume_max(self, event_time): self._change_volume(value=_VOLUME_MAX) def handle_volume_min(self, event_time): self._change_volume(value=0) - def handle_brightness_up(self, event_time): - self._change_brightness(step=_BRIGHTNESS_STEP) - - def handle_brightness_down(self, event_time): - self._change_brightness(step=-_BRIGHTNESS_STEP) - def handle_volume_mute(self, event_time): if sound.get_muted() is True: sound.set_muted(False) @@ -228,46 +192,6 @@ class KeyHandler(object): def handle_frame(self, event_time): self._frame.notify_key_press() - def handle_rotate(self, event_time): - """ - Handles rotation of the display (using xrandr) and of the d-pad. - - Notes: default mappings for keypad on MP - KP_Up 80 - KP_Right 85 - KP_Down 88 - KP_Left 83 - """ - - states = [ 'normal', 'left', 'inverted', 'right'] - keycodes = (80, 85, 88, 83, 80, 85, 88, 83) - keysyms = ("KP_Up", "KP_Right", "KP_Down", "KP_Left") - - self._screen_rotation -= 1 - self._screen_rotation %= 4 - - actual_keycodes = keycodes[self._screen_rotation:self._screen_rotation - + 4] - # code_pairs now contains a mapping of keycode -> keysym in the current - # orientation - code_pairs = zip(actual_keycodes, keysyms) - - # Using the mappings in code_pairs, we dynamically build up an xmodmap - # command to rotate the dpad keys. - argv = ['xmodmap'] - for arg in [('-e', 'keycode %i = %s' % p) for p in code_pairs]: - argv.extend(arg) - - # If either the xmodmap or xrandr command fails, check_call will fail - # with CalledProcessError, which we raise. - try: - subprocess.check_call(argv) - subprocess.check_call(['xrandr', '-o', - states[self._screen_rotation]]) - except OSError, e: - if e.errno != errno.EINTR: - raise - def handle_quit_emulator(self, event_time): session.get_session_manager().shutdown() diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py index 9d45eb5..317a15f 100644 --- a/src/jarabe/view/palettes.py +++ b/src/jarabe/view/palettes.py @@ -17,10 +17,9 @@ import os import statvfs from gettext import gettext as _ -import gconf import logging -import gobject +import gconf import gtk from sugar import env @@ -32,7 +31,6 @@ from sugar.graphics.xocolor import XoColor from sugar.activity import activityfactory from sugar.activity.activityhandle import ActivityHandle -from jarabe.model import bundleregistry from jarabe.model import shell from jarabe.view import launcher from jarabe.view.viewsource import setup_view_source @@ -107,11 +105,6 @@ class CurrentActivityPalette(BasePalette): class ActivityPalette(Palette): __gtype_name__ = 'SugarActivityPalette' - __gsignals__ = { - 'erase-activated' : (gobject.SIGNAL_RUN_FIRST, - gobject.TYPE_NONE, ([str])) - } - def __init__(self, activity_info): client = gconf.client_get_default() color = XoColor(client.get_string("/desktop/sugar/user/color")) @@ -122,17 +115,9 @@ class ActivityPalette(Palette): Palette.__init__(self, primary_text=activity_info.get_name(), icon=activity_icon) - registry = bundleregistry.get_registry() - - self._bundle = activity_info - self._bundle_id = activity_info.get_bundle_id() - self._version = activity_info.get_activity_version() - self._favorite = registry.is_bundle_favorite(self._bundle_id, - self._version) - xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(), style.COLOR_TRANSPARENT.get_svg())) - menu_item = MenuItem(text_label=_('Start'), + menu_item = MenuItem(text_label=_('Start new'), file_name=activity_info.get_icon(), xo_color=xo_color) menu_item.connect('activate', self.__start_activate_cb) @@ -141,46 +126,6 @@ class ActivityPalette(Palette): # TODO: start-with - self._favorite_item = MenuItem('') - self._favorite_icon = Icon(icon_name='emblem-favorite', - icon_size=gtk.ICON_SIZE_MENU) - self._favorite_item.set_image(self._favorite_icon) - self._favorite_item.connect('activate', - self.__change_favorite_activate_cb) - self.menu.append(self._favorite_item) - self._favorite_item.show() - - menu_item = MenuItem(_('Erase'), 'list-remove') - menu_item.connect('activate', self.__erase_activate_cb) - self.menu.append(menu_item) - menu_item.show() - - if not os.access(self._bundle.get_path(), os.W_OK): - menu_item.props.sensitive = False - - registry = bundleregistry.get_registry() - self._activity_changed_sid = registry.connect('bundle_changed', - self.__activity_changed_cb) - self._update_favorite_item() - - self.connect('destroy', self.__destroy_cb) - - def __destroy_cb(self, palette): - self.disconnect(self._activity_changed_sid) - - def _update_favorite_item(self): - label = self._favorite_item.child - if self._favorite: - label.set_text(_('Remove favorite')) - xo_color = XoColor('%s,%s' % (style.COLOR_WHITE.get_svg(), - style.COLOR_TRANSPARENT.get_svg())) - else: - label.set_text(_('Make favorite')) - client = gconf.client_get_default() - xo_color = XoColor(client.get_string("/desktop/sugar/user/color")) - - self._favorite_icon.props.xo_color = xo_color - def __start_activate_cb(self, menu_item): self.popdown(immediate=True) @@ -195,23 +140,6 @@ class ActivityPalette(Palette): handle = ActivityHandle(activity_id) activityfactory.create(self._bundle, handle) - def __change_favorite_activate_cb(self, menu_item): - registry = bundleregistry.get_registry() - registry.set_bundle_favorite(self._bundle_id, - self._version, - not self._favorite) - - def __activity_changed_cb(self, activity_registry, activity_info): - if activity_info.get_bundle_id() == self._bundle_id and \ - activity_info.get_activity_version() == self._version: - registry = bundleregistry.get_registry() - self._favorite = registry.is_bundle_favorite(self._bundle_id, - self._version) - self._update_favorite_item() - - def __erase_activate_cb(self, menu_item): - self.emit('erase-activated', self._bundle_id) - class JournalPalette(BasePalette): def __init__(self, home_activity): self._home_activity = home_activity |