diff options
| author | rj <rj@rj> | 2013-09-28 23:51:49 +0200 |
|---|---|---|
| committer | rj <rj@rj> | 2013-09-28 23:51:49 +0200 |
| commit | 7a51c11f67beb782a326eea795079559f85face3 (patch) | |
| tree | ff63aaf2abb8b879d5c344720deca442257b123c | |
| parent | b9cbb99adfd5b6959ac4f9667f29b0bf48d4a9a1 (diff) | |
fixed conflicting shortcuts and made beat marks more gray
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | muse2/muse/shortcuts.cpp | 2 | ||||
| -rw-r--r-- | muse2/muse/widgets/view.cpp | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +28.09.2013: + - Changed default shortcut in PianoRoll for moving to current position from C to I + the former was conflicting with the default global shortcut for metronome (rj) +27.09.2013: + - Changed beat lines to a darker shade (rj) 02.09.2013: - Display git hash and date in the about box instead of svn revision (Orcan) - Bumped the year string to 2013 in the about box diff --git a/muse2/muse/shortcuts.cpp b/muse2/muse/shortcuts.cpp index fdf021ff..83e5541a 100644 --- a/muse2/muse/shortcuts.cpp +++ b/muse2/muse/shortcuts.cpp @@ -192,7 +192,7 @@ void initShortCuts() defShrt(SHRT_DEC_POS, Qt::CTRL + Qt::Key_Left, QT_TRANSLATE_NOOP("shortcuts", "Edit: Decrease event position"), PROLL_SHRT + DEDIT_SHRT + WAVE_SHRT, "sel_dec_pos"); defShrt(SHRT_ZOOM_IN, Qt::CTRL + Qt::Key_PageUp, QT_TRANSLATE_NOOP("shortcuts", "View: Zoom in"), PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT + WAVE_SHRT, "zoom_in"); defShrt(SHRT_ZOOM_OUT, Qt::CTRL + Qt::Key_PageDown, QT_TRANSLATE_NOOP("shortcuts", "View: Zoom out"), PROLL_SHRT + DEDIT_SHRT + ARRANG_SHRT + WAVE_SHRT, "zoom_out"); - defShrt(SHRT_GOTO_CPOS, Qt::Key_C, QT_TRANSLATE_NOOP("shortcuts", "View: Goto Current Position"), PROLL_SHRT + DEDIT_SHRT + WAVE_SHRT, "goto_cpos"); + defShrt(SHRT_GOTO_CPOS, Qt::Key_I, QT_TRANSLATE_NOOP("shortcuts", "View: Goto Current Position"), PROLL_SHRT + DEDIT_SHRT + WAVE_SHRT, "goto_cpos"); defShrt(SHRT_SCROLL_LEFT, Qt::Key_H, QT_TRANSLATE_NOOP("shortcuts", "View: Scroll left"), PROLL_SHRT + DEDIT_SHRT + WAVE_SHRT, "scroll_left"); defShrt(SHRT_SCROLL_RIGHT, Qt::Key_L, QT_TRANSLATE_NOOP("shortcuts", "View: Scroll left"), PROLL_SHRT + DEDIT_SHRT + WAVE_SHRT, "scroll_right"); diff --git a/muse2/muse/widgets/view.cpp b/muse2/muse/widgets/view.cpp index e8bb1d89..e100cc2a 100644 --- a/muse2/muse/widgets/view.cpp +++ b/muse2/muse/widgets/view.cpp @@ -654,7 +654,8 @@ void View::drawTickRaster(QPainter& p, int x, int y, int w, int h, int raster) } //xx = xxx; } - p.setPen(Qt::gray); + + p.setPen(Qt::darkGray); for (int beat = 1; beat < z; beat++) { ///int xx = AL::sigmap.bar2tick(bar, beat, 0); xx = mapx(AL::sigmap.bar2tick(bar, beat, 0)); |