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

Improve application icon support (hopefully :D).

Browse Source
This commit is contained in:
Dominik Schmidt
2010-11-03 19:28:25 +01:00
parent d165528b0a
commit 3f30b32078
17 changed files with 127 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@@ -9,6 +9,8 @@ SET( QT_USE_QTNETWORK TRUE )
SET( QT_USE_QTXML TRUE )
INCLUDE( ${QT_USE_FILE} )
INCLUDE( ${CMAKE_MODULE_PATH}/AddAppIconMacro.cmake )
SET( CMAKE_BUILD_TYPE "debugfull" )
SET( CMAKE_VERBOSE_MAKEFILE ON )
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
@@ -294,6 +296,7 @@ IF( UNIX AND NOT APPLE )
INCLUDE( "CMakeLists.linux.txt" )
ENDIF( UNIX AND NOT APPLE )
kde4_add_app_icon( tomahawkSources "${CMAKE_CURRENT_SOURCE_DIR}/../data/icons/tomahawk-icon-*.png" )
qt4_add_resources( RC_SRCS "../resources.qrc" )
qt4_wrap_cpp( tomahawkMoc ${tomahawkHeaders} )

2
src/playlist/trackview.cpp
View File

@@ -384,7 +384,7 @@ TrackView::createDragPixmap( int itemCount ) const
int y = 0;
for( int i = 0; i < itemCount; ++i )
{
const QPixmap pixmap = QPixmap( QString( ":/data/icons/audio-x-generic-%2.png" ).arg( size ) );
const QPixmap pixmap = QPixmap( QString( ":/data/icons/audio-x-generic-%2x%2.png" ).arg( size ) );
painter.drawPixmap( x, y, pixmap );
x += size + 1;

2
src/tomahawkapp.cpp
View File

@@ -114,7 +114,7 @@ TomahawkApp::TomahawkApp( int& argc, char *argv[] )
m_audioEngine = 0;
m_mainwindow = 0;
m_headless = arguments().contains( "--headless" );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128.png" ) );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
#ifndef NO_LIBLASTFM
m_scrobbler = 0;
#endif

2
src/tomahawkwindow.cpp
View File

@@ -42,7 +42,7 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
, m_playlistManager( new PlaylistManager( this ) )
{
qApp->setStyle( new ProxyStyle() );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128.png" ) );
setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
#ifdef Q_WS_MAC
setUnifiedTitleAndToolBarOnMac( true );