#4903 Use helper function for action shortcut everywhere

This commit is contained in:
Magne Sjaastad 2019-10-25 12:48:17 +02:00
parent f2d5adca60
commit 29c3ce0d06
8 changed files with 20 additions and 13 deletions

View File

@ -70,5 +70,6 @@ void RicExitApplicationFeature::onActionTriggered( bool isChecked )
void RicExitApplicationFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "E&xit" );
actionToSetup->setShortcut( QKeySequence::Quit );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Quit );
}

View File

@ -266,5 +266,6 @@ void RicHelpOpenUsersGuideFeature::onActionTriggered( bool isChecked )
void RicHelpOpenUsersGuideFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "&Users Guide" );
actionToSetup->setShortcut( QKeySequence::HelpContents );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::HelpContents );
}

View File

@ -69,5 +69,6 @@ void RicOpenProjectFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Open Project" );
actionToSetup->setIcon( QIcon( ":/openFolder24x24.png" ) );
actionToSetup->setShortcuts( QKeySequence::Open );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Open );
}

View File

@ -92,5 +92,6 @@ void RicSaveProjectAsFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Save Project &As" );
actionToSetup->setIcon( QIcon( ":/Save.png" ) );
actionToSetup->setShortcuts( QKeySequence::SaveAs );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::SaveAs );
}

View File

@ -101,7 +101,8 @@ void RicSaveProjectFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "&Save Project" );
actionToSetup->setIcon( QIcon( ":/Save.png" ) );
actionToSetup->setShortcuts( QKeySequence::Save );
applyShortcutWithHintToAction( actionToSetup, QKeySequence::Save );
}
//--------------------------------------------------------------------------------------------------

View File

@ -87,5 +87,6 @@ void RicCreatePlotFromTemplateByShortcutFeature::setupActionLook( QAction* actio
actionToSetup->setIcon( QIcon( ":/SummaryTemplate16x16.png" ) );
QKeySequence keySeq( Qt::CTRL + Qt::Key_T );
actionToSetup->setShortcut( keySeq );
applyShortcutWithHintToAction( actionToSetup, keySeq );
}

View File

@ -54,5 +54,6 @@ void RicActivateCurveFilterInToolbarFeature::onActionTriggered( bool isChecked )
void RicActivateCurveFilterInToolbarFeature::setupActionLook( QAction* actionToSetup )
{
actionToSetup->setText( "Activate Summary Curve Filter Editor" );
actionToSetup->setShortcut( QKeySequence( tr( "Ctrl+F" ) ) );
applyShortcutWithHintToAction( actionToSetup, QKeySequence( tr( "Ctrl+F" ) ) );
}

View File

@ -328,27 +328,27 @@ void RiuMainWindow::createActions()
// View actions
m_viewFromNorth = new QAction( QIcon( ":/SouthViewArrow.png" ), "Look South", this );
m_viewFromNorth->setToolTip( "Look South (Ctrl+Alt+S)" );
m_viewFromNorth->setShortcut( QKeySequence( tr( "Ctrl+Alt+S" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromNorth, QKeySequence( tr( "Ctrl+Alt+S" ) ) );
m_viewFromSouth = new QAction( QIcon( ":/NorthViewArrow.png" ), "Look North", this );
m_viewFromSouth->setToolTip( "Look North (Ctrl+Alt+N)" );
m_viewFromSouth->setShortcut( QKeySequence( tr( "Ctrl+Alt+N" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromSouth, QKeySequence( tr( "Ctrl+Alt+N" ) ) );
m_viewFromEast = new QAction( QIcon( ":/WestViewArrow.png" ), "Look West", this );
m_viewFromEast->setToolTip( "Look West (Ctrl+Alt+W)" );
m_viewFromEast->setShortcut( QKeySequence( tr( "Ctrl+Alt+W" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromEast, QKeySequence( tr( "Ctrl+Alt+W" ) ) );
m_viewFromWest = new QAction( QIcon( ":/EastViewArrow.png" ), "Look East", this );
m_viewFromWest->setToolTip( "Look East (Ctrl+Alt+E)" );
m_viewFromWest->setShortcut( QKeySequence( tr( "Ctrl+Alt+E" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromWest, QKeySequence( tr( "Ctrl+Alt+E" ) ) );
m_viewFromAbove = new QAction( QIcon( ":/DownViewArrow.png" ), "Look Down", this );
m_viewFromAbove->setToolTip( "Look Down (Ctrl+Alt+D)" );
m_viewFromAbove->setShortcut( QKeySequence( tr( "Ctrl+Alt+D" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromAbove, QKeySequence( tr( "Ctrl+Alt+D" ) ) );
m_viewFromBelow = new QAction( QIcon( ":/UpViewArrow.png" ), "Look Up", this );
m_viewFromBelow->setToolTip( "Look Up (Ctrl+Alt+U)" );
m_viewFromBelow->setShortcut( QKeySequence( tr( "Ctrl+Alt+U" ) ) );
caf::CmdFeature::applyShortcutWithHintToAction( m_viewFromBelow, QKeySequence( tr( "Ctrl+Alt+U" ) ) );
connect( m_viewFromNorth, SIGNAL( triggered() ), SLOT( slotViewFromNorth() ) );
connect( m_viewFromSouth, SIGNAL( triggered() ), SLOT( slotViewFromSouth() ) );