From a89a915761942812fa54dbe6e5a330c4d23a63c3 Mon Sep 17 00:00:00 2001
From: Aleksey Lim <alsroot@sugarlabs.org>
Date: Mon, 01 Aug 2011 12:43:18 +0000
Subject: Polish new toolbars related code; use only one bar for Mini since there is plenty of space; update TODO

---
(limited to 'Edit')

diff --git a/Edit/MainWindow.py b/Edit/MainWindow.py
index b029bfb..98852db 100644
--- a/Edit/MainWindow.py
+++ b/Edit/MainWindow.py
@@ -403,8 +403,6 @@ class MainWindow(gtk.EventBox):
             generate_toolbar_button.show()
             self.activity.toolbox.toolbar.insert(generate_toolbar_button, -1)
 
-            self.activity.add_stop_button()
-            
             main_toolbar_button.set_expanded(True)
         else:
             self._mainToolbar = mainToolbar(self)
@@ -1499,8 +1497,10 @@ class MainWindow(gtk.EventBox):
     def handleKeyboardShortcuts(self,event):
         keyval = event.keyval
 
-        if self.activity.activity_toolbar.title.is_focus():
-            return
+        if not Config.HAVE_TOOLBOX:
+            # TODO process for Config.HAVE_TOOLBOX as well
+            if self.activity.activity_toolbar.title.is_focus():
+                return
 
         # backspace and del keys
         if keyval == gtk.keysyms.Delete or keyval == gtk.keysyms.BackSpace:
--
cgit v0.9.1