From b51b2917d0999ac214d1cc801cf7be4e493a9aab Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Wed, 15 Nov 2006 21:57:46 +0000
Subject: Rearrange keymappings for the real B1 machines' keyboards

(cherry picked from cda50cbf099f1db64f3cd95aeb05b54444fd66d0 commit)
---
diff --git a/README b/README
index 6b4c2b1..ee05be4 100644
--- a/README
+++ b/README
@@ -18,16 +18,16 @@ SUGAR_PROFILE=profile-2 sugar
 Key bindings
 ============
 
-F1     Activity zoom level
-F2     Home zoom level
-F3     Friends zoom level
-F4     Mesh zoom level
-F5     Show the frame
-F6     Open a terminal activity
-F7	   Toggle chat visibility
-F8     Color mode (DCON)
-F9     Black and white mode (DCON)
-F10    Decrease brightness (DCON)
-F11    Increase brightness (DCON)     	   
+F1     Mesh zoom level
+F2     Friends zoom level
+F3     Home zoom level
+F4     Activity zoom level
+F5     Decrease brightness (DCON)
+F6     Increase brightness (DCON)
+F7     Color mode (DCON)
+F8     Black and white mode (DCON)
+F9     Show the frame
+F10    Toggle chat visibility
+F11    Open a terminal activity
 F12    Open the log viewer
 Ctrl+S Activate sketch mode in chat
diff --git a/shell/view/Shell.py b/shell/view/Shell.py
index 98ed9d8..0bb4948 100644
--- a/shell/view/Shell.py
+++ b/shell/view/Shell.py
@@ -87,27 +87,27 @@ class Shell(gobject.GObject):
 
 	def __global_key_pressed_cb(self, grabber, key):
 		if key == 'F1':
-			self.set_zoom_level(sugar.ZOOM_ACTIVITY)
+			self.set_zoom_level(sugar.ZOOM_MESH)
 		elif key == 'F2':
-			self.set_zoom_level(sugar.ZOOM_HOME)
-		elif key == 'F3':
 			self.set_zoom_level(sugar.ZOOM_FRIENDS)
+		elif key == 'F3':
+			self.set_zoom_level(sugar.ZOOM_HOME)
 		elif key == 'F4':
-			self.set_zoom_level(sugar.ZOOM_MESH)
+			self.set_zoom_level(sugar.ZOOM_ACTIVITY)
 		elif key == 'F5':
-			self._frame.notify_key_press()
+			self._dcon_manager.decrease_brightness()
 		elif key == 'F6':
-			gobject.idle_add(self._open_terminal_cb)
+			self._dcon_manager.increase_brightness()
 		elif key == 'F7':
-			self.toggle_chat_visibility()
-		elif key == 'F8':
 			self._dcon_manager.set_mode(DCONManager.COLOR_MODE)
-		elif key == 'F9':
+		elif key == 'F8':
 			self._dcon_manager.set_mode(DCONManager.BLACK_AND_WHITE_MODE)
+		elif key == 'F9':
+			self._frame.notify_key_press()
 		elif key == 'F10':
-			self._dcon_manager.decrease_brightness()
+			self.toggle_chat_visibility()
 		elif key == 'F11':
-			self._dcon_manager.increase_brightness()
+			gobject.idle_add(self._open_terminal_cb)
 
 	def __global_key_released_cb(self, grabber, key):
 		if key == 'F5':
--
cgit v0.9.1