summaryrefslogtreecommitdiff
path: root/muse2/muse
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-10-05 20:52:49 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-10-05 20:52:49 +0000
commitb936d9e9af142158c01d984d4fc9c47717148a35 (patch)
tree518fd224c6f9d4d13c173aa5883349db3ce5b133 /muse2/muse
parentad507206af844ea5f9ca0b89726a92e159fc9c8c (diff)
more SigEdit
Diffstat (limited to 'muse2/muse')
-rw-r--r--muse2/muse/master/lmaster.cpp15
-rw-r--r--muse2/muse/master/lmaster.h3
2 files changed, 17 insertions, 1 deletions
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index ce6010c7..a64d444f 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -1063,5 +1063,18 @@ void LMaster::initShortcuts()
void LMaster::comboboxTimerSlot()
{
- key_editor->showPopup();
+ key_editor->showPopup();
}
+
+//void LMaster::keyPressEvent(QKeyEvent*ev)
+//{
+// switch (ev->key()) {
+// case Qt::Key_Return:
+// // add return as a valid action for editing values too
+// cmd (CMD_EDIT_VALUE);
+// break;
+// default:
+// break;
+// }
+// MidiEditor::keyPressEvent(ev);
+//}
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index 4d2c03e9..66acff47 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -152,6 +152,9 @@ class LMaster : public MidiEditor {
QAction *tempoAction, *signAction, *posAction, *valAction, *delAction, *keyAction;
+// protected:
+// virtual void keyPressEvent(QKeyEvent*);
+
private slots:
void select(QTreeWidgetItem*, QTreeWidgetItem*);
void itemDoubleClicked(QTreeWidgetItem* item);