diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2011-04-09 21:25:50 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2011-04-09 21:25:50 +0000 |
| commit | f8220785a652ccff66fd46ebc440ac8071288511 (patch) | |
| tree | 587ce99a5ff77856512d5aad13e945da01a8bbf0 /muse2 | |
| parent | f08685a55d5090a2a22cb2808e788912cb739b99 (diff) | |
minor fixes
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/ChangeLog | 5 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 5 | ||||
| -rw-r--r-- | muse2/muse/widgets/canvas.cpp | 13 |
3 files changed, 11 insertions, 12 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 60efd357..ebbed9ff 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,4 +1,7 @@ -1.04.2011: +09.04.2011: + - No more sleep icon when cancelling a quit operation (rj) + - added Ctrl+Shift+LeftMouseButton to add entire rows to selection in all canvas editors (rj) +01.04.2011: - Fixed custom LADSPA DSSI GUI support. Tested OK with FLAM. Thanks to Luis Garrido for help. (Tim) 31.03.2011: * Feature: Support for custom LADSPA DSSI GUIs, such as those generated by FLAM. (p4.0.19 Tim) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 3ca47fbc..21a4f05f 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -1744,6 +1744,7 @@ void MusE::loadProjectFile1(const QString& name, bool songTemplate, bool loadAll if (!fi.isReadable()) { QMessageBox::critical(this, QString("MusE"), tr("Cannot read template")); + QApplication::restoreOverrideCursor(); return; } project.setFile("untitled"); @@ -2087,17 +2088,19 @@ void MusE::closeEvent(QCloseEvent* event) n = QMessageBox::warning(this, appName, tr("The current Project contains unsaved data\n" "Save Current Project?"), - tr("&Save"), tr("&Skip"), tr("&Abort"), 0, 2); + tr("&Save"), tr("&Skip"), tr("&Cancel"), 0, 2); if (n == 0) { if (!save()) // dont quit if save failed { event->ignore(); + QApplication::restoreOverrideCursor(); return; } } else if (n == 2) { event->ignore(); + QApplication::restoreOverrideCursor(); return; } } diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp index ff9d0c3b..596e4067 100644 --- a/muse2/muse/widgets/canvas.cpp +++ b/muse2/muse/widgets/canvas.cpp @@ -586,21 +586,14 @@ void Canvas::viewMousePressEvent(QMouseEvent* event) // Changed by T356. Alt is default reserved for moving the whole window in KDE. Changed to Shift-Alt. // Hmm, nope, shift-alt is also reserved sometimes. Must find a way to bypass, // why make user turn off setting? Left alone for now... - if (shift) + if (shift && !ctrl) drag = DRAG_COPY_START; else if (alt) { drag = DRAG_CLONE_START; } - // - //if (shift) - //{ - // if (alt) - // drag = DRAG_CLONE_START; - // else - // drag = DRAG_COPY_START; - //} else if (ctrl) { //Select all on the same pitch (e.g. same y-value) - deselectAll(); + if (!shift) + deselectAll(); //printf("Yes, ctrl and press\n"); for (iCItem i = items.begin(); i != items.end(); ++i) { if (i->second->y() == curItem->y() ) |