From 6a5d00dea2201ac85d7bbae030cbc8abb8a97618 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Tue, 28 Dec 2010 21:52:36 +0000
Subject: fixed shift modifier issue when renaming parts.

---
 muse2/ChangeLog                 |  1 +
 muse2/muse/arranger/pcanvas.cpp | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'muse2')

diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index f407f58f..9a84de76 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -3,6 +3,7 @@
           issues during loading of projects (rj)
         - Commented out the comment placeholder text line in projectcreateimpl.cpp. It
           broke the compilation against Qt-4.7. (Orcan)
+        - Fixed the shift modifier issue in renaming parts in the arranger. (Orcan)
 27.12.2010:
         - Added a first try at project creation dialog, we'll see how much territory
           it covers, intentionally it's only used upon creation of a project, later 'Save As'
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 714e9a16..984d6eaa 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -1065,9 +1065,19 @@ Track* PartCanvas::y2Track(int y) const
 void PartCanvas::keyPress(QKeyEvent* event)
       {
       int key = event->key();
-      if (editMode) {
-            returnPressed();
-            return;
+      if (editMode)
+            {
+            if ( key == Qt::Key_Return || key == Qt::Key_Enter ) 
+                  {
+                  returnPressed();
+                  return;
+                  }
+            else if ( key == Qt::Key_Escape )
+                  {
+                  lineEditor->hide();
+                  editMode = false;
+                  return;
+                  }
             }
 
       if (event->modifiers() &  Qt::ShiftModifier)
-- 
cgit v1.2.3