From 0d73f32c0394d9fe11786a4666ecc7472823852f Mon Sep 17 00:00:00 2001 From: Hussam Eddin Alhomsi Date: Fri, 11 May 2018 12:23:31 +0300 Subject: [PATCH] Reorder the main windows' buttons & shortcuts (#3938) Puts Project notes after Controller rack. --- src/gui/MainWindow.cpp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 10f2442ec..384d88f09 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -561,33 +561,33 @@ void MainWindow::finalize() "for managing effects for your song. You can insert " "effects into different effect-channels." ) ); + ToolButton * controllers_window = new ToolButton( + embed::getIconPixmap( "controller" ), + tr( "Show/hide controller rack" ) + + " (F10)", + this, SLOT( toggleControllerRack() ), + m_toolBar ); + controllers_window->setShortcut( Qt::Key_F10 ); + ToolButton * project_notes_window = new ToolButton( embed::getIconPixmap( "project_notes" ), tr( "Show/hide project notes" ) + - " (F10)", + " (F11)", this, SLOT( toggleProjectNotesWin() ), m_toolBar ); - project_notes_window->setShortcut( Qt::Key_F10 ); + project_notes_window->setShortcut( Qt::Key_F11 ); project_notes_window->setWhatsThis( tr( "Click here to show or hide the " "project notes window. In this window you can put " "down your project notes.") ); - ToolButton * controllers_window = new ToolButton( - embed::getIconPixmap( "controller" ), - tr( "Show/hide controller rack" ) + - " (F11)", - this, SLOT( toggleControllerRack() ), - m_toolBar ); - controllers_window->setShortcut( Qt::Key_F11 ); - m_toolBarLayout->addWidget( song_editor_window, 1, 1 ); m_toolBarLayout->addWidget( bb_editor_window, 1, 2 ); m_toolBarLayout->addWidget( piano_roll_window, 1, 3 ); m_toolBarLayout->addWidget( automation_editor_window, 1, 4 ); m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 ); - m_toolBarLayout->addWidget( project_notes_window, 1, 6 ); - m_toolBarLayout->addWidget( controllers_window, 1, 7 ); + m_toolBarLayout->addWidget( controllers_window, 1, 6 ); + m_toolBarLayout->addWidget( project_notes_window, 1, 7 ); m_toolBarLayout->setColumnStretch( 100, 1 ); // setup-dialog opened before? @@ -1227,15 +1227,14 @@ void MainWindow::updateViewMenu() tr( "FX Mixer" ) + " (F9)", this, SLOT( toggleFxMixerWin() ) ); - m_viewMenu->addAction(embed::getIconPixmap( "project_notes" ), - tr( "Project Notes" ) + " (F10)", - this, SLOT( toggleProjectNotesWin() ) - ); m_viewMenu->addAction(embed::getIconPixmap( "controller" ), - tr( "Controller Rack" ) + - " (F11)", + tr( "Controller Rack" ) + " (F10)", this, SLOT( toggleControllerRack() ) ); + m_viewMenu->addAction(embed::getIconPixmap( "project_notes" ), + tr( "Project Notes" ) + " (F11)", + this, SLOT( toggleProjectNotesWin() ) + ); m_viewMenu->addSeparator();