Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorDan Williams <dcbw@wireless-122.media.mit.edu>2007-01-09 19:21:47 (GMT)
committer Dan Williams <dcbw@wireless-122.media.mit.edu>2007-01-09 19:21:47 (GMT)
commit4853f68eaaac91793bd6fc38c4a02acd10cc980e (patch)
tree4bd3b3f8851601eb323b4b4b1b4bc59fa6d639aa /shell
parente14c928640ff992a065422975143d47c4ec5a1d3 (diff)
parentac090fa8e710de347b7ce3721caf07fd810bca55 (diff)
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
-rw-r--r--shell/view/Shell.py8
-rw-r--r--shell/view/frame/Frame.py27
2 files changed, 20 insertions, 15 deletions
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index d3153c1..8a3136c 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -105,8 +105,8 @@ class Shell(gobject.GObject):
self._key_grabber.grab('<alt>Tab')
# For non-OLPC machines
- self._key_grabber.grab('<shft><alt>F9')
- self._key_grabber.grab('<shft><alt>F10')
+ self._key_grabber.grab('<alt>f')
+ self._key_grabber.grab('<alt>o')
def _key_pressed_cb(self, grabber, key):
if key == 'F1':
@@ -139,9 +139,9 @@ class Shell(gobject.GObject):
self._hw_manager.set_display_mode(HardwareManager.B_AND_W_MODE)
elif key == '<alt>equal' or key == '<alt>0':
gobject.idle_add(self._show_console_cb)
- elif key == '<shft><alt>F9':
+ elif key == '<alt>f':
self._frame.notify_key_press()
- elif key == '<shft><alt>F10':
+ elif key == '<alt>o':
self.toggle_chat_visibility()
elif key == '0xDC': # Camera key
self._handle_camera_key()
diff --git a/shell/view/frame/Frame.py b/shell/view/frame/Frame.py
index aa22fc4..edf31bd 100644
--- a/shell/view/frame/Frame.py
+++ b/shell/view/frame/Frame.py
@@ -157,7 +157,7 @@ class Frame:
def __init__(self, shell):
self._windows = []
- self._active_menus = 0
+ self._hover_frame = False
self._shell = shell
self._mode = Frame.INACTIVE
@@ -256,25 +256,25 @@ class Frame:
panel.connect('enter-notify-event', self._enter_notify_cb)
panel.connect('leave-notify-event', self._leave_notify_cb)
- menu_shell = panel.get_menu_shell()
- menu_shell.connect('activated', self._menu_shell_activated_cb)
- menu_shell.connect('deactivated', self._menu_shell_deactivated_cb)
+ self._menu_shell = panel.get_menu_shell()
+ self._menu_shell.connect('activated',
+ self._menu_shell_activated_cb)
+ self._menu_shell.connect('deactivated',
+ self._menu_shell_deactivated_cb)
def _menu_shell_activated_cb(self, menu_shell):
- self._active_menus += 1
self._timeline.goto('slide_in', True)
def _menu_shell_deactivated_cb(self, menu_shell):
- self._active_menus -= 1
- if self._mode != Frame.STICKY:
+ if self._mode != Frame.STICKY and not self._hover_frame:
self._timeline.play('before_slide_out', 'slide_out')
def _enter_notify_cb(self, window, event):
- self._timeline.goto('slide_in', True)
+ self._enter_notify()
logging.debug('Frame._enter_notify_cb ' + str(self._mode))
def _drag_motion_cb(self, window, context, x, y, time):
- self._timeline.goto('slide_in', True)
+ self._enter_notify()
logging.debug('Frame._drag_motion_cb ' + str(self._mode))
return True
@@ -289,9 +289,14 @@ class Frame:
self._leave_notify()
logging.debug('Frame._leave_notify_cb ' + str(self._mode))
-
+
+ def _enter_notify(self):
+ self._hover_frame = True
+ self._timeline.goto('slide_in', True)
+
def _leave_notify(self):
- if self._active_menus == 0 and \
+ self._hover_frame = False
+ if not self._menu_shell.is_active() and \
(self._mode == Frame.HIDE_ON_LEAVE or \
self._mode == Frame.AUTOMATIC):
self._timeline.play('before_slide_out', 'slide_out')