Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--TamTamEdit.activity/Edit/MainWindow.py6
-rw-r--r--TamTamEdit.activity/TamTamEdit.py1
2 files changed, 5 insertions, 2 deletions
diff --git a/TamTamEdit.activity/Edit/MainWindow.py b/TamTamEdit.activity/Edit/MainWindow.py
index 0c9f125..ee0df21 100644
--- a/TamTamEdit.activity/Edit/MainWindow.py
+++ b/TamTamEdit.activity/Edit/MainWindow.py
@@ -380,7 +380,6 @@ class MainWindow( gtk.EventBox ):
self.createNewTune( None )
# Toolbar
- self.activity.activity_toolbar.keep.show()
self._mainToolbar = mainToolbar(self.activity.toolbox, self)
self._generateToolbar = generateToolbar(self.activity.toolbox, self)
self.activity.toolbox.add_toolbar(_('Compose'), self._mainToolbar)
@@ -1483,6 +1482,9 @@ class MainWindow( gtk.EventBox ):
def handleKeyboardShortcuts(self,event):
keyval = event.keyval
+ if self.activity.activity_toolbar.title.is_focus():
+ return
+
# backspace and del keys
if keyval == gtk.keysyms.Delete or keyval == gtk.keysyms.BackSpace:
if self.context == CONTEXT.PAGE: self.pageDelete()
@@ -1517,6 +1519,7 @@ class MainWindow( gtk.EventBox ):
def onKeyPress(self,widget,event):
+
self.handleKeyboardShortcuts(event)
Config.ModKeys.keyPress( event.hardware_keycode )
key = event.hardware_keycode
@@ -1647,6 +1650,7 @@ class MainWindow( gtk.EventBox ):
self.durUpdate = gobject.timeout_add( 25, self.durationUpdate )
def onKeyRelease(self,widget,event):
+
Config.ModKeys.keyRelease( event.hardware_keycode )
key = event.hardware_keycode
diff --git a/TamTamEdit.activity/TamTamEdit.py b/TamTamEdit.activity/TamTamEdit.py
index 8b85185..e5c830f 100644
--- a/TamTamEdit.activity/TamTamEdit.py
+++ b/TamTamEdit.activity/TamTamEdit.py
@@ -43,7 +43,6 @@ class TamTamEdit(activity.Activity):
self.activity_toolbar = self.toolbox.get_activity_toolbar()
self.activity_toolbar.share.hide()
- self.activity_toolbar.keep.hide()
self.toolbox.show()