From f292e509438bd48030d3575756c75e6d1ad9414a Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 21 Aug 2014 21:22:39 +0200 Subject: [PATCH] * Keep system font for all menus. --- src/libtomahawk/ActionCollection.cpp | 7 +++++++ src/libtomahawk/ContextMenu.cpp | 2 ++ src/libtomahawk/playlist/ViewHeader.cpp | 3 +++ src/libtomahawk/utils/TomahawkUtilsGui.cpp | 15 +++++++++++++++ src/libtomahawk/utils/TomahawkUtilsGui.h | 11 +++++++---- src/libtomahawk/widgets/CaptionLabel.cpp | 2 +- src/tomahawk/TomahawkApp.cpp | 6 +++--- src/tomahawk/TomahawkApp.h | 4 ++-- src/tomahawk/TomahawkTrayIcon.cpp | 1 + src/tomahawk/TomahawkWindow.cpp | 2 ++ src/tomahawk/sourcetree/SourceTreeView.cpp | 6 ++++++ src/tomahawk/widgets/AccountWidget.cpp | 1 - src/tomahawk/widgets/ContainedMenuButton.cpp | 3 +++ 13 files changed, 52 insertions(+), 11 deletions(-) diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 5e4b58dd3..4807af8ce 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -152,8 +152,10 @@ QMenuBar* ActionCollection::createMenuBar( QWidget *parent ) { QMenuBar* menuBar = new QMenuBar( parent ); + menuBar->setFont( TomahawkUtils::systemFont() ); QMenu* controlsMenu = new QMenu( tr( "&Controls" ), menuBar ); + controlsMenu->setFont( TomahawkUtils::systemFont() ); controlsMenu->addAction( m_actionCollection[ "playPause" ] ); controlsMenu->addAction( m_actionCollection[ "previousTrack" ] ); controlsMenu->addAction( m_actionCollection[ "nextTrack" ] ); @@ -168,16 +170,19 @@ ActionCollection::createMenuBar( QWidget *parent ) controlsMenu->addAction( m_actionCollection[ "quit" ] ); QMenu* settingsMenu = new QMenu( tr( "&Settings" ), menuBar ); + settingsMenu->setFont( TomahawkUtils::systemFont() ); #ifndef Q_OS_MAC settingsMenu->addAction( m_actionCollection[ "toggleMenuBar" ] ); #endif settingsMenu->addAction( m_actionCollection[ "preferences" ] ); QMenu* helpMenu = new QMenu( tr( "&Help" ), menuBar ); + helpMenu->setFont( TomahawkUtils::systemFont() ); helpMenu->addAction( m_actionCollection[ "diagnostics" ] ); helpMenu->addAction( m_actionCollection[ "openLogfile" ] ); helpMenu->addAction( m_actionCollection[ "legalInfo" ] ); QMenu* whatsNew = helpMenu->addMenu( ImageRegistry::instance()->icon( RESPATH "images/whatsnew.svg" ), tr( "What's new in ..." ) ); + whatsNew->setFont( TomahawkUtils::systemFont() ); whatsNew->addAction( m_actionCollection[ "whatsnew_0_8" ] ); helpMenu->addAction( m_actionCollection[ "aboutTomahawk" ] ); @@ -203,6 +208,7 @@ ActionCollection::createMenuBar( QWidget *parent ) #if defined( Q_OS_MAC ) QMenu* windowMenu = new QMenu( tr( "&Window" ), menuBar ); + windowMenu->setFont( TomahawkUtils::systemFont() ); windowMenu->addAction( m_actionCollection[ "minimize" ] ); windowMenu->addAction( m_actionCollection[ "zoom" ] ); windowMenu->addAction( m_actionCollection[ "fullscreen" ] ); @@ -219,6 +225,7 @@ QMenu* ActionCollection::createCompactMenu( QWidget *parent ) { QMenu* compactMenu = new QMenu( tr( "Main Menu" ), parent ); + compactMenu->setFont( TomahawkUtils::systemFont() ); compactMenu->addAction( m_actionCollection[ "playPause" ] ); compactMenu->addAction( m_actionCollection[ "previousTrack" ] ); diff --git a/src/libtomahawk/ContextMenu.cpp b/src/libtomahawk/ContextMenu.cpp index f62e272cd..e55846190 100644 --- a/src/libtomahawk/ContextMenu.cpp +++ b/src/libtomahawk/ContextMenu.cpp @@ -44,6 +44,8 @@ ContextMenu::ContextMenu( QWidget* parent ) , m_sources_sigmap( 0 ) , m_loveAction( 0 ) { + setFont( TomahawkUtils::systemFont() ); + m_sigmap = new QSignalMapper( this ); connect( m_sigmap, SIGNAL( mapped( int ) ), SLOT( onTriggered( int ) ) ); diff --git a/src/libtomahawk/playlist/ViewHeader.cpp b/src/libtomahawk/playlist/ViewHeader.cpp index 2bcc4da25..ea3ca481b 100644 --- a/src/libtomahawk/playlist/ViewHeader.cpp +++ b/src/libtomahawk/playlist/ViewHeader.cpp @@ -22,6 +22,7 @@ #include #include "TomahawkSettings.h" +#include "utils/TomahawkUtilsGui.h" #include "utils/Logger.h" @@ -32,6 +33,8 @@ ViewHeader::ViewHeader( QAbstractItemView* parent ) , m_sigmap( new QSignalMapper( this ) ) , m_init( false ) { + m_menu->setFont( TomahawkUtils::systemFont() ); + #if QT_VERSION >= QT_VERSION_CHECK( 5, 0, 0 ) setSectionResizeMode( QHeaderView::Interactive ); setSectionsMovable( true ); diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp index 21d1008c3..dba479427 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp +++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp @@ -61,6 +61,7 @@ extern void qt_blurImage( QPainter *p, QImage &blurImage, qreal radius, bool qua namespace TomahawkUtils { +static QFont s_systemFont; static int s_defaultFontSize = 0; static int s_defaultFontHeight = 0; @@ -397,6 +398,20 @@ setDefaultFontSize( int points ) } +QFont +systemFont() +{ + return s_systemFont; +} + + +void +setSystemFont( QFont font ) +{ + s_systemFont = font; +} + + QSize defaultIconSize() { diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.h b/src/libtomahawk/utils/TomahawkUtilsGui.h index cdc4ef8e9..33e904ca3 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.h +++ b/src/libtomahawk/utils/TomahawkUtilsGui.h @@ -23,12 +23,13 @@ #include "TomahawkUtils.h" #include "DllMacro.h" -#include -#include #include -#include -#include +#include #include +#include +#include +#include +#include // include contains typedefs for Qt4/Qt5 compatibility #include @@ -63,6 +64,8 @@ namespace TomahawkUtils DLLEXPORT int defaultFontSize(); DLLEXPORT int defaultFontHeight(); DLLEXPORT QSize defaultIconSize(); + DLLEXPORT void setSystemFont( QFont font ); + DLLEXPORT QFont systemFont(); DLLEXPORT void prepareStyleOption( QStyleOptionViewItemV4* option, const QModelIndex& index, PlayableItem* item ); diff --git a/src/libtomahawk/widgets/CaptionLabel.cpp b/src/libtomahawk/widgets/CaptionLabel.cpp index 33f02dbbe..09be33fee 100644 --- a/src/libtomahawk/widgets/CaptionLabel.cpp +++ b/src/libtomahawk/widgets/CaptionLabel.cpp @@ -30,7 +30,7 @@ CaptionLabel::CaptionLabel( QWidget* parent ) , m_parent( parent ) , m_showCloseButton( false ) { - QFont f( "Roboto" ); + QFont f = font(); f.setPointSize( 10 ); setFont( f ); diff --git a/src/tomahawk/TomahawkApp.cpp b/src/tomahawk/TomahawkApp.cpp index cc0afa518..8dc0390e6 100644 --- a/src/tomahawk/TomahawkApp.cpp +++ b/src/tomahawk/TomahawkApp.cpp @@ -183,6 +183,7 @@ TomahawkApp::init() TomahawkStyle::loadFonts(); QFont f = font(); + TomahawkUtils::setSystemFont( f ); f.setFamily( "Roboto" ); #ifndef Q_OS_MAC f.setPointSize( 10 ); @@ -237,7 +238,7 @@ TomahawkApp::init() QByteArray magic = QByteArray::fromBase64( enApiSecret ); QByteArray wand = QByteArray::fromBase64( QCoreApplication::applicationName().toLatin1() ); int length = magic.length(), n2 = wand.length(); - for ( int i=0; isetAPIKey( magic ); tDebug() << "Init Echonest Factory."; @@ -274,7 +275,7 @@ TomahawkApp::init() } connect( Playlist::removalHandler().data(), SIGNAL( aboutToBeDeletePlaylist( Tomahawk::playlist_ptr ) ), - SLOT( playlistRemoved( Tomahawk::playlist_ptr ) )); + SLOT( playlistRemoved( Tomahawk::playlist_ptr ) )); tDebug() << "Init InfoSystem."; m_infoSystem = QPointer( Tomahawk::InfoSystem::InfoSystem::instance() ); @@ -298,7 +299,6 @@ TomahawkApp::~TomahawkApp() delete m_scanManager.data(); delete Tomahawk::Accounts::AccountManager::instance(); - delete AtticaManager::instance(); delete m_mainwindow; diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h index 0660a9c53..6ad541363 100644 --- a/src/tomahawk/TomahawkApp.h +++ b/src/tomahawk/TomahawkApp.h @@ -64,8 +64,8 @@ namespace Tomahawk } #ifdef LIBLASTFM_FOUND -#include -#include "Scrobbler.h" + #include + #include "Scrobbler.h" #endif class TomahawkWindow; diff --git a/src/tomahawk/TomahawkTrayIcon.cpp b/src/tomahawk/TomahawkTrayIcon.cpp index a4ca9de85..98595bc84 100644 --- a/src/tomahawk/TomahawkTrayIcon.cpp +++ b/src/tomahawk/TomahawkTrayIcon.cpp @@ -52,6 +52,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent ) refreshToolTip(); m_contextMenu = new QMenu(); + m_contextMenu->setFont( TomahawkUtils::systemFont() ); setContextMenu( m_contextMenu ); m_loveTrackAction = new QAction( this ); diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index e5b17bfd9..3b8b33070 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -688,6 +688,8 @@ TomahawkWindow::setupMenuBar() { // Always create a menubar, but only create a compactMenu on Windows and X11 m_menuBar = ActionCollection::instance()->createMenuBar( this ); + m_menuBar->setFont( TomahawkUtils::systemFont() ); + setMenuBar( m_menuBar ); #ifndef Q_OS_MAC m_compactMainMenu = ActionCollection::instance()->createCompactMenu( this ); diff --git a/src/tomahawk/sourcetree/SourceTreeView.cpp b/src/tomahawk/sourcetree/SourceTreeView.cpp index 76ac56dbf..db92c6f91 100644 --- a/src/tomahawk/sourcetree/SourceTreeView.cpp +++ b/src/tomahawk/sourcetree/SourceTreeView.cpp @@ -74,6 +74,11 @@ SourceTreeView::SourceTreeView( QWidget* parent ) setAttribute( Qt::WA_MacShowFocusRect, 0 ); setContentsMargins( 0, 0, 0, 0 ); + m_playlistMenu.setFont( TomahawkUtils::systemFont() ); + m_roPlaylistMenu.setFont( TomahawkUtils::systemFont() ); + m_latchMenu.setFont( TomahawkUtils::systemFont() ); + m_privacyMenu.setFont( TomahawkUtils::systemFont() ); + QFont fnt = font(); QFontMetrics fm( fnt ); // This is sort of the longest string in there. With translations @@ -724,6 +729,7 @@ SourceTreeView::onCustomContextMenu( const QPoint& pos ) else if ( !customActions.isEmpty() ) { QMenu customMenu; + customMenu.setFont( TomahawkUtils::systemFont() ); customMenu.addActions( customActions ); customMenu.exec( mapToGlobal( pos ) ); } diff --git a/src/tomahawk/widgets/AccountWidget.cpp b/src/tomahawk/widgets/AccountWidget.cpp index bbd37d4a8..fb2876024 100644 --- a/src/tomahawk/widgets/AccountWidget.cpp +++ b/src/tomahawk/widgets/AccountWidget.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include diff --git a/src/tomahawk/widgets/ContainedMenuButton.cpp b/src/tomahawk/widgets/ContainedMenuButton.cpp index 168b35c88..095546e10 100644 --- a/src/tomahawk/widgets/ContainedMenuButton.cpp +++ b/src/tomahawk/widgets/ContainedMenuButton.cpp @@ -20,6 +20,8 @@ #include +#include "utils/TomahawkUtilsGui.h" + ContainedMenuButton::ContainedMenuButton( QWidget *parent ) : QToolButton( parent ) { @@ -29,6 +31,7 @@ void ContainedMenuButton::setMenu( QMenu *menu ) { m_menu = menu; + m_menu->setFont( TomahawkUtils::systemFont() ); connect( m_menu, SIGNAL( aboutToHide() ), SLOT( menuHidden() ) ); }