mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

Made the toggle menubar key shortcut work when the menubar is hidden.

Browse Source
This commit is contained in:
Teo Mrnjavac
2012-08-04 18:58:45 +02:00
parent c1408213df
commit 4c136fc4fc
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/TomahawkWindow.cpp
View File

@@ -276,6 +276,11 @@ TomahawkWindow::setupToolBar()
compactMenuButton->setMenu( m_compactMainMenu ); compactMenuButton->setMenu( m_compactMainMenu );
compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly );
m_compactMenuAction = toolbar->addWidget( compactMenuButton ); m_compactMenuAction = toolbar->addWidget( compactMenuButton );
//HACK: adding the toggle action to the window, otherwise the shortcut keys
// won't be picked up when the menu is hidden.
// This must be done for all menu bar actions that have shortcut keys :(
// Does not apply to Mac which always shows the menu bar.
addAction( ActionCollection::instance()->getAction( "toggleMenuBar" ) );
#endif #endif
} }

3
src/libtomahawk/ActionCollection.cpp
View File

@@ -75,11 +75,13 @@ ActionCollection::initActions()
m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this );
m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this );
m_actionCollection[ "playPause" ]->setShortcut( Qt::Key_Space ); m_actionCollection[ "playPause" ]->setShortcut( Qt::Key_Space );
m_actionCollection[ "playPause" ]->setShortcutContext( Qt::ApplicationShortcut );
m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this );
m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this );
m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this );
m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this ); m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this );
m_actionCollection[ "quit" ]->setShortcut( QKeySequence::Quit ); m_actionCollection[ "quit" ]->setShortcut( QKeySequence::Quit );
m_actionCollection[ "quit" ]->setShortcutContext( Qt::ApplicationShortcut );
m_actionCollection[ "quit" ]->setMenuRole( QAction::QuitRole ); m_actionCollection[ "quit" ]->setMenuRole( QAction::QuitRole );
// connect actions to AudioEngine // connect actions to AudioEngine
@@ -105,6 +107,7 @@ ActionCollection::initActions()
#else #else
m_actionCollection[ "toggleMenuBar" ] = new QAction( tr( "Hide Menu Bar" ), this ); m_actionCollection[ "toggleMenuBar" ] = new QAction( tr( "Hide Menu Bar" ), this );
m_actionCollection[ "toggleMenuBar" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); m_actionCollection[ "toggleMenuBar" ]->setShortcut( QKeySequence( "Ctrl+M" ) );
m_actionCollection[ "toggleMenuBar" ]->setShortcutContext( Qt::ApplicationShortcut );
#endif #endif
m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this );
m_actionCollection[ "diagnostics" ]->setMenuRole( QAction::ApplicationSpecificRole ); m_actionCollection[ "diagnostics" ]->setMenuRole( QAction::ApplicationSpecificRole );