summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/arranger/pcanvas.cpp16
2 files changed, 14 insertions, 3 deletions
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)