mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 19:30:21 +02:00
Code Issues Releases Wiki Activity

s/Q_WS/Q_OS

Browse Source
This commit is contained in:
Uwe L. Korn
2014-05-05 12:04:16 +01:00
parent 6ba2a9c639
commit 74915c7d2b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk-widgets/PlaylistDelegate.cpp
View File

@@ -159,7 +159,7 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option,
} }
QRect rectText = option.rect.adjusted( option.fontMetrics.height() * 5.5, boldFontMetrics.height() + 6, -leftEdge - 10, -8 ); QRect rectText = option.rect.adjusted( option.fontMetrics.height() * 5.5, boldFontMetrics.height() + 6, -leftEdge - 10, -8 );
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
rectText.adjust( 0, 1, 0, 0 ); rectText.adjust( 0, 1, 0, 0 );
#elif defined Q_OS_WIN #elif defined Q_OS_WIN
rectText.adjust( 0, 2, 0, 0 ); rectText.adjust( 0, 2, 0, 0 );

8
src/tomahawk/TomahawkTrayIcon.cpp
View File

@@ -41,7 +41,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
, m_stopContinueAfterTrackAction( 0 ) , m_stopContinueAfterTrackAction( 0 )
, m_loveTrackAction( 0 ) , m_loveTrackAction( 0 )
{ {
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
QIcon icon( RESPATH "icons/tomahawk-grayscale-icon-128x128.png" ); QIcon icon( RESPATH "icons/tomahawk-grayscale-icon-128x128.png" );
#else #else
QIcon icon( RESPATH "icons/tomahawk-icon-128x128.png" ); QIcon icon( RESPATH "icons/tomahawk-icon-128x128.png" );
@@ -69,7 +69,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
m_contextMenu->addSeparator(); m_contextMenu->addSeparator();
m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) ); m_contextMenu->addAction( ActionCollection::instance()->getAction( "togglePrivacy" ) );
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
// On mac you can close the windows while leaving the app open. We then need a way to show the main window again // On mac you can close the windows while leaving the app open. We then need a way to show the main window again
m_contextMenu->addSeparator(); m_contextMenu->addSeparator();
m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) ); m_showWindowAction = m_contextMenu->addAction( tr( "Hide Tomahawk Window" ) );
@@ -184,7 +184,7 @@ TomahawkTrayIcon::onStopContinueAfterTrackChanged()
void void
TomahawkTrayIcon::refreshToolTip() TomahawkTrayIcon::refreshToolTip()
{ {
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
// causes issues with OS X menubar, also none // causes issues with OS X menubar, also none
// of the other OS X menubar icons have a tooltip // of the other OS X menubar icons have a tooltip
return; return;
@@ -223,7 +223,7 @@ TomahawkTrayIcon::onAnimationTimer()
void void
TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason ) TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason )
{ {
#ifdef Q_WS_MAC #ifdef Q_OS_MAC
return; return;
#endif #endif