From f16431335e038290eed5ab7db481383f35eb0952 Mon Sep 17 00:00:00 2001 From: Hugo Beauzee-Luyssen Date: Wed, 9 Dec 2009 14:30:16 +0100 Subject: [PATCH] Adding (editabke) keyboard shortcut for cut and default mouse mode. --- src/Commands/KeyboardShortcutHelper.cpp | 1 - src/Configuration/VLMCSettingsDefault.cpp | 2 +- src/GUI/MainWindow.cpp | 8 ++++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/Commands/KeyboardShortcutHelper.cpp b/src/Commands/KeyboardShortcutHelper.cpp index 63a1630a..7990a35d 100644 --- a/src/Commands/KeyboardShortcutHelper.cpp +++ b/src/Commands/KeyboardShortcutHelper.cpp @@ -9,7 +9,6 @@ KeyboardShortcutHelper::KeyboardShortcutHelper( const QString& name, QWidget* pa m_name( name ) { const SettingValue* set = SettingsManager::getInstance()->getValue( "keyboard_shortcut", name ); - qDebug() << set->get().toString(); setKey( QKeySequence( set->get().toString() ) ); connect( set, SIGNAL( changed( const QVariant& ) ), this, SLOT( shortcutUpdated( const QVariant& ) ) ); } diff --git a/src/Configuration/VLMCSettingsDefault.cpp b/src/Configuration/VLMCSettingsDefault.cpp index 527736fb..685fc69d 100644 --- a/src/Configuration/VLMCSettingsDefault.cpp +++ b/src/Configuration/VLMCSettingsDefault.cpp @@ -76,7 +76,7 @@ void VLMCSettingsDefault::loadKeyboardShortcutDefaults( const QString& part ) { SettingsManager* setMan = SettingsManager::getInstance(); - ADD_SHORTCUT( "Selection mode", "n" ); + ADD_SHORTCUT( "Default mode", "n" ); ADD_SHORTCUT( "Cut mode", "x" ); ADD_SHORTCUT( "Launch media preview", "Ctrl+Return" ); ADD_SHORTCUT( "Start render preview", "Space" ); diff --git a/src/GUI/MainWindow.cpp b/src/GUI/MainWindow.cpp index dcff28c1..b9966bc2 100644 --- a/src/GUI/MainWindow.cpp +++ b/src/GUI/MainWindow.cpp @@ -171,12 +171,14 @@ void MainWindow::createStatusBar() { // Mouse (default) tool QToolButton* mouseTool = new QToolButton( this ); + mouseTool->setAutoRaise( true ); mouseTool->setCheckable( true ); mouseTool->setIcon( QIcon( ":/images/mouse" ) ); m_ui.statusbar->addPermanentWidget( mouseTool ); // Cut/Split tool QToolButton* splitTool = new QToolButton( this ); + splitTool->setAutoRaise( true ); splitTool->setCheckable( true ); splitTool->setIcon( QIcon( ":/images/editcut" ) ); m_ui.statusbar->addPermanentWidget( splitTool ); @@ -188,6 +190,12 @@ void MainWindow::createStatusBar() toolButtonGroup->setExclusive( true ); mouseTool->setChecked( true ); + //Shortcut part: + KeyboardShortcutHelper* defaultModeShortcut = new KeyboardShortcutHelper( "Default mode", this ); + KeyboardShortcutHelper* cutModeShortcut = new KeyboardShortcutHelper( "Cut mode", this ); + connect( defaultModeShortcut, SIGNAL( activated() ), mouseTool, SLOT( click() ) ); + connect( cutModeShortcut, SIGNAL( activated() ), splitTool, SLOT( click() ) ); + connect( toolButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( toolButtonClicked( int ) ) ); -- GitLab