Merge branch 'master' of https://github.com/dschmidt/tomahawk into dschmidt-master

src/CMakeLists.txt

@@ -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} )
 
@@ -321,9 +324,17 @@ MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 TARGET_LINK_LIBRARIES( tomahawk
     ${QT_LIBRARIES}
     ${MAC_EXTRA_LIBS}
-    ${OS_SPECIFIC_LINK_LIBRARIES}
-    echonest
     portfwd
+    ${OS_SPECIFIC_LINK_LIBRARIES}
+    lastfm
+    qjson
+    tag
+    mad
+    vorbis
+    vorbisenc
+    vorbisfile
+    gloox
+    echonest
 )
 
 INCLUDE( "CPack.txt" )

src/CMakeLists.win32.txt

@@ -1,6 +1,8 @@
 ADD_DEFINITIONS( /DNOMINMAX )
 ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
 ADD_DEFINITIONS( -static-libgcc )
+ADD_DEFINITIONS( /DNO_LIBLASTFM )
+ADD_DEFINITIONS( -DNO_OGG )
 
 # Add manual locations to stuff:
 INCLUDE_DIRECTORIES(
@@ -16,12 +18,8 @@ INCLUDE_DIRECTORIES(
 )
 
 SET( OS_SPECIFIC_LINK_LIBRARIES 
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../gloox-1.0/src/.libs/libgloox.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../qjson/build/lib/libqjson.dll.a"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../taglib-1.6.3/build/taglib/libtag.dll"
-	"${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.3/lib/libz.a"
 	"secur32.dll"
-	"Crypt32.dll"
+	"crypt32.dll"
 	"ws2_32.dll"
 	"dnsapi.dll"
 	"${CMAKE_CURRENT_SOURCE_DIR}/../qxtweb-standalone/libqxtweb-standalone.dll"
@@ -29,7 +27,7 @@ SET( OS_SPECIFIC_LINK_LIBRARIES
 
 SET( OS_SPECIFIC_LINK_LIBRARIES 
 	${OS_SPECIFIC_LINK_LIBRARIES} 
-	"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
+	#"${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/tomahawk.res"
 	)
 
 IF( "${gui}" STREQUAL "no" )
@@ -42,10 +40,9 @@ ELSE()
 	SET( OS_SPECIFIC_LINK_LIBRARIES 
 		 ${OS_SPECIFIC_LINK_LIBRARIES} 
 		 "dsound.dll" 
-		 "winmm.dll" 
+		 "winmm.dll"
+                 "iphlpapi.a"
 		 "${CMAKE_CURRENT_SOURCE_DIR}/../rtaudio/librtaudio.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libmad.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/libvorbisfile.dll"
-		 "${CMAKE_CURRENT_SOURCE_DIR}/../admin/win/dlls/liblastfm.dll"
 	)
-ENDIF()
+ENDIF()
+

src/playlist/trackview.cpp

@@ -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;

src/settingsdialog.cpp

@@ -6,6 +6,7 @@
 #include <QDebug>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QNetworkProxy>
 
 #ifndef NO_LIBLASTFM
 #include <lastfm/ws.h>

src/tomahawkapp.cpp

@@ -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

src/tomahawkwindow.cpp

@@ -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 );