Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

shell/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = data hardware model view intro
+SUBDIRS = hardware model view intro
 
 bin_SCRIPTS = 				\
 	sugar-activity			\

shell/data/Makefile.am

@@ -1,7 +0,0 @@
-confdir = $(pkgdatadir)
-conf_DATA = kbdconfig
-
-imagedir = $(pkgdatadir)
-image_DATA = default-picture.png
-
-EXTRA_DIST = $(conf_DATA) $(image_DATA)

shell/data/kbdconfig

@@ -1,9 +0,0 @@
-# This is the sugar keyboard configuration for matchbox
-
-### Window operation short cuts 
-
-<Alt>n=next
-<Alt>p=prev
-<Alt>c=close
-
-<Alt>q=!sugar-emulator-shutdown

shell/intro/Makefile.am

@@ -1,3 +1,7 @@
+imagedir = $(pkgdatadir)/shell/intro
+image_DATA = default-picture.png
+
+EXTRA_DIST = $(conf_DATA) $(image_DATA)
 sugardir = $(pkgdatadir)/shell/intro
 sugar_PYTHON = \
 	__init__.py \

shell/intro/intro.py

@@ -143,7 +143,8 @@ class VideoBox(hippo.CanvasBox, hippo.CanvasItem):
         self._img_widget.props.widget = self._img
 
         if not has_webcam:
-            path = os.path.join(env.get_data_dir(),'default-picture.png')
+            path = os.path.join(os.path.dirname(__file__),
+                                'default-picture.png')
             self._video.load_image(path)
 
     def _clear_image_cb(self, widget, event):

shell/sugar-shell

@@ -36,7 +36,7 @@ logger.cleanup()
 logger.start('shell')
 
 if len(sys.argv) == 1:
-    sys.path.insert(0, os.path.join(env.get_data_dir(), 'shell'))
+    sys.path.insert(0, env.get_shell_path())
 
 from view.Shell import Shell
 from model.ShellModel import ShellModel

shell/view/keyhandler.py

@@ -1,3 +1,6 @@
+import os
+import signal
+
 import dbus
 import gobject
 
@@ -34,7 +37,8 @@ _actions_table = {
     '0xEB'          : 'rotate',
     '<alt>r'        : 'rotate',
     '0xEC'          : 'keyboard_brightness',
-    '<alt>Tab'      : 'home'
+    '<alt>Tab'      : 'home',
+    '<alt>q'        : 'quit_emulator',
 }
 
 class KeyHandler(object):
@@ -149,6 +153,11 @@ class KeyHandler(object):
         gobject.spawn_async(['xrandr', '-o', states[self._screen_rotation]],
                             flags=gobject.SPAWN_SEARCH_PATH)
 
+    def handle_quit_emulator(self):
+        if os.environ.has_key('SUGAR_EMULATOR_PID'):
+            pid = int(os.environ['SUGAR_EMULATOR_PID'])
+            os.kill(pid, signal.SIGTERM)
+
     def handle_home(self):
         # FIXME: finish alt+tab support
         pass