From 5c2156bf6fb415e587f73629d1919db6ed499aaf Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Wed, 2 Apr 2014 17:34:55 +0000 Subject: [PATCH] Change default sidebar shortcuts from 'Alt+' to 'Ctrl+Shift+' so as to avoid clashes with menubar. --- ChangeLog | 2 ++ gui/mainwindow.cpp | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7c872b5d..d0b558599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -85,6 +85,8 @@ 52. Don't attempt to find Amarok or Clementine covers. 53. Don't hard-code artist name fixes, read from $install/tags/fixes.xml 54. Remove grouping of multiple-artist albums under 'Various Artists' +55. Change default sidebar shortcuts from 'Alt+' to 'Ctrl+Shift+' so as to + avoid clashes with menubar. 1.3.4 ----- diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index ab189d6be..6baae3d1a 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -341,24 +341,24 @@ MainWindow::MainWindow(QWidget *parent) collapseAllAction->setShortcut(Qt::ControlModifier+Qt::Key_Minus); int pageKey=Qt::Key_1; - showPlayQueueAction->setShortcut(Qt::AltModifier+Qt::Key_Q); - libraryTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); - albumsTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); - foldersTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); - playlistsTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + showPlayQueueAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+Qt::Key_Q); + libraryTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); + albumsTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); + foldersTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); + playlistsTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); #ifdef ENABLE_DYNAMIC - dynamicTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + dynamicTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); #endif #ifdef ENABLE_STREAMS - streamsTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + streamsTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); #endif #ifdef ENABLE_ONLINE_SERVICES - onlineTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + onlineTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); #endif #ifdef ENABLE_DEVICES_SUPPORT - devicesTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + devicesTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); #endif // ENABLE_DEVICES_SUPPORT - searchTabAction->setShortcut(Qt::AltModifier+nextKey(pageKey)); + searchTabAction->setShortcut(Qt::ControlModifier+Qt::ShiftModifier+nextKey(pageKey)); connectionsAction->setMenu(new QMenu(this)); connectionsGroup=new QActionGroup(connectionsAction->menu());