From cd0e9dcc2d12745d0f30f9b397ce74db4325693a Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 3 Aug 2012 21:46:23 +0200 Subject: [PATCH 1/8] Pulled the Network menu outside the main menu bar. This prepares the way for the compressed menu feature. --- src/TomahawkWindow.cpp | 44 +++++++++++++++++++++++++++++++++--------- src/TomahawkWindow.h | 5 +++++ src/TomahawkWindow.ui | 8 -------- 3 files changed, 40 insertions(+), 17 deletions(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 7949baa62..8ad0974d9 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #include "accounts/AccountManager.h" #include "sourcetree/SourceTreeView.h" @@ -116,6 +117,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) ui->centralWidget->setContentsMargins( 0, 0, 0, 0 ); TomahawkUtils::unmarginLayout( ui->centralWidget->layout() ); + setupAccountsMenu(); setupToolBar(); setupSideBar(); statusBar()->addPermanentWidget( m_audioControls, 1 ); @@ -235,9 +237,9 @@ TomahawkWindow::setupToolBar() m_forwardAction = toolbar->addAction( QIcon( RESPATH "images/forward.png" ), tr( "Forward" ), ViewManager::instance(), SLOT( historyForward() ) ); m_forwardAction->setToolTip( tr( "Go forward one page" ) ); - QWidget* spacer = new QWidget( this ); - spacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); - toolbar->addWidget( spacer ); + QWidget* leftSpacer = new QWidget( this ); + leftSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + toolbar->addWidget( leftSpacer ); m_searchWidget = new QSearchField( this ); m_searchWidget->setPlaceholderText( tr( "Global Search..." ) ); @@ -246,6 +248,20 @@ TomahawkWindow::setupToolBar() connect( m_searchWidget, SIGNAL( returnPressed() ), this, SLOT( onFilterEdited() ) ); toolbar->addWidget( m_searchWidget ); + + QWidget* rightSpacer = new QWidget( this ); + rightSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); + toolbar->addWidget( rightSpacer ); + + QToolButton *accountsMenuButton = new QToolButton( toolbar ); + accountsMenuButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) ); + accountsMenuButton->setText( tr( "&Network" ) ); + accountsMenuButton->setMenu( m_menuAccounts ); + //TODO: when we decide if compressed menus go left or right, if they go right, make + // them pop up *inside* the main window. + accountsMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); + accountsMenuButton->setPopupMode( QToolButton::InstantPopup ); + toolbar->addWidget( accountsMenuButton ); } @@ -418,7 +434,7 @@ TomahawkWindow::setupSignals() connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) ); connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) ); connect( ui->actionLegalInfo, SIGNAL( triggered() ), SLOT( legalInfo() ) ); - connect( ui->actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) ); + connect( m_actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) ); connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) ); connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) ); connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() )); @@ -460,6 +476,16 @@ TomahawkWindow::setupSignals() connect( ViewManager::instance(), SIGNAL( historyForwardAvailable( bool ) ), SLOT( onHistoryForwardAvailable( bool ) ) ); } +void +TomahawkWindow::setupAccountsMenu() +{ + m_menuAccounts = new QMenu( this ); + m_actionToggleConnect = new QAction( tr( "Go &Online" ), + m_menuAccounts ); + m_menuAccounts->addAction( m_actionToggleConnect ); + m_menuAccounts->addSeparator(); +} + void TomahawkWindow::changeEvent( QEvent* e ) @@ -771,18 +797,18 @@ TomahawkWindow::addPeerManually() void TomahawkWindow::pluginMenuAdded( QMenu* menu ) { - ui->menuNetwork->addMenu( menu ); + m_menuAccounts->addMenu( menu ); } void TomahawkWindow::pluginMenuRemoved( QMenu* menu ) { - foreach ( QAction* action, ui->menuNetwork->actions() ) + foreach ( QAction* action, m_menuAccounts->actions() ) { if ( action->menu() == menu ) { - ui->menuNetwork->removeAction( action ); + m_menuAccounts->removeAction( action ); return; } } @@ -1074,14 +1100,14 @@ TomahawkWindow::onPlaybackLoading( const Tomahawk::result_ptr& result ) void TomahawkWindow::onAccountConnected() { - ui->actionToggleConnect->setText( tr( "Go &offline" ) ); + m_actionToggleConnect->setText( tr( "Go &offline" ) ); } void TomahawkWindow::onAccountDisconnected() { - ui->actionToggleConnect->setText( tr( "Go &online" ) ); + m_actionToggleConnect->setText( tr( "Go &online" ) ); } diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h index 7ee64cc5d..33155e311 100644 --- a/src/TomahawkWindow.h +++ b/src/TomahawkWindow.h @@ -154,6 +154,7 @@ private: void applyPlatformTweaks(); void setupSignals(); + void setupAccountsMenu(); //must be called before setupToolBar void setupToolBar(); void setupSideBar(); void setupUpdateCheck(); @@ -177,6 +178,10 @@ private: AnimatedSplitter* m_sidebar; JobStatusSortModel* m_jobsModel; + // Menus and menu actions: Accounts menu + QMenu *m_menuAccounts; + QAction *m_actionToggleConnect; + QAction* m_backAction; QAction* m_forwardAction; diff --git a/src/TomahawkWindow.ui b/src/TomahawkWindow.ui index 8b5207a00..786516cba 100644 --- a/src/TomahawkWindow.ui +++ b/src/TomahawkWindow.ui @@ -95,13 +95,6 @@ - - - &Network - - - - &Window @@ -118,7 +111,6 @@ - From 9d913a49aabd2bae01d13f285f7a87bdea145aad Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 10:13:21 +0200 Subject: [PATCH 2/8] Moved all menu actions to ActionCollection and removed menubar from .ui. This commit does several things: * remove the main menu from TomahawkWindow.ui * all menu actions are created in ActionCollection.cpp, and some are merged from the old menubar where they were duplicated * some menu actions are removed entirely * the menubar is generated and returned to TomahawkWindow from ActionCollection::createMenuBar, to minimize the risk of having unused actions in the future * "Legal Info..." becomes "Legal Information..." Please note that while I did my best to #ifdef relevant Windows and Mac chunks of code, and update and split existing #ifdefs where necessary, I have not been able to test those code paths. --- src/TomahawkWindow.cpp | 75 ++++++++----------- src/TomahawkWindow.ui | 54 -------------- src/libtomahawk/ActionCollection.cpp | 103 +++++++++++++++++++++++++-- src/libtomahawk/ActionCollection.h | 4 ++ 4 files changed, 131 insertions(+), 105 deletions(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 8ad0974d9..dbd0179f7 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -109,14 +109,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) #endif ui->setupUi( this ); - ui->menuApp->insertAction( ui->actionCreatePlaylist, ActionCollection::instance()->getAction( "togglePrivacy" ) ); - ui->menuApp->insertSeparator( ui->actionCreatePlaylist ); - applyPlatformTweaks(); ui->centralWidget->setContentsMargins( 0, 0, 0, 0 ); TomahawkUtils::unmarginLayout( ui->centralWidget->layout() ); + setMenuBar( ActionCollection::instance()->createMenuBar( this ) ); setupAccountsMenu(); setupToolBar(); setupSideBar(); @@ -128,8 +126,8 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) if ( qApp->arguments().contains( "--debug" ) ) { - ui->menu_Help->addSeparator(); - ui->menu_Help->addAction( "Crash now...", this, SLOT( crashNow() ) ); + connect( ActionCollection::instance()->getAction( "crashNow" ), SIGNAL( triggered() ), + this, SLOT( crashNow() ) ); } // set initial state @@ -311,21 +309,17 @@ TomahawkWindow::setupSideBar() ui->splitter->addWidget( ViewManager::instance()->widget() ); ui->splitter->setCollapsible( 1, false ); - ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() ); + ActionCollection::instance()->getAction( "showOfflineSources" ) + ->setChecked( TomahawkSettings::instance()->showOfflineSources() ); } void TomahawkWindow::setupUpdateCheck() { -#ifndef Q_OS_MAC - ui->menu_Help->insertSeparator( ui->actionAboutTomahawk ); -#endif - #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) - QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) ); - checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole ); - connect( checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); + connect( ActionCollection::instance()->getAction( "checkForUpdates" ), SIGNAL( triggered( bool ) ), + SLOT( checkForUpdates() ) ); #elif defined( Q_WS_WIN ) QUrl updaterUrl; @@ -339,9 +333,8 @@ TomahawkWindow::setupUpdateCheck() updater->SetNetworkAccessManager( TomahawkUtils::nam() ); updater->SetVersion( TomahawkUtils::appFriendlyVersion() ); - ui->menu_Help->addSeparator(); - QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check For Updates..." ) ); - connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) ); + connect( ActionCollection::instance()->getAction( "checkForUpdates" ), SIGNAL( triggered() ), + updater, SLOT( CheckNow() ) ); #endif } @@ -430,30 +423,22 @@ TomahawkWindow::setupSignals() connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( audioStopped() ) ); // + ActionCollection *ac = ActionCollection::instance(); // connect( ui->actionAddPeerManually, SIGNAL( triggered() ), SLOT( addPeerManually() ) ); - connect( ui->actionPreferences, SIGNAL( triggered() ), SLOT( showSettingsDialog() ) ); - connect( ui->actionDiagnostics, SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) ); - connect( ui->actionLegalInfo, SIGNAL( triggered() ), SLOT( legalInfo() ) ); + connect( ac->getAction( "preferences" ), SIGNAL( triggered() ), SLOT( showSettingsDialog() ) ); + connect( ac->getAction( "diagnostics" ), SIGNAL( triggered() ), SLOT( showDiagnosticsDialog() ) ); + connect( ac->getAction( "legalInfo" ), SIGNAL( triggered() ), SLOT( legalInfo() ) ); connect( m_actionToggleConnect, SIGNAL( triggered() ), AccountManager::instance(), SLOT( toggleAccountsConnected() ) ); - connect( ui->actionUpdateCollection, SIGNAL( triggered() ), SLOT( updateCollectionManually() ) ); - connect( ui->actionRescanCollection, SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) ); - connect( ui->actionLoadXSPF, SIGNAL( triggered() ), SLOT( loadSpiff() )); - connect( ui->actionCreatePlaylist, SIGNAL( triggered() ), SLOT( createPlaylist() )); - connect( ui->actionCreate_New_Station, SIGNAL( triggered() ), SLOT( createStation() )); - connect( ui->actionAboutTomahawk, SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) ); - connect( ui->actionExit, SIGNAL( triggered() ), qApp, SLOT( quit() ) ); - connect( ui->actionShowOfflineSources, SIGNAL( triggered() ), SLOT( showOfflineSources() ) ); - - connect( ui->actionPlay, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) ); - connect( ui->actionNext, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) ); - connect( ui->actionPrevious, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) ); + connect( ac->getAction( "updateCollection" ), SIGNAL( triggered() ), SLOT( updateCollectionManually() ) ); + connect( ac->getAction( "rescanCollection" ), SIGNAL( triggered() ), SLOT( rescanCollectionManually() ) ); + connect( ac->getAction( "loadXSPF" ), SIGNAL( triggered() ), SLOT( loadSpiff() )); + connect( ac->getAction( "aboutTomahawk" ), SIGNAL( triggered() ), SLOT( showAboutTomahawk() ) ); + connect( ac->getAction( "quit" ), SIGNAL( triggered() ), qApp, SLOT( quit() ) ); + connect( ac->getAction( "showOfflineSources" ), SIGNAL( triggered() ), SLOT( showOfflineSources() ) ); #if defined( Q_OS_MAC ) - connect( ui->actionMinimize, SIGNAL( triggered() ), SLOT( minimize() ) ); - connect( ui->actionZoom, SIGNAL( triggered() ), SLOT( maximize() ) ); -#else - ui->menuWindow->clear(); - ui->menuWindow->menuAction()->setVisible( false ); + connect( ac->getAction( "minimize" ), SIGNAL( triggered() ), SLOT( minimize() ) ); + connect( ac->getAction( "zoom" ), SIGNAL( triggered() ), SLOT( maximize() ) ); #endif // @@ -528,8 +513,8 @@ TomahawkWindow::showEvent( QShowEvent* e ) QMainWindow::showEvent( e ); #if defined( Q_OS_MAC ) - ui->actionMinimize->setDisabled( false ); - ui->actionZoom->setDisabled( false ); + ActionCollection::instance()->getAction( "minimize" )->setDisabled( false ); + ActionCollection::instance()->getAction( "zoom" )->setDisabled( false ); #endif } @@ -540,8 +525,8 @@ TomahawkWindow::hideEvent( QHideEvent* e ) QMainWindow::hideEvent( e ); #if defined( Q_OS_MAC ) - ui->actionMinimize->setDisabled( true ); - ui->actionZoom->setDisabled( true ); + ActionCollection::instance()->getAction( "minimize" )->setDisabled( true ); + ActionCollection::instance()->getAction( "zoom" )->setDisabled( true ); #endif } @@ -818,8 +803,10 @@ TomahawkWindow::pluginMenuRemoved( QMenu* menu ) void TomahawkWindow::showOfflineSources() { - m_sourcetree->showOfflineSources( ui->actionShowOfflineSources->isChecked() ); - TomahawkSettings::instance()->setShowOfflineSources( ui->actionShowOfflineSources->isChecked() ); + m_sourcetree->showOfflineSources( ActionCollection::instance() + ->getAction( "showOfflineSources" )->isChecked() ); + TomahawkSettings::instance()->setShowOfflineSources( ActionCollection::instance() + ->getAction( "showOfflineSources" )->isChecked() ); } @@ -1054,7 +1041,7 @@ TomahawkWindow::audioStarted() { m_audioRetryCounter = 0; - ui->actionPlay->setText( tr( "Pause" ) ); + ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) ); ActionCollection::instance()->getAction( "stop" )->setEnabled( true ); #ifdef Q_OS_WIN @@ -1074,7 +1061,7 @@ TomahawkWindow::audioFinished() void TomahawkWindow::audioPaused() { - ui->actionPlay->setText( tr( "Play" ) ); + ActionCollection::instance()->getAction( "playPause" )->setText( tr( "&Play" ) ); } diff --git a/src/TomahawkWindow.ui b/src/TomahawkWindow.ui index 786516cba..665100efb 100644 --- a/src/TomahawkWindow.ui +++ b/src/TomahawkWindow.ui @@ -61,60 +61,6 @@ - - - - 0 - 0 - 1000 - 20 - - - - - &Settings - - - - - - &Controls - - - - - - - - - - - - - - - - - - - &Window - - - - - - - &Help - - - - - - - - - - diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index bc6908e30..7bb74bb5b 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -3,6 +3,7 @@ * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2012, Jeff Mitchell * Copyright 2012, Leo Franchi + * Copyright 2012, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,14 +70,17 @@ ActionCollection::initActions() m_actionCollection[ "togglePrivacy" ] = privacyToggle; connect( m_actionCollection[ "togglePrivacy" ], SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection ); - m_actionCollection[ "loadPlaylist" ] = new QAction( tr( "&Load Playlist" ), this ); + m_actionCollection[ "loadPlaylist" ] = new QAction( tr( "&Load Playlist" ), this ); + m_actionCollection[ "loadPlaylist" ]->setShortcut( Qt::Key_Space ); m_actionCollection[ "renamePlaylist" ] = new QAction( tr( "&Rename Playlist" ), this ); - m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); - m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); - m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); - m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); - m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); - m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this ); + m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); + m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); + m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); + m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); + m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); + m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this ); + m_actionCollection[ "quit" ]->setShortcut( QKeySequence::Quit ); + m_actionCollection[ "quit" ]->setMenuRole( QAction::QuitRole ); // connect actions to AudioEngine AudioEngine *ae = AudioEngine::instance(); @@ -84,6 +88,91 @@ ActionCollection::initActions() connect( m_actionCollection[ "stop" ], SIGNAL( triggered() ), ae, SLOT( stop() ), Qt::UniqueConnection ); connect( m_actionCollection[ "previousTrack" ], SIGNAL( triggered() ), ae, SLOT( previous() ), Qt::UniqueConnection ); connect( m_actionCollection[ "nextTrack" ], SIGNAL( triggered() ), ae, SLOT( next() ), Qt::UniqueConnection ); + + // main menu actions + m_actionCollection[ "loadXSPF" ] = new QAction( tr( "Load &XSPF..." ), this ); + m_actionCollection[ "updateCollection" ] = new QAction( tr( "U&pdate Collection" ), this ); + m_actionCollection[ "rescanCollection" ] = new QAction( tr( "Fully &Rescan Collection" ), this ); + m_actionCollection[ "showOfflineSources" ] = new QAction( tr( "Show Offline Sources" ), this ); + m_actionCollection[ "showOfflineSources" ]->setCheckable( true ); + m_actionCollection[ "preferences" ] = new QAction( tr( "&Configure Tomahawk..." ), this ); + m_actionCollection[ "preferences" ]->setMenuRole( QAction::PreferencesRole ); + m_actionCollection[ "minimize" ] = new QAction( tr( "Minimize" ), this ); + m_actionCollection[ "minimize" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); + m_actionCollection[ "zoom" ] = new QAction( tr( "Zoom" ), this ); + m_actionCollection[ "zoom" ]->setShortcut( QKeySequence( "Meta+Ctrl+Z" ) ); + m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); + m_actionCollection[ "aboutTomahawk" ] = new QAction( tr( "About &Tomahawk..." ), this ); + m_actionCollection[ "aboutTomahawk" ]->setMenuRole( QAction::AboutRole ); + m_actionCollection[ "legalInfo" ] = new QAction( tr( "&Legal Information..." ), this ); +#if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) || defined( Q_WS_WIN ) + m_actionCollection[ "checkForUpdates" ] = new QAction( tr( "Check For Updates..." ), this ); + m_actionCollection[ "checkForUpdates" ]->setMenuRole( QAction::ApplicationSpecificRole ); +#endif + m_actionCollection[ "crashNow" ] = new QAction( "Crash now...", this ); +} + +QMenuBar * +ActionCollection::createMenuBar( QWidget *parent ) +{ + QMenuBar *menuBar = new QMenuBar( parent ); + + QMenu *controlsMenu = new QMenu( tr( "&Controls" ), menuBar ); + controlsMenu->addAction( m_actionCollection[ "playPause" ] ); + controlsMenu->addAction( m_actionCollection[ "previousTrack" ] ); + controlsMenu->addAction( m_actionCollection[ "nextTrack" ] ); + controlsMenu->addSeparator(); + controlsMenu->addAction( m_actionCollection[ "togglePrivacy" ] ); + controlsMenu->addAction( m_actionCollection[ "showOfflineSources" ] ); + controlsMenu->addSeparator(); + controlsMenu->addAction( m_actionCollection[ "loadXSPF" ] ); + controlsMenu->addAction( m_actionCollection[ "updateCollection" ] ); + controlsMenu->addAction( m_actionCollection[ "rescanCollection" ] ); + controlsMenu->addSeparator(); + controlsMenu->addAction( m_actionCollection[ "quit" ] ); + + QMenu *settingsMenu = new QMenu( tr( "&Settings" ), menuBar ); + settingsMenu->addAction( m_actionCollection[ "preferences" ] ); + + QMenu *windowMenu = new QMenu( tr( "&Window" ), menuBar ); + windowMenu->addAction( m_actionCollection[ "minimize" ] ); + windowMenu->addAction( m_actionCollection[ "zoom" ] ); + + QMenu *helpMenu = new QMenu( tr( "&Help" ), menuBar ); + helpMenu->addAction( m_actionCollection[ "diagnostics" ] ); + helpMenu->addAction( m_actionCollection[ "aboutTomahawk" ] ); + helpMenu->addAction( m_actionCollection[ "legalInfo" ] ); + + // Setup update check +#ifndef Q_OS_MAC + helpMenu->insertSeparator( m_actionCollection[ "aboutTomahawk" ] ); +#endif + +#if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) + helpMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); +#elif defined( Q_WS_WIN ) + helpMenu->addSeparator(); + helpMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); +#endif + if ( qApp->arguments().contains( "--debug" ) ) + { + helpMenu->addSeparator(); + helpMenu->addAction( m_actionCollection[ "crashNow" ] ); + } + + menuBar->addMenu( controlsMenu ); + menuBar->addMenu( settingsMenu ); +#if defined( Q_OS_MAC ) + menuBar->addMenu( windowMenu ); +#endif + menuBar->addMenu( helpMenu ); + return menuBar; +} + +QMenu * +ActionCollection::createCompressedMenu( QWidget *parent ) +{ + } diff --git a/src/libtomahawk/ActionCollection.h b/src/libtomahawk/ActionCollection.h index 378b13cba..aa24ba58f 100644 --- a/src/libtomahawk/ActionCollection.h +++ b/src/libtomahawk/ActionCollection.h @@ -24,6 +24,7 @@ #include "DllMacro.h" #include +#include class DLLEXPORT ActionCollection : public QObject { @@ -43,6 +44,9 @@ public: void initActions(); + QMenuBar *createMenuBar( QWidget *parent ); + QMenu *createCompressedMenu( QWidget *parent ); + QAction* getAction( const QString& name ); QList< QAction* > getAction( ActionDestination category ); QObject* actionNotifier( QAction* ); From 8ffe9019e3b2be94b581df99d8791034810481f4 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 14:50:19 +0200 Subject: [PATCH 3/8] Added support for hiding the menu bar and showing the compact menu. Except on Mac, where things should behave exactly as before. --- src/TomahawkWindow.cpp | 56 ++++++++++++++++++++++- src/TomahawkWindow.h | 14 +++++- src/libtomahawk/ActionCollection.cpp | 66 +++++++++++++++++++++++++--- src/libtomahawk/ActionCollection.h | 12 ++++- src/libtomahawk/TomahawkSettings.cpp | 18 ++++++++ src/libtomahawk/TomahawkSettings.h | 3 ++ 6 files changed, 158 insertions(+), 11 deletions(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index dbd0179f7..4ee3f6450 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -3,6 +3,7 @@ * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2012, Leo Franchi * Copyright 2010-2012, Jeff Mitchell + * Copyright 2012, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -114,7 +115,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) ui->centralWidget->setContentsMargins( 0, 0, 0, 0 ); TomahawkUtils::unmarginLayout( ui->centralWidget->layout() ); - setMenuBar( ActionCollection::instance()->createMenuBar( this ) ); + setupMenuBar(); setupAccountsMenu(); setupToolBar(); setupSideBar(); @@ -186,6 +187,14 @@ TomahawkWindow::loadSettings() setWindowOpacity( 1 ); } #endif + +#ifndef Q_OS_MAC + bool mbVisible = s->menuBarVisible(); + menuBar()->setVisible( mbVisible ); + m_compactMenuAction->setVisible( !mbVisible ); + ActionCollection::instance()->getAction( "toggleMenuBar" ) + ->setText( mbVisible ? tr( "Hide Menu Bar" ) : tr( "Show Menu Bar" ) ); +#endif } @@ -196,6 +205,7 @@ TomahawkWindow::saveSettings() s->setMainWindowGeometry( saveGeometry() ); s->setMainWindowState( saveState() ); s->setMainWindowSplitterState( ui->splitter->saveState() ); + s->setMenuBarVisible( menuBar()->isVisible() ); } @@ -218,7 +228,7 @@ TomahawkWindow::applyPlatformTweaks() void TomahawkWindow::setupToolBar() { - QToolBar* toolbar = addToolBar( "TomahawkToolbar" ); + QToolBar *toolbar = addToolBar( "TomahawkToolbar" ); toolbar->setObjectName( "TomahawkToolbar" ); toolbar->setMovable( false ); toolbar->setFloatable( false ); @@ -260,6 +270,16 @@ TomahawkWindow::setupToolBar() accountsMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); accountsMenuButton->setPopupMode( QToolButton::InstantPopup ); toolbar->addWidget( accountsMenuButton ); + +#ifndef Q_OS_MAC + QToolButton *compactMenuButton = new QToolButton( toolbar ); + compactMenuButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) ); + compactMenuButton->setText( tr( "&Main Menu" ) ); + compactMenuButton->setMenu( m_compactMainMenu ); + compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); + compactMenuButton->setPopupMode( QToolButton::InstantPopup ); + m_compactMenuAction = toolbar->addWidget( compactMenuButton ); +#endif } @@ -439,6 +459,8 @@ TomahawkWindow::setupSignals() #if defined( Q_OS_MAC ) connect( ac->getAction( "minimize" ), SIGNAL( triggered() ), SLOT( minimize() ) ); connect( ac->getAction( "zoom" ), SIGNAL( triggered() ), SLOT( maximize() ) ); +#else + connect( ac->getAction( "toggleMenuBar" ), SIGNAL( triggered() ), SLOT( toggleMenuBar() ) ); #endif // @@ -471,6 +493,16 @@ TomahawkWindow::setupAccountsMenu() m_menuAccounts->addSeparator(); } +void +TomahawkWindow::setupMenuBar() +{ + // Always create a menubar, but only create a compactMenu on Windows and X11 + m_menuBar = ActionCollection::instance()->createMenuBar( this ); + setMenuBar( m_menuBar ); +#ifndef Q_OS_MAC + m_compactMainMenu = ActionCollection::instance()->createCompactMenu( this ); +#endif +} void TomahawkWindow::changeEvent( QEvent* e ) @@ -1250,3 +1282,23 @@ TomahawkWindow::crashNow() { TomahawkUtils::crash(); } + +void +TomahawkWindow::toggleMenuBar() //SLOT +{ +#ifndef Q_OS_MAC + if( menuBar()->isVisible() ) + { + menuBar()->setVisible( false ); + ActionCollection::instance()->getAction( "toggleMenuBar" )->setText( tr( "Show Menu Bar" ) ); + m_compactMenuAction->setVisible( true ); + } + else + { + m_compactMenuAction->setVisible( false ); + ActionCollection::instance()->getAction( "toggleMenuBar" )->setText( tr( "Hide Menu Bar" ) ); + menuBar()->setVisible( true ); + } + saveSettings(); +#endif +} diff --git a/src/TomahawkWindow.h b/src/TomahawkWindow.h index 33155e311..b44fdba65 100644 --- a/src/TomahawkWindow.h +++ b/src/TomahawkWindow.h @@ -3,6 +3,7 @@ * Copyright 2010-2011, Christian Muehlhaeuser * Copyright 2010-2012, Leo Franchi * Copyright 2010-2011, Jeff Mitchell + * Copyright 2012, Teo Mrnjavac * * Tomahawk is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +27,7 @@ #include #include #include +#include #include "Result.h" #include "audio/AudioEngine.h" @@ -143,6 +145,8 @@ private slots: void crashNow(); + void toggleMenuBar(); + #ifdef Q_OS_WIN void audioStateChanged( AudioState newState, AudioState oldState ); void updateWindowsLoveButton(); @@ -155,6 +159,7 @@ private: void applyPlatformTweaks(); void setupSignals(); void setupAccountsMenu(); //must be called before setupToolBar + void setupMenuBar(); void setupToolBar(); void setupSideBar(); void setupUpdateCheck(); @@ -179,8 +184,13 @@ private: JobStatusSortModel* m_jobsModel; // Menus and menu actions: Accounts menu - QMenu *m_menuAccounts; - QAction *m_actionToggleConnect; + QMenu *m_menuAccounts; + QAction *m_actionToggleConnect; + QMenuBar *m_menuBar; +#ifndef Q_OS_MAC + QAction *m_compactMenuAction; + QMenu *m_compactMainMenu; +#endif QAction* m_backAction; QAction* m_forwardAction; diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 7bb74bb5b..73e295867 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -71,10 +71,10 @@ ActionCollection::initActions() connect( m_actionCollection[ "togglePrivacy" ], SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection ); m_actionCollection[ "loadPlaylist" ] = new QAction( tr( "&Load Playlist" ), this ); - m_actionCollection[ "loadPlaylist" ]->setShortcut( Qt::Key_Space ); m_actionCollection[ "renamePlaylist" ] = new QAction( tr( "&Rename Playlist" ), this ); m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); + m_actionCollection[ "playPause" ]->setShortcut( Qt::Key_Space ); m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); @@ -97,10 +97,15 @@ ActionCollection::initActions() m_actionCollection[ "showOfflineSources" ]->setCheckable( true ); m_actionCollection[ "preferences" ] = new QAction( tr( "&Configure Tomahawk..." ), this ); m_actionCollection[ "preferences" ]->setMenuRole( QAction::PreferencesRole ); +#ifdef Q_OS_MAC m_actionCollection[ "minimize" ] = new QAction( tr( "Minimize" ), this ); m_actionCollection[ "minimize" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); m_actionCollection[ "zoom" ] = new QAction( tr( "Zoom" ), this ); m_actionCollection[ "zoom" ]->setShortcut( QKeySequence( "Meta+Ctrl+Z" ) ); +#else + m_actionCollection[ "toggleMenuBar" ] = new QAction( tr( "Hide Menu Bar" ), this ); + m_actionCollection[ "toggleMenuBar" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); +#endif m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); m_actionCollection[ "aboutTomahawk" ] = new QAction( tr( "About &Tomahawk..." ), this ); m_actionCollection[ "aboutTomahawk" ]->setMenuRole( QAction::AboutRole ); @@ -132,12 +137,11 @@ ActionCollection::createMenuBar( QWidget *parent ) controlsMenu->addAction( m_actionCollection[ "quit" ] ); QMenu *settingsMenu = new QMenu( tr( "&Settings" ), menuBar ); +#ifndef Q_OS_MAC + settingsMenu->addAction( m_actionCollection[ "toggleMenuBar" ] ); +#endif settingsMenu->addAction( m_actionCollection[ "preferences" ] ); - QMenu *windowMenu = new QMenu( tr( "&Window" ), menuBar ); - windowMenu->addAction( m_actionCollection[ "minimize" ] ); - windowMenu->addAction( m_actionCollection[ "zoom" ] ); - QMenu *helpMenu = new QMenu( tr( "&Help" ), menuBar ); helpMenu->addAction( m_actionCollection[ "diagnostics" ] ); helpMenu->addAction( m_actionCollection[ "aboutTomahawk" ] ); @@ -163,6 +167,10 @@ ActionCollection::createMenuBar( QWidget *parent ) menuBar->addMenu( controlsMenu ); menuBar->addMenu( settingsMenu ); #if defined( Q_OS_MAC ) + QMenu *windowMenu = new QMenu( tr( "&Window" ), menuBar ); + windowMenu->addAction( m_actionCollection[ "minimize" ] ); + windowMenu->addAction( m_actionCollection[ "zoom" ] ); + menuBar->addMenu( windowMenu ); #endif menuBar->addMenu( helpMenu ); @@ -170,9 +178,55 @@ ActionCollection::createMenuBar( QWidget *parent ) } QMenu * -ActionCollection::createCompressedMenu( QWidget *parent ) +ActionCollection::createCompactMenu( QWidget *parent ) { + QMenu *compactMenu = new QMenu( tr( "Main Menu" ), parent ); + compactMenu->addAction( m_actionCollection[ "playPause" ] ); + compactMenu->addAction( m_actionCollection[ "previousTrack" ] ); + compactMenu->addAction( m_actionCollection[ "nextTrack" ] ); + compactMenu->addSeparator(); + compactMenu->addAction( m_actionCollection[ "togglePrivacy" ] ); + compactMenu->addAction( m_actionCollection[ "showOfflineSources" ] ); + compactMenu->addSeparator(); + compactMenu->addAction( m_actionCollection[ "loadXSPF" ] ); + compactMenu->addAction( m_actionCollection[ "updateCollection" ] ); + compactMenu->addAction( m_actionCollection[ "rescanCollection" ] ); + compactMenu->addSeparator(); + +#ifdef Q_OS_MAC // This should never happen anyway + compactMenu->addAction( m_actionCollection[ "minimize" ] ); + compactMenu->addAction( m_actionCollection[ "zoom" ] ); +#else + compactMenu->addAction( m_actionCollection[ "toggleMenuBar" ] ); +#endif + compactMenu->addAction( m_actionCollection[ "preferences" ] ); + compactMenu->addSeparator(); + + compactMenu->addAction( m_actionCollection[ "diagnostics" ] ); + compactMenu->addAction( m_actionCollection[ "aboutTomahawk" ] ); + compactMenu->addAction( m_actionCollection[ "legalInfo" ] ); + + // Setup update check +#ifndef Q_OS_MAC + compactMenu->insertSeparator( m_actionCollection[ "aboutTomahawk" ] ); +#endif + +#if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) + compactMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); +#elif defined( Q_WS_WIN ) + compactMenu->addSeparator(); + compactMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); +#endif + if ( qApp->arguments().contains( "--debug" ) ) + { + compactMenu->addSeparator(); + compactMenu->addAction( m_actionCollection[ "crashNow" ] ); + } + compactMenu->addSeparator(); + compactMenu->addAction( m_actionCollection[ "quit" ] ); + + return compactMenu; } diff --git a/src/libtomahawk/ActionCollection.h b/src/libtomahawk/ActionCollection.h index aa24ba58f..0de8f25cd 100644 --- a/src/libtomahawk/ActionCollection.h +++ b/src/libtomahawk/ActionCollection.h @@ -44,8 +44,18 @@ public: void initActions(); + /** + * This method returns a main menu bar, suitable for Windows, Mac and X11. + */ QMenuBar *createMenuBar( QWidget *parent ); - QMenu *createCompressedMenu( QWidget *parent ); + + /** + * Returns a QMenu with all the entries that would normally be in the main menu, + * arranged in a sensible way. The compressed menu makes absolutely no sense on Mac, + * and fairly little sense on Unity and other X11 desktop configurations which pull + * out the menu bar from the window. + */ + QMenu *createCompactMenu( QWidget *parent ); QAction* getAction( const QString& name ); QList< QAction* > getAction( ActionDestination category ); diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index e73105a54..d8bd1063c 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/src/libtomahawk/TomahawkSettings.cpp @@ -901,6 +901,24 @@ TomahawkSettings::setVerboseNotifications( bool notifications ) setValue( "ui/notifications/verbose", notifications ); } +bool +TomahawkSettings::menuBarVisible() const +{ +#ifndef Q_OS_MAC + return value( "ui/mainwindow/menuBarVisible", true ).toBool(); +#else + return true; +#endif +} + +void +TomahawkSettings::setMenuBarVisible( bool visible ) +{ +#ifndef Q_OS_MAC + setValue( "ui/mainwindow/menuBarVisible", visible ); +#endif +} + bool TomahawkSettings::showOfflineSources() const diff --git a/src/libtomahawk/TomahawkSettings.h b/src/libtomahawk/TomahawkSettings.h index 42fdac340..cfd43baeb 100644 --- a/src/libtomahawk/TomahawkSettings.h +++ b/src/libtomahawk/TomahawkSettings.h @@ -76,6 +76,9 @@ public: bool verboseNotifications() const; void setVerboseNotifications( bool notifications ); + bool menuBarVisible() const; + void setMenuBarVisible( bool visible ); + // Collection Stuff bool showOfflineSources() const; void setShowOfflineSources( bool show ); From fee87151d34f5a819237e88b23663f36923031da Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 15:37:16 +0200 Subject: [PATCH 4/8] Use the wrench as icon for the compact menu. --- src/TomahawkWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 4ee3f6450..4d6c9e32d 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -273,7 +273,7 @@ TomahawkWindow::setupToolBar() #ifndef Q_OS_MAC QToolButton *compactMenuButton = new QToolButton( toolbar ); - compactMenuButton->setIcon( QIcon( RESPATH "images/advanced-settings.png" ) ); + compactMenuButton->setIcon( QIcon( RESPATH "images/configure.png" ) ); compactMenuButton->setText( tr( "&Main Menu" ) ); compactMenuButton->setMenu( m_compactMainMenu ); compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); From fd87c5f352a1a19d7a58dfb6992d8bbb68eb3805 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 17:15:39 +0200 Subject: [PATCH 5/8] Made the compact and accounts menus pop up inside the window. --- src/CMakeLists.txt | 1 + src/ContainedMenuButton.cpp | 52 +++++++++++++++++++++++++++++++++++++ src/ContainedMenuButton.h | 47 +++++++++++++++++++++++++++++++++ src/TomahawkWindow.cpp | 9 +++---- 4 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 src/ContainedMenuButton.cpp create mode 100644 src/ContainedMenuButton.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 26a4b8342..99f56e808 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,6 +73,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui} TomahawkWindow.cpp LoadXSPFDialog.cpp SocialWidget.cpp + ContainedMenuButton.cpp ) IF( WITH_BREAKPAD ) diff --git a/src/ContainedMenuButton.cpp b/src/ContainedMenuButton.cpp new file mode 100644 index 000000000..e4b771763 --- /dev/null +++ b/src/ContainedMenuButton.cpp @@ -0,0 +1,52 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2012, Teo Mrnjavac + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#include "ContainedMenuButton.h" + +#include + +ContainedMenuButton::ContainedMenuButton( QWidget *parent ) + : QToolButton( parent ) +{ +} + +void +ContainedMenuButton::setMenu( QMenu *menu ) +{ + m_menu = menu; + connect( m_menu, SIGNAL( aboutToHide() ), SLOT( menuHidden() ) ); +} + +void +ContainedMenuButton::mousePressEvent( QMouseEvent *event ) +{ + if( m_menu ) + { + QPoint myPos = mapToGlobal( rect().bottomRight() ); + myPos.rx() -= m_menu->sizeHint().width(); + m_menu->popup( myPos ); + event->accept(); + } + QToolButton::mousePressEvent( event ); +} + +void +ContainedMenuButton::menuHidden() +{ + setDown( false ); +} diff --git a/src/ContainedMenuButton.h b/src/ContainedMenuButton.h new file mode 100644 index 000000000..19ee64433 --- /dev/null +++ b/src/ContainedMenuButton.h @@ -0,0 +1,47 @@ +/* === This file is part of Tomahawk Player - === + * + * Copyright 2012, Teo Mrnjavac + * + * Tomahawk is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Tomahawk is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Tomahawk. If not, see . + */ + +#ifndef CONTAINEDMENUBUTTON_H +#define CONTAINEDMENUBUTTON_H + +#include +#include + +/** + * @brief The ContainedMenuButton class defines a modified QToolButton that pops + * up a QMenu under itself, stretching left instead of right and witout + * drawing an arrow primitive. + */ +class ContainedMenuButton : public QToolButton +{ + Q_OBJECT +public: + explicit ContainedMenuButton( QWidget *parent = 0 ); + + void setMenu( QMenu *menu ); + QMenu *menu() const { return m_menu; } + +protected: + void mousePressEvent( QMouseEvent *event ); +private slots: + void menuHidden(); +private: + QMenu *m_menu; +}; + +#endif // CONTAINEDMENUBUTTON_H diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 4d6c9e32d..9192782f9 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -72,6 +72,7 @@ #include "libtomahawk/filemetadata/ScanManager.h" #include "TomahawkApp.h" #include "LoadXSPFDialog.h" +#include "ContainedMenuButton.h" #ifdef Q_OS_WIN #include @@ -261,23 +262,19 @@ TomahawkWindow::setupToolBar() rightSpacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred ); toolbar->addWidget( rightSpacer ); - QToolButton *accountsMenuButton = new QToolButton( toolbar ); + ContainedMenuButton *accountsMenuButton = new ContainedMenuButton( toolbar ); accountsMenuButton->setIcon( QIcon( RESPATH "images/account-settings.png" ) ); accountsMenuButton->setText( tr( "&Network" ) ); accountsMenuButton->setMenu( m_menuAccounts ); - //TODO: when we decide if compressed menus go left or right, if they go right, make - // them pop up *inside* the main window. accountsMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); - accountsMenuButton->setPopupMode( QToolButton::InstantPopup ); toolbar->addWidget( accountsMenuButton ); #ifndef Q_OS_MAC - QToolButton *compactMenuButton = new QToolButton( toolbar ); + ContainedMenuButton *compactMenuButton = new ContainedMenuButton( toolbar ); compactMenuButton->setIcon( QIcon( RESPATH "images/configure.png" ) ); compactMenuButton->setText( tr( "&Main Menu" ) ); compactMenuButton->setMenu( m_compactMainMenu ); compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); - compactMenuButton->setPopupMode( QToolButton::InstantPopup ); m_compactMenuAction = toolbar->addWidget( compactMenuButton ); #endif } From 416439f1ca0f123f7844f20ec4f00b031f49ab60 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 18:05:58 +0200 Subject: [PATCH 6/8] Unmargin the settings dialog a bit. --- src/SettingsDialog.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/SettingsDialog.cpp b/src/SettingsDialog.cpp index 7c5a8f964..06217c8aa 100644 --- a/src/SettingsDialog.cpp +++ b/src/SettingsDialog.cpp @@ -73,6 +73,7 @@ SettingsDialog::SettingsDialog( QWidget *parent ) TomahawkSettings* s = TomahawkSettings::instance(); TomahawkUtils::unmarginLayout( layout() ); + TomahawkUtils::unmarginLayout( ui->horizontalLayout ); #ifdef Q_WS_X11 ui->stackedWidget->setContentsMargins( 4, 4, 4, 4 ); @@ -116,6 +117,8 @@ SettingsDialog::SettingsDialog( QWidget *parent ) createIcons(); #ifdef Q_WS_X11 setContentsMargins( 4, 4, 4, 4 ); +#elif defined( Q_OS_MAC ) + setContentsMargins( 0, 0, 0, 4 ); #else setContentsMargins( 0, 4, 4, 4 ); #endif From c1408213df86e5cd16e27d17138d12ea5bc35fe5 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 18:46:16 +0200 Subject: [PATCH 7/8] Fixed menu roles. --- src/libtomahawk/ActionCollection.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 73e295867..2a7cd17f7 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -107,9 +107,11 @@ ActionCollection::initActions() m_actionCollection[ "toggleMenuBar" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); #endif m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); + m_actionCollection[ "diagnostics" ]->setMenuRole( QAction::ApplicationSpecificRole ); m_actionCollection[ "aboutTomahawk" ] = new QAction( tr( "About &Tomahawk..." ), this ); m_actionCollection[ "aboutTomahawk" ]->setMenuRole( QAction::AboutRole ); m_actionCollection[ "legalInfo" ] = new QAction( tr( "&Legal Information..." ), this ); + m_actionCollection[ "legalInfo" ]->setMenuRole( QAction::ApplicationSpecificRole ); #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) || defined( Q_WS_WIN ) m_actionCollection[ "checkForUpdates" ] = new QAction( tr( "Check For Updates..." ), this ); m_actionCollection[ "checkForUpdates" ]->setMenuRole( QAction::ApplicationSpecificRole ); From 4c136fc4fc89df303f38f59482beee885218a97d Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 4 Aug 2012 18:58:45 +0200 Subject: [PATCH 8/8] Made the toggle menubar key shortcut work when the menubar is hidden. --- src/TomahawkWindow.cpp | 5 +++++ src/libtomahawk/ActionCollection.cpp | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/TomahawkWindow.cpp b/src/TomahawkWindow.cpp index 9192782f9..0116c4ab0 100644 --- a/src/TomahawkWindow.cpp +++ b/src/TomahawkWindow.cpp @@ -276,6 +276,11 @@ TomahawkWindow::setupToolBar() compactMenuButton->setMenu( m_compactMainMenu ); compactMenuButton->setToolButtonStyle( Qt::ToolButtonIconOnly ); 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 } diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 2a7cd17f7..8115a8146 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -75,11 +75,13 @@ ActionCollection::initActions() m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); m_actionCollection[ "playPause" ]->setShortcut( Qt::Key_Space ); + m_actionCollection[ "playPause" ]->setShortcutContext( Qt::ApplicationShortcut ); m_actionCollection[ "stop" ] = new QAction( tr( "&Stop" ), this ); m_actionCollection[ "previousTrack" ] = new QAction( tr( "&Previous Track" ), this ); m_actionCollection[ "nextTrack" ] = new QAction( tr( "&Next Track" ), this ); m_actionCollection[ "quit" ] = new QAction( tr( "&Quit" ), this ); m_actionCollection[ "quit" ]->setShortcut( QKeySequence::Quit ); + m_actionCollection[ "quit" ]->setShortcutContext( Qt::ApplicationShortcut ); m_actionCollection[ "quit" ]->setMenuRole( QAction::QuitRole ); // connect actions to AudioEngine @@ -105,6 +107,7 @@ ActionCollection::initActions() #else m_actionCollection[ "toggleMenuBar" ] = new QAction( tr( "Hide Menu Bar" ), this ); m_actionCollection[ "toggleMenuBar" ]->setShortcut( QKeySequence( "Ctrl+M" ) ); + m_actionCollection[ "toggleMenuBar" ]->setShortcutContext( Qt::ApplicationShortcut ); #endif m_actionCollection[ "diagnostics" ] = new QAction( tr( "Diagnostics..." ), this ); m_actionCollection[ "diagnostics" ]->setMenuRole( QAction::ApplicationSpecificRole );