* Drop the rc0. We're gold.

This reverts commit a1146fbe53.

.tx/config

@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.net
+
+[tomahawk.tomahawk-master]
+file_filter = lang/tomahawk_<lang>.ts
+source_file = lang/tomahawk_en.ts
+source_lang = en
+type = QT
+

CMakeLists.txt

@@ -1,10 +1,7 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
 SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
-
-IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
-  CMAKE_POLICY(SET CMP0017 NEW)
-ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+CMAKE_POLICY(SET CMP0017 NEW)
 
 ###
 ### Tomahawk application info
@@ -15,8 +12,8 @@ SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 4 )
-SET( TOMAHAWK_VERSION_PATCH 1 )
+SET( TOMAHAWK_VERSION_MINOR 5 )
+SET( TOMAHAWK_VERSION_PATCH 0 )
 
 #SET( TOMAHAWK_VERSION_RC 0 )
 
@@ -26,8 +23,22 @@ add_definitions( "-fvisibility=hidden" )
 # build options
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+option(WITH_BREAKPAD "Build with breakpad integration" ON)
+option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
+option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
 option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
 
+IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
+    message(STATUS "Build of breakpad library disabled on this platform.")
+    SET(WITH_BREAKPAD OFF)
+    SET(WITH_CRASHREPORTER OFF)
+ENDIF()
+
+# add definitions based on build options
+IF(WITH_BREAKPAD)
+    message(STATUS "Build with support for breakpad.")
+ENDIF()
+
 # generate version string
 
 # base string used in release and unstable builds
@@ -40,7 +51,7 @@ ENDIF()
 IF( NOT BUILD_RELEASE )
     INCLUDE( CMakeDateStamp )
     SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( ${TOMAHAWK_VERSION_DATE} GREATER 0)
+    IF( TOMAHAWK_VERSION_DATE GREATER 0)
         SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
     ENDIF()
 
@@ -58,7 +69,7 @@ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
 # make predefined install dirs available everywhere
-INCLUDE(GNUInstallDirs)
+INCLUDE( GNUInstallDirs )
 
 # installer creation
 INCLUDE( TomahawkCPack.cmake )
@@ -90,8 +101,8 @@ if(PHONON_FOUND)
     message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
-macro_optional_find_package(LibEchonest 1.1.10)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.10 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(LibEchonest 1.2.1)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.2.1 is needed for dynamic playlists and the infosystem")
 
 macro_optional_find_package(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -110,36 +121,20 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
 
-macro_optional_find_package(LibAttica)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
+macro_optional_find_package(LibAttica 0.4.0)
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
 
 macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
+macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
 
-macro_optional_find_package(Jreen)
-macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
+macro_optional_find_package(Jreen 1.0.5)
+macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
 
 macro_optional_find_package(QTweetLib)
 macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
 
-
-IF( NOT QuaZip_FOUND )
-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_LIBRARY quazip )
-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
-    SET( QuaZip_FOUND true )
-    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
-
-    # copy headers to build/quazip so we can use proper includes inside the code
-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-ENDIF()
-
-# required
-#While we distribute our own liblastfm2, don't need to look for it
-#macro_optional_find_package(LibLastFm 0.3.3)
-#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-set(LIBLASTFM_FOUND true)
+macro_optional_find_package(LibLastFm 1.0.0)
+macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/eartle/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
 
 #### submodules start
 # automatically init submodules here, don't delete this code we may add submodules again
@@ -213,9 +208,3 @@ ADD_SUBDIRECTORY( src/libtomahawk )
 SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-IF( BUILD_GUI )
-    IF( NOT DISABLE_CRASHREPORTER )
-        ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
-    ENDIF()
-ENDIF()

CMakeModules/AddTomahawkPlugin.cmake

@@ -0,0 +1,99 @@
+MACRO(PARSE_ARGUMENTS prefix arg_names option_names)
+  SET(DEFAULT_ARGS)
+  FOREACH(arg_name ${arg_names})
+    SET(${prefix}_${arg_name})
+  ENDFOREACH(arg_name)
+  FOREACH(option ${option_names})
+    SET(${prefix}_${option} FALSE)
+  ENDFOREACH(option)
+
+  SET(current_arg_name DEFAULT_ARGS)
+  SET(current_arg_list)
+  FOREACH(arg ${ARGN})
+    SET(larg_names ${arg_names})
+    LIST(FIND larg_names "${arg}" is_arg_name)
+    IF (is_arg_name GREATER -1)
+      SET(${prefix}_${current_arg_name} ${current_arg_list})
+      SET(current_arg_name ${arg})
+      SET(current_arg_list)
+    ELSE (is_arg_name GREATER -1)
+      SET(loption_names ${option_names})
+      LIST(FIND loption_names "${arg}" is_option)
+      IF (is_option GREATER -1)
+         SET(${prefix}_${arg} TRUE)
+      ELSE (is_option GREATER -1)
+         SET(current_arg_list ${current_arg_list} ${arg})
+      ENDIF (is_option GREATER -1)
+    ENDIF (is_arg_name GREATER -1)
+  ENDFOREACH(arg)
+  SET(${prefix}_${current_arg_name} ${current_arg_list})
+ENDMACRO(PARSE_ARGUMENTS)
+
+MACRO(CAR var)
+  SET(${var} ${ARGV1})
+ENDMACRO(CAR)
+
+MACRO(CDR var junk)
+  SET(${var} ${ARGN})
+ENDMACRO(CDR)
+
+
+macro(add_tomahawk_plugin)
+    parse_arguments(PLUGIN
+        "SOURCES;UI;LINK_LIBRARIES;TYPE;EXPORT_MACRO;COMPILE_DEFINITIONS"
+        "NO_INSTALL"
+        ${ARGN}
+        )
+    car(PLUGIN_NAME ${PLUGIN_DEFAULT_ARGS})
+
+#     message("*** Arguments for ${PLUGIN_NAME}")
+#     message("Sources: ${PLUGIN_SOURCES}")
+#     message("Link libraries: ${PLUGIN_LINK_LIBRARIES}")
+#     message("UI: ${PLUGIN_UI}")
+#     message("TYPE: ${PLUGIN_TYPE}")
+#     message("EXPORT_MACRO: ${PLUGIN_EXPORT_MACRO}")
+
+    # create target name once for convenience
+    set(target "tomahawk_${PLUGIN_TYPE}_${PLUGIN_NAME}")
+
+    # qt stuff
+    include_directories(${CMAKE_CURRENT_BINARY_DIR})
+    if(PLUGIN_UI)
+        qt4_wrap_ui(PLUGIN_UI_SOURCES ${PLUGIN_UI})
+        list(APPEND PLUGIN_SOURCES ${PLUGIN_UI_SOURCES})
+    endif()
+
+    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
+        qt4_add_resources(PLUGIN_RC_SOURCES "resources.qrc")
+        list(APPEND PLUGIN_SOURCES ${PLUGIN_RC_SOURCES})
+        unset(PLUGIN_RC_SOURCES)
+    endif()
+
+    # add target
+    add_library(${target} MODULE ${PLUGIN_SOURCES})
+
+    # definitions - can this be moved into set_target_properties below?
+    add_definitions(${QT_DEFINITIONS})
+    set_target_properties(${target} PROPERTIES AUTOMOC TRUE COMPILE_DEFINITIONS ${PLUGIN_EXPORT_MACRO})
+    if(PLUGIN_COMPILE_DEFINITIONS)
+        # Dear CMake, i hate you! Sincerely, domme
+        # At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
+        # only takes the first one if called multiple times or bails out with wrong number of arguments
+        # when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
+        add_definitions( "-D${PLUGIN_EXPORT_MACRO}" )
+
+        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${PLUGIN_COMPILE_DEFINITIONS})
+    endif()
+
+    # add link targets
+    target_link_libraries(${target} tomahawklib)
+    if(PLUGIN_LINK_LIBRARIES)
+        target_link_libraries(${target} ${PLUGIN_LINK_LIBRARIES})
+    endif()
+
+    # make installation optional, maybe useful for dummy plugins one day
+    if(NOT PLUGIN_NO_INSTALL)
+        include(GNUInstallDirs)
+        install(TARGETS ${target} DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    endif()
+endmacro()

CMakeModules/FindGloox.cmake

@@ -1,23 +0,0 @@
-# - Try to find GLOOX
-# Find GLOOX headers, libraries and the answer to all questions.
-#
-#  GLOOX_FOUND               True if gloox got found
-#  GLOOX_INCLUDE_DIR        Location of gloox headers 
-#  GLOOX_LIBRARIES           List of libaries to use gloox 
-#
-# Copyright (c) 2009 Nigmatullin Ruslan <euroelessar@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-FIND_PATH( GLOOX_INCLUDE_DIR "gloox/gloox.h" )
-FIND_LIBRARY( GLOOX_LIBRARIES gloox )
-
-if( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )
-	message( STATUS "Found gloox: ${GLOOX_LIBRARIES}" )
-	set( GLOOX_FOUND 1 )
-else( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )
-	message( STATUS "Could NOT find gloox" )
-endif( GLOOX_LIBRARIES AND GLOOX_INCLUDE_DIR )

CMakeModules/FindJreen.cmake

@@ -5,40 +5,31 @@
 # LIBJREEN_LIBRARY, the path to libjreen
 # LIBJREEN_FOUND, whether libjreen was found
 
+FIND_PACKAGE(PkgConfig QUIET)
+PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
 
-find_path(LIBJREEN_INCLUDE_DIR NAMES jreen/jreen.h
-   HINTS
-   ~/usr/include
-   /opt/local/include
-   /usr/include
-   /usr/local/include
-   /opt/kde4/include
-   ${CMAKE_INSTALL_PREFIX}/include
-   ${KDE4_INCLUDE_DIR}
+FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
+    HINTS
+        ${PC_JREEN_INCLUDEDIR}
+        ${PC_JREEN_INCLUDE_DIRS}
+        ${CMAKE_INSTALL_INCLUDEDIR}
+        ${KDE4_INCLUDE_DIR}
 )
 
-find_library( LIBJREEN_LIBRARY NAMES jreen
-    PATHS
-    ~/usr/lib
-   /opt/local/lib
-   /usr/lib
-   /usr/lib64
-   /usr/local/lib
-   /opt/kde4/lib
-   ${CMAKE_INSTALL_PREFIX}/lib
-   ${CMAKE_INSTALL_PREFIX}/lib64
-   ${KDE4_LIB_DIR}
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
+    HINTS
+        ${PC_JREEN_LIBDIR}
+        ${PC_JREEN_LIBRARY_DIRS}
+        ${CMAKE_INSTALL_LIBDIR}
+        ${KDE4_LIB_DIR}
 )
 
+IF(JREEN_LIBRARIES AND JREEN_INCLUDE_DIR AND NOT PC_JREEN_VERSION)
+    MESSAGE(WARNING "You don't have pkg-config and so the Jreen version check does not work!")
+ENDIF()
 
-if(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
-   set(LIBJREEN_FOUND TRUE)
-   message(STATUS "Found libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
-else(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
-   set(LIBJREEN_FOUND FALSE)
-   if (LIBJREEN_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find required package libjreen")
-   endif(LIBJREEN_FIND_REQUIRED)
-endif(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jreen
+                                  REQUIRED_VARS JREEN_LIBRARIES JREEN_INCLUDE_DIR)
 
-mark_as_advanced(LIBJREEN_INCLUDE_DIR LIBJREEN_LIBRARY)
+MARK_AS_ADVANCED(JREEN_INCLUDE_DIR JREEN_LIBRARIES)

CMakeModules/FindLibLastFm.cmake

@@ -1,42 +1,34 @@
-# - Find LibLastFM
-# Find the liblastfm includes and the liblastfm libraries
-# This module defines
-# LIBLASTFM_INCLUDE_DIR, root lastfm include dir
-# LIBLASTFM_LIBRARY, the path to liblastfm
-# LIBLASTFM_FOUND, whether liblastfm was found
+# - Try to find LibLastFm
+#
+#  LIBLASTFM_FOUND - system has liblastfm
+#  LIBLASTFM_INCLUDE_DIRS - the liblastfm include directories
+#  LIBLASTFM_LIBRARIES - link these to use liblastfm
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
 
+# Dependencies
+if(NOT QT4_FOUND)
+    find_package(Qt4 REQUIRED)
+endif()
 
-find_path(LIBLASTFM_INCLUDE_DIR NAMES Audioscrobbler
-   HINTS
-   ~/usr/include
-   /opt/local/include
-   /usr/local/include
-   /usr/include
-   /opt/kde4/include
-   ${KDE4_INCLUDE_DIR}
-   PATH_SUFFIXES lastfm
+# Include dir
+find_path(LIBLASTFM_INCLUDE_DIR
+  # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
+  NAMES lastfm/Track.h
+  PATHS ${KDE4_INCLUDE_DIR}
 )
 
-find_library( LIBLASTFM_LIBRARY NAMES lastfm
-    PATHS
-    ~/usr/lib
-   /opt/local/lib
-   /usr/local/lib
-   /usr/lib
-   /usr/lib64
-   /opt/kde4/lib
-   ${KDE4_LIB_DIR}
+# Finally the library itself
+find_library(LIBLASTFM_LIBRARY
+  NAMES lastfm
+  PATHS ${KDE4_LIB_DIR}
 )
 
+set(LIBLASTFM_LIBRARIES ${LIBLASTFM_LIBRARY})
+set(LIBLASTFM_INCLUDE_DIRS ${LIBLASTFM_INCLUDE_DIR})
 
-if(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
-   set(LIBLASTFM_FOUND TRUE)
-   message(STATUS "Found liblastfm: ${LIBLASTFM_INCLUDE_DIR}, ${LIBLASTFM_LIBRARY}")
-else(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
-   set(LIBLASTFM_FOUND FALSE)   
-   if (LIBLASTFM_FIND_REQUIRED)
-      message(FATAL_ERROR "Could NOT find required package LibLastFm")
-   endif(LIBLASTFM_FIND_REQUIRED)
-endif(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(LibLastFm DEFAULT_MSG LIBLASTFM_LIBRARIES LIBLASTFM_INCLUDE_DIRS)
 
-mark_as_advanced(LIBLASTFM_INCLUDE_DIR LIBLASTFM_LIBRARY)
+mark_as_advanced(LIBLASTFM_LIBRARIES LIBLASTFM_INCLUDE_DIRS)

CMakeModules/FindQCA2.cmake

@@ -38,7 +38,9 @@ else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
 
   find_path(QCA2_INCLUDE_DIR qca.h
             HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
-            PATH_SUFFIXES QtCrypto)
+            PATH_SUFFIXES QtCrypto
+            PATHS /usr/local/lib/qca.framework/Headers/
+)
 
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(QCA2  DEFAULT_MSG  QCA2_LIBRARIES QCA2_INCLUDE_DIR)

CMakeModules/NSIS.template.in

@@ -278,9 +278,9 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
 
         File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
         File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
         File "${INSTALL_PATH}\bin\libtomahawklib.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
+        ; plugins
+        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
    !endif
    !ifndef INSTALL_PATH
         ;Main executable.
@@ -292,8 +292,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         File "${BUILD_PATH}\libtomahawklib.dll"
         File "${BUILD_PATH}\libqxtweb-standalone.dll"
         File "${BUILD_PATH}\libtomahawk_portfwd.dll"
-        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
-        File "${BUILD_PATH}\libtomahawk_sip*.dll"
+        ; plugins
+        File "${BUILD_PATH}\libtomahawk_*_*.dll"
    !endif
 
    ;License & release notes.
@@ -349,6 +349,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\zlib1.dll"
 
    File "${MING_BIN}\libechonest.dll"
+   File "${MING_BIN}\liblastfm.dll"
    File "${MING_BIN}\libQTweetLib.dll"
    File "${MING_BIN}\libquazip.dll"
 

ChangeLog

@@ -1,3 +1,37 @@
+Version 0.5.0:
+    * SOCKS5 proxy support improvements for resolvers and more.
+    * Initial Access Control support, allowing users to define who is able to
+      access and stream from their collection.
+    * Priortize resolution of a track on double-click.
+    * Spotify Resolver can now be easily installed on-demand from the settings.
+    * You can now sync selected playlists (and updates) with Spotify.
+    * Support .aiff (AIFF mimetype) files.
+    * Cleaned up Diagnostics window.
+    * You can tell Tomahawk to stop playback after a certain track finished.
+    * Double-clicking a playlist name (in the sidebar) will start the playlist.
+    * You can now import your entire Last.fm playback history into Tomahawk.
+    * Fixed sorting of related artists.
+    * Support for multimedia keys (Play, Pause, Next etc.) on Windows & Linux.
+    * When listening privately scrobbling to Last.fm and Adium is now disabled.
+    * Added a toolbar with page back / forward buttons and the global search.
+    * New grid-like view with direct playback controls.
+    * You can now browse new releases (by genre).
+    * Added social sharing widget, which allows you to tweet about a song.
+    * Added a track page showing a song's similar tracks and statistics.
+    * Separate Loved Tracks and Recently Played views per source.
+    * Combine an artist's albums into a single aggregated view.
+    * Added translations for Arabic, French, Bulgarian, Spanish and more.
+    * Fixed XSPF auto-updating.
+    * New Tomahawk logo and icon.
+
+Version 0.4.2:
+    * Fix ZeroConf protocol showing IP addresses instead of host names.
+    * Updated translations for various languages.
+    * Resuming playback restores correct volume settings.
+    * Reduced CPU usage during playback.
+    * Fixed not starting up due to case sensitivity issue on OS X.
+    * Fixed volume issue (too quiet) on Windows.
+
 Version 0.4.1:
     * Fixed various crashes.
     * Fixed issues with auto-updating XSPF playlists.
@@ -13,15 +47,13 @@ Version 0.4.0:
     * Fixed icons not appearing in resolvers list.
     * Fixed various UI glitches and stray error messages in stations.
     * Fixed bug where album page would resolve bottom-to-top.
-    * Fixed bug where Footnotes would not update when changing selected album in Album View.
+    * Fixed bug where Footnotes would not update when changing selected album.
     * Fixed dragging albums and artists from charts, album, and artist views.
     * Fixed bug where filter text would be one step behind filter value.
     * Fixed bug where resolvers would enable themselves after auto-updating.
     * Fixed occasional crash when dropping tracks onto New Station item.
     * Added jump-to-current-track support for search results page. 
-    * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
     * Fixed non-resolving tracks when dragging from album view.
-    * Fixed /Volumes directory not showing up on OS X.
     * Fixed fetching album covers for albums with special characters.
     * Show errors and continue gracefully when resolved audio is not available.
     * Fixed various crashes on exit.
@@ -35,7 +67,6 @@ Version 0.4.0:
     * Added SoundCloudWall.com charts.
     * Added ability to "lock on" to a user when listening along, to skip along.
     * Fixed bug where loved tracks would be refreshed much too often.
-    * Fixed startup crash on OS X.
     * Fixed some font size issues.
     * Sped up Tomahawk startup by moving chart loading into a separate thread.
     * Added support for parsing Grooveshark and Tinysong tracks and playlists.
@@ -43,6 +74,9 @@ Version 0.4.0:
     * Added artist and album results to global searches.
     * Fixed style and contrast issues when using GTK styles.
     * Fixed paths to artwork when using MPRIS2 interface.
+    * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
+    * Fixed /Volumes directory not showing up on OS X.
+    * Fixed startup crash on OS X.
  
 Version 0.3.3:
     * Automatically load Super Collection tracks when no official release

README

@@ -13,11 +13,11 @@ Compiling Tomahawk
 
 Detailed building instructions for Ubuntu
 -----------------------------------------
- See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Maverick_(10.10)
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Precise_(12.04)
 
 Detailed building instructions for OS X
 ---------------------------------------
- See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)_and_Lion_(10.7)
 
 Doxygen Documentation
 ---------------------
@@ -27,25 +27,25 @@ Doxygen Documentation
 Dependencies
 ------------
 
-  CMake 2.8.0 - http://www.cmake.org/
+  CMake 2.8.6 - http://www.cmake.org/
   Qt 4.7.0 - http://qt.nokia.com/
   QJson 0.7.1 - http://qjson.sourceforge.net/
   SQLite 3.6.22 - http://www.sqlite.org/
   TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
   Boost 1.3 - http://www.boost.org/
   CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-  libechonest 1.2.0 - http://projects.kde.org/projects/playground/libs/libechonest/
+  libechonest 1.2.1 - http://projects.kde.org/projects/playground/libs/libechonest/
+  Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
+  QuaZip 0.4.3 - http://quazip.sourceforge.net/
 
  The following dependencies are optional, but recommended:
 
-  Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-  QuaZip 0.4.3 - http://quazip.sourceforge.net/
-  Jreen 1.0.3 - https://github.com/euroelessar/jreen
+  Jreen 1.0.5 - http://qutim.org/jreen / https://github.com/euroelessar/jreen
   QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib
+  liblastfm 1.0.1 - http://github.com/eartle/liblastfm/
 
  Third party libraries that we ship with our source:
 
   MiniUPnP 1.6 - http://miniupnp.free.fr/
-  liblastfm 0.4.0 - http://github.com/jonocole/liblastfm/
 
 Enjoy!

admin/mac/macdeploy.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
-
-#  This file is part of Clementine.
+#  This file is part of Tomahawk. 
+#  It was inspired in large part by the macdeploy script in Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
 import os
 import re
 import subprocess
+import commands
 import sys
 
 FRAMEWORK_SEARCH_PATH=[
@@ -27,161 +28,163 @@ FRAMEWORK_SEARCH_PATH=[
 
 LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
 
+LIBSPOTIFY_VERSION = commands.getoutput("brew ls -version libspotify | tr -s \" \" \"\\\\012\" | tail -n 1").strip()
+LIBSPOTIFY_PATH = "/usr/local/lib/libspotify.%s.dylib" % LIBSPOTIFY_VERSION
 
 VLC_PLUGINS=[
-  'access/libaccess_attachment_plugin.dylib',
-  #'access/libaccess_avio_plugin.dylib',
-  'access/libaccess_fake_plugin.dylib',
-  'access/libaccess_ftp_plugin.dylib',
-  'access/libaccess_http_plugin.dylib',
-  'access/libaccess_imem_plugin.dylib',
-  'access/libaccess_mmap_plugin.dylib',
-  'access/libaccess_mms_plugin.dylib',
-  'access/libaccess_realrtsp_plugin.dylib',
-  'access/libaccess_tcp_plugin.dylib',
-  'access/libaccess_udp_plugin.dylib',
-  'access/libcdda_plugin.dylib',
-  'access/libfilesystem_plugin.dylib',
-  'access/libqtcapture_plugin.dylib',
-  'access/librtp_plugin.dylib',
-  'access/libzip_plugin.dylib',
-  'access_output/libaccess_output_dummy_plugin.dylib',
-  'access_output/libaccess_output_file_plugin.dylib',
-  'access_output/libaccess_output_http_plugin.dylib',
-  'access_output/libaccess_output_shout_plugin.dylib',
-  'access_output/libaccess_output_udp_plugin.dylib',
-  'audio_filter/liba52tofloat32_plugin.dylib',
-  'audio_filter/liba52tospdif_plugin.dylib',
-  'audio_filter/libaudio_format_plugin.dylib',
-  'audio_filter/libaudiobargraph_a_plugin.dylib',
-  'audio_filter/libchorus_flanger_plugin.dylib',
-  'audio_filter/libconverter_fixed_plugin.dylib',
-  'audio_filter/libdolby_surround_decoder_plugin.dylib',
-  'audio_filter/libdtstofloat32_plugin.dylib',
-  'audio_filter/libdtstospdif_plugin.dylib',
-  'audio_filter/libequalizer_plugin.dylib',
-  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
-  'audio_filter/libmono_plugin.dylib',
-  'audio_filter/libmpgatofixed32_plugin.dylib',
-  'audio_filter/libnormvol_plugin.dylib',
-  'audio_filter/libparam_eq_plugin.dylib',
-  'audio_filter/libscaletempo_plugin.dylib',
-  'audio_filter/libsimple_channel_mixer_plugin.dylib',
-  'audio_filter/libspatializer_plugin.dylib',
-  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
-  'audio_filter/libugly_resampler_plugin.dylib',
-  'audio_mixer/libfloat32_mixer_plugin.dylib',
-  'audio_mixer/libspdif_mixer_plugin.dylib',
-  'audio_mixer/libtrivial_mixer_plugin.dylib',
-  'audio_output/libaout_file_plugin.dylib',
-  'audio_output/libauhal_plugin.dylib',
-  'codec/liba52_plugin.dylib',
-  'codec/libadpcm_plugin.dylib',
-  'codec/libaes3_plugin.dylib',
-  'codec/libaraw_plugin.dylib',
-  'codec/libavcodec_plugin.dylib',
-  'codec/libcc_plugin.dylib',
-  'codec/libcdg_plugin.dylib',
-  'codec/libdts_plugin.dylib',
-  'codec/libfaad_plugin.dylib',
-  'codec/libfake_plugin.dylib',
-  'codec/libflac_plugin.dylib',
-  'codec/libfluidsynth_plugin.dylib',
-  'codec/libinvmem_plugin.dylib',
-  'codec/liblpcm_plugin.dylib',
-  'codec/libmpeg_audio_plugin.dylib',
-  'codec/libpng_plugin.dylib',
-  'codec/librawvideo_plugin.dylib',
-  'codec/libspeex_plugin.dylib',
-  'codec/libspudec_plugin.dylib',
-  'codec/libtheora_plugin.dylib',
-  'codec/libtwolame_plugin.dylib',
-  'codec/libvorbis_plugin.dylib',
-  'control/libgestures_plugin.dylib',
-  'control/libhotkeys_plugin.dylib',
-  'control/libmotion_plugin.dylib',
-  'control/libnetsync_plugin.dylib',
-  'control/libsignals_plugin.dylib',
-  'demux/libaiff_plugin.dylib',
-  'demux/libasf_plugin.dylib',
-  'demux/libau_plugin.dylib',
-  #'demux/libavformat_plugin.dylib',
-  'demux/libavi_plugin.dylib',
-  'demux/libdemux_cdg_plugin.dylib',
-  'demux/libdemuxdump_plugin.dylib',
-  'demux/libdirac_plugin.dylib',
-  'demux/libes_plugin.dylib',
-  'demux/libflacsys_plugin.dylib',
-  'demux/liblive555_plugin.dylib',
-  'demux/libmkv_plugin.dylib',
-  'demux/libmod_plugin.dylib',
-  'demux/libmp4_plugin.dylib',
-  'demux/libmpc_plugin.dylib',
-  'demux/libmpgv_plugin.dylib',
-  'demux/libnsc_plugin.dylib',
-  'demux/libnsv_plugin.dylib',
-  'demux/libnuv_plugin.dylib',
-  'demux/libogg_plugin.dylib',
-  'demux/libplaylist_plugin.dylib',
-  'demux/libps_plugin.dylib',
-  'demux/libpva_plugin.dylib',
-  'demux/librawaud_plugin.dylib',
-  'demux/librawdv_plugin.dylib',
-  'demux/librawvid_plugin.dylib',
-  'demux/libreal_plugin.dylib',
-  'demux/libsmf_plugin.dylib',
-  'demux/libts_plugin.dylib',
-  'demux/libtta_plugin.dylib',
-  'demux/libty_plugin.dylib',
-  'demux/libvc1_plugin.dylib',
-  'demux/libvoc_plugin.dylib',
-  'demux/libwav_plugin.dylib',
-  'demux/libxa_plugin.dylib',
-  'meta_engine/libfolder_plugin.dylib',
-  'meta_engine/libtaglib_plugin.dylib',
-  'misc/libaudioscrobbler_plugin.dylib',
-  'misc/libdummy_plugin.dylib',
-  'misc/libexport_plugin.dylib',
-  'misc/libfreetype_plugin.dylib',
-  'misc/libgnutls_plugin.dylib',
-  'misc/liblogger_plugin.dylib',
-  'misc/liblua_plugin.dylib',
-  'misc/libosd_parser_plugin.dylib',
-  'misc/libquartztext_plugin.dylib',
-  'misc/libstats_plugin.dylib',
-  'misc/libvod_rtsp_plugin.dylib',
-  'misc/libxml_plugin.dylib',
-  'misc/libxtag_plugin.dylib',
-  'mmx/libi420_rgb_mmx_plugin.dylib',
-  'mmx/libi420_yuy2_mmx_plugin.dylib',
-  'mmx/libi422_yuy2_mmx_plugin.dylib',
-  'mmx/libmemcpymmx_plugin.dylib',
-  'mmxext/libmemcpymmxext_plugin.dylib',
-  'mux/libmux_asf_plugin.dylib',
-  'mux/libmux_avi_plugin.dylib',
-  'mux/libmux_dummy_plugin.dylib',
-  'mux/libmux_mp4_plugin.dylib',
-  'mux/libmux_mpjpeg_plugin.dylib',
-  'mux/libmux_ogg_plugin.dylib',
-  'mux/libmux_ps_plugin.dylib',
-  'mux/libmux_ts_plugin.dylib',
-  'mux/libmux_wav_plugin.dylib',
-  'packetizer/libpacketizer_copy_plugin.dylib',
-  'packetizer/libpacketizer_dirac_plugin.dylib',
-  'packetizer/libpacketizer_flac_plugin.dylib',
-  'packetizer/libpacketizer_h264_plugin.dylib',
-  'packetizer/libpacketizer_mlp_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
-  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
-  'packetizer/libpacketizer_vc1_plugin.dylib',
-  'sse2/libi420_rgb_sse2_plugin.dylib',
-  'sse2/libi420_yuy2_sse2_plugin.dylib',
-  'sse2/libi422_yuy2_sse2_plugin.dylib',
-  'stream_filter/libdecomp_plugin.dylib',
-  'stream_filter/libstream_filter_rar_plugin.dylib',
-  'stream_filter/libstream_filter_record_plugin.dylib',
-  'visualization/libvisual_plugin.dylib',
+  'libaccess_attachment_plugin.dylib',
+  #'libaccess_avio_plugin.dylib',
+  #'libaccess_fake_plugin.dylib',
+  'libaccess_ftp_plugin.dylib',
+  'libaccess_http_plugin.dylib',
+  'libaccess_imem_plugin.dylib',
+  #'libaccess_mmap_plugin.dylib',
+  'libaccess_mms_plugin.dylib',
+  'libaccess_realrtsp_plugin.dylib',
+  'libaccess_tcp_plugin.dylib',
+  'libaccess_udp_plugin.dylib',
+  'libcdda_plugin.dylib',
+  'libfilesystem_plugin.dylib',
+  'libqtcapture_plugin.dylib',
+  'librtp_plugin.dylib',
+  'libzip_plugin.dylib',
+  'libaccess_output_dummy_plugin.dylib',
+  'libaccess_output_file_plugin.dylib',
+  'libaccess_output_http_plugin.dylib',
+  'libaccess_output_shout_plugin.dylib',
+  'libaccess_output_udp_plugin.dylib',
+  'liba52tofloat32_plugin.dylib',
+  'liba52tospdif_plugin.dylib',
+  'libaudio_format_plugin.dylib',
+  'libaudiobargraph_a_plugin.dylib',
+  'libchorus_flanger_plugin.dylib',
+  'libconverter_fixed_plugin.dylib',
+  'libdolby_surround_decoder_plugin.dylib',
+  'libdtstofloat32_plugin.dylib',
+  'libdtstospdif_plugin.dylib',
+  'libequalizer_plugin.dylib',
+  'libheadphone_channel_mixer_plugin.dylib',
+  'libmono_plugin.dylib',
+  'libmpgatofixed32_plugin.dylib',
+  'libnormvol_plugin.dylib',
+  'libparam_eq_plugin.dylib',
+  'libscaletempo_plugin.dylib',
+  'libsimple_channel_mixer_plugin.dylib',
+  'libspatializer_plugin.dylib',
+  'libtrivial_channel_mixer_plugin.dylib',
+  'libugly_resampler_plugin.dylib',
+  'libfloat32_mixer_plugin.dylib',
+  #'libspdif_mixer_plugin.dylib',
+  #'libtrivial_mixer_plugin.dylib',
+  'libaout_file_plugin.dylib',
+  'libauhal_plugin.dylib',
+  'liba52_plugin.dylib',
+  'libadpcm_plugin.dylib',
+  'libaes3_plugin.dylib',
+  'libaraw_plugin.dylib',
+  'libavcodec_plugin.dylib',
+  'libcc_plugin.dylib',
+  'libcdg_plugin.dylib',
+  'libdts_plugin.dylib',
+  'libfaad_plugin.dylib',
+  #'libfake_plugin.dylib',
+  'libflac_plugin.dylib',
+  'libfluidsynth_plugin.dylib',
+  #'libinvmem_plugin.dylib',
+  'liblpcm_plugin.dylib',
+  'libmpeg_audio_plugin.dylib',
+  'libpng_plugin.dylib',
+  'librawvideo_plugin.dylib',
+  'libspeex_plugin.dylib',
+  'libspudec_plugin.dylib',
+  'libtheora_plugin.dylib',
+  'libtwolame_plugin.dylib',
+  'libvorbis_plugin.dylib',
+  'libgestures_plugin.dylib',
+  'libhotkeys_plugin.dylib',
+  'libmotion_plugin.dylib',
+  'libnetsync_plugin.dylib',
+  #'libsignals_plugin.dylib',
+  'libaiff_plugin.dylib',
+  'libasf_plugin.dylib',
+  'libau_plugin.dylib',
+  #'libavformat_plugin.dylib',
+  'libavi_plugin.dylib',
+  'libdemux_cdg_plugin.dylib',
+  'libdemuxdump_plugin.dylib',
+  'libdirac_plugin.dylib',
+  'libes_plugin.dylib',
+  'libflacsys_plugin.dylib',
+  'liblive555_plugin.dylib',
+  'libmkv_plugin.dylib',
+  'libmod_plugin.dylib',
+  'libmp4_plugin.dylib',
+  'libmpc_plugin.dylib',
+  'libmpgv_plugin.dylib',
+  'libnsc_plugin.dylib',
+  'libnsv_plugin.dylib',
+  'libnuv_plugin.dylib',
+  'libogg_plugin.dylib',
+  'libplaylist_plugin.dylib',
+  'libps_plugin.dylib',
+  'libpva_plugin.dylib',
+  'librawaud_plugin.dylib',
+  'librawdv_plugin.dylib',
+  'librawvid_plugin.dylib',
+  'libreal_plugin.dylib',
+  'libsmf_plugin.dylib',
+  'libts_plugin.dylib',
+  'libtta_plugin.dylib',
+  'libty_plugin.dylib',
+  'libvc1_plugin.dylib',
+  'libvoc_plugin.dylib',
+  'libwav_plugin.dylib',
+  'libxa_plugin.dylib',
+  'libfolder_plugin.dylib',
+  'libtaglib_plugin.dylib',
+  'libaudioscrobbler_plugin.dylib',
+  'libdummy_plugin.dylib',
+  'libexport_plugin.dylib',
+  'libfreetype_plugin.dylib',
+  'libgnutls_plugin.dylib',
+  'liblogger_plugin.dylib',
+  'liblua_plugin.dylib',
+  'libosd_parser_plugin.dylib',
+  'libquartztext_plugin.dylib',
+  'libstats_plugin.dylib',
+  'libvod_rtsp_plugin.dylib',
+  'libxml_plugin.dylib',
+  #'libxtag_plugin.dylib',
+  'libi420_rgb_mmx_plugin.dylib',
+  'libi420_yuy2_mmx_plugin.dylib',
+  'libi422_yuy2_mmx_plugin.dylib',
+  'libmemcpymmx_plugin.dylib',
+  'libmemcpymmxext_plugin.dylib',
+  'libmux_asf_plugin.dylib',
+  'libmux_avi_plugin.dylib',
+  'libmux_dummy_plugin.dylib',
+  'libmux_mp4_plugin.dylib',
+  'libmux_mpjpeg_plugin.dylib',
+  'libmux_ogg_plugin.dylib',
+  'libmux_ps_plugin.dylib',
+  'libmux_ts_plugin.dylib',
+  'libmux_wav_plugin.dylib',
+  'libpacketizer_copy_plugin.dylib',
+  'libpacketizer_dirac_plugin.dylib',
+  'libpacketizer_flac_plugin.dylib',
+  'libpacketizer_h264_plugin.dylib',
+  'libpacketizer_mlp_plugin.dylib',
+  'libpacketizer_mpeg4audio_plugin.dylib',
+  'libpacketizer_mpeg4video_plugin.dylib',
+  'libpacketizer_mpegvideo_plugin.dylib',
+  'libpacketizer_vc1_plugin.dylib',
+  'libi420_rgb_sse2_plugin.dylib',
+  'libi420_yuy2_sse2_plugin.dylib',
+  'libi422_yuy2_sse2_plugin.dylib',
+  'libdecomp_plugin.dylib',
+  'libstream_filter_rar_plugin.dylib',
+  'libstream_filter_record_plugin.dylib',
+  'libvisual_plugin.dylib',
 ]
 
 VLC_SEARCH_PATH=[
@@ -199,15 +202,24 @@ QT_PLUGINS = [
 ]
 
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_sipjabber.dylib',
-  'libtomahawk_sipgoogle.dylib',
-  'libtomahawk_siptwitter.dylib',
-  'libtomahawk_sipzeroconf.dylib',
-  'libtomahawk_qtweetlib.dylib',
+  'libtomahawk_account_xmpp.so',
+  'libtomahawk_account_google.so',
+  'libtomahawk_account_twitter.so',
+  'libtomahawk_account_zeroconf.so',
+  'libtomahawk_infoplugin_adium.so',
+  'libtomahawk_infoplugin_charts.so',
+  'libtomahawk_infoplugin_discogs.so',
+  'libtomahawk_infoplugin_echonest.so',
+  'libtomahawk_infoplugin_hypem.so',
+  'libtomahawk_infoplugin_musicbrainz.so',
+  'libtomahawk_infoplugin_musixmatch.so',
+  'libtomahawk_infoplugin_newreleases.so',
+  'libtomahawk_infoplugin_rovi.so',
+  'libtomahawk_infoplugin_spotify.so',
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.7.4/plugins',
+    '/usr/local/Cellar/qt/4.8.2/plugins',
 ]
 
 
@@ -250,7 +262,7 @@ frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
 commands.append(['mkdir', '-p', frameworks_dir])
 resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
 commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'plugins')
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
 binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
 
 fixed_libraries = []
@@ -364,8 +376,7 @@ def FixVLCPlugin(abs_path, subdir):
   FixAllLibraries(broken_libs)
 
   #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  plugindir = abs_path.split('/')[-2]
-  new_path = os.path.join(plugins_dir, subdir, plugindir, os.path.basename(abs_path))
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path))
   args = ['mkdir', '-p', os.path.dirname(new_path)]
   commands.append(args)
   args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
@@ -491,21 +502,21 @@ def FindVLCPlugin(name):
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../Frameworks/vlc/plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
 
 for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
-try:
-  FixPlugin('spotify_tomahawkresolver', '../MacOS')
-except:
-  print 'Failed to find spotify resolver'
-  
 try:
   FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
   print 'Failed to find tomahawk_crash_reporter'
 
+try:
+  FixPlugin(LIBSPOTIFY_PATH, "../Frameworks")
+except:
+  print "Failed to copy libspotify from os: %s" % LIBSPOTIFY_PATH
+
 for plugin in QT_PLUGINS:
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
 

admin/mac/qt.conf

@@ -1,2 +1,2 @@
 [Paths]
-Plugins = PlugIns
+Plugins = qt-plugins

data/icons/tomahawk-icon.svg

@@ -1,304 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="600px" height="600px" viewBox="0 0 600 600" enable-background="new 0 0 600 600" xml:space="preserve">
-<path fill="#010101" d="M543.773,253.359c0-49.962-19.305-86.572-54.194-104.54C477.84,71.133,405.027,13.418,316.568,13.418
-	c-86.917,0-159.483,56.481-172.605,132.58c-38.049,16.818-59.889,55.24-59.889,107.361c0,27.029,7.188,51.824,20.321,71.749
-	c-1.816,1.565-3.444,3.282-4.77,5.239c0,0,2.582,2.359,3.689,3.373c-4.262,2.123-8.22,4.322-11.555,6.67
-	c0,0,3.021,7.355,5.896,14.353c-11.991,9.688-21.312,18.92-27.553,27.51c0,0,1.611,1.789,2.011,2.225
-	c-12.354,9.158-22.133,18.205-28.528,27.021c0,0,6.927,7.35,12.408,13.166c-17.824,28.76-43.348,74.85-43.348,102.988
-	c0,3.278,0.346,6.315,1.093,9.053c1.764,6.443,5.752,11.438,11.229,14.059c15.255,7.312,39.646-6.362,72.589-40.434
-	c-0.828,8.287-1.457,16.662-1.457,24.736c0,16.805,2.266,32.069,8.77,41.25c4.887,6.895,10.898,9.067,15.084,9.682
-	c6.723,0.99,26.375,3.797,57.992-61.295c2.678,0.705,5.421,1.178,8.235,1.178c8.798,0,17.065-3.424,23.287-9.639
-	c4.284-4.287,7.133-9.584,8.562-15.312c7.516-2.129,14.555-6.701,20.779-13.19c19.562,24.86,44.779,37.643,75.38,37.643
-	c7.317,0,14.474-0.754,21.281-2.242c0.392-0.073,2.555-0.623,2.555-0.623l0.62-0.166c23.05-5.823,42.463-20.409,58-43.254
-	c7.2,9.23,15.731,15.994,24.849,19.457c1.141,6.658,4.226,12.808,9.102,17.691c6.22,6.213,14.487,9.639,23.288,9.639
-	c8.798,0,17.063-3.426,23.285-9.639c6.221-6.229,9.647-14.494,9.647-23.293c0-8.797-3.429-17.066-9.647-23.293
-	c-2.988-2.988-6.478-5.297-10.248-6.924c0.275-2.947,0.611-5.849,0.611-9.009c0-10.028-1.398-20.979-4.19-31.897
-	c-1.196-4.672-2.757-8.746-4.513-12.568c2.84-6.467,4.807-13.268,4.807-20.426c0-7.316-1.74-14.422-4.706-21.01
-	C509.263,358.345,543.773,313.068,543.773,253.359z M451.232,150.998c-33.396-54.619-88.048-93.359-134.569-85.472
-	c-49.022-7.864-102.775,30.64-135.326,85.018c-2.646,0.208-5.276,0.497-7.875,0.88c8.694-54.414,69.431-111.108,143.107-111.108
-	c74.113,0,135.142,57.197,143.271,112.08C457.013,151.799,454.137,151.348,451.232,150.998z"/>
-<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M110.937,367.38c-72.03,93.07-97.843,163.349-81.865,170.996
-	c15.97,7.654,74.912-46.055,139.701-143.287c45.751-68.647,60.797-94.43,45.68-95.922l20.614-43.357l-10.687-6.644l-33.91,33.371
-	C179.323,272.615,166.073,296.146,110.937,367.38z"/>
-<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M140.932,379.755c-39.101,113.041-39.738,189.89-20.813,192.654
-	c18.912,2.787,59.039-67.617,89.306-182.603c21.383-81.178,27.257-111.029,11.438-108l5.133-48.806l-13.207-3.354l-22.192,42.936
-	C175.736,266.142,170.865,293.244,140.932,379.755z"/>
-<circle fill="none" stroke="#010101" stroke-width="4.8437" cx="410.28" cy="388.832" r="37.801"/>
-<path fill="#ED2224" stroke="#010101" stroke-width="4.8437" d="M475.237,157.792c-7.115-73.197-76.231-130.645-160.495-130.645
-	c-83.402,0-152.009,56.27-160.306,128.393c-39.811,13.607-58.455,52.219-58.455,97.818c0,56.946,34.681,103.108,89.925,103.108
-	c35.784,0,67.089-19.432,84.771-48.551c14.01,3.533,28.776,5.463,44.064,5.463c13.16,0,25.934-1.438,38.173-4.076
-	c17.966,28.357,49.108,47.164,84.604,47.164c55.665,0,90.696-46.162,90.696-103.108
-	C528.218,210.073,512.209,173.073,475.237,157.792z M314.742,274.908c-10.501,0-20.723-0.878-30.584-2.506
-	c1.125-6.177,1.778-12.527,1.778-19.043c0-56.941-44.786-103.104-100.03-103.104c-4.858,0-9.597,0.478-14.271,1.169
-	c8.692-54.414,69.43-111.108,143.105-111.108c74.113,0,135.144,57.197,143.27,112.08c-6.617-1.398-13.473-2.141-20.49-2.141
-	c-55.675,0-100.801,46.163-100.801,103.104c0,6.852,0.687,13.536,1.931,20.013C330.872,274.364,322.888,274.908,314.742,274.908z"/>
-<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-1087.6663" y1="191.4385" x2="-992.1917" y2="191.4385" gradientTransform="matrix(-0.3782 -0.8348 1.083 -0.4907 -423.9551 -476.2263)">
-	<stop  offset="0" style="stop-color:#010101"/>
-	<stop  offset="0.2606" style="stop-color:#3E221C"/>
-	<stop  offset="0.7732" style="stop-color:#B03126"/>
-	<stop  offset="1" style="stop-color:#ED2224"/>
-</linearGradient>
-<path fill="url(#SVGID_1_)" d="M153.69,260.35c31.322-14.19,65.739-18.887,77.129,6.254c11.391,25.14-4.763,57.026-36.091,71.214
-	c-31.323,14.192-65.948,5.311-77.338-19.83C106,292.849,122.366,274.543,153.69,260.35z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1275.886" y1="215.5034" x2="-1180.4114" y2="215.5034" gradientTransform="matrix(-0.9008 -0.3607 0.555 -1.386 -752.6548 131.7681)">
-	<stop  offset="0" style="stop-color:#B11F24"/>
-	<stop  offset="0.1017" style="stop-color:#B62024"/>
-	<stop  offset="1" style="stop-color:#ED2224"/>
-</linearGradient>
-<path fill="url(#SVGID_2_)" d="M427.738,265.165c16.043-40.085,41.342-74.985,68.475-64.122
-	c27.121,10.86,36.109,52.165,20.056,92.248c-16.053,40.089-51.062,63.773-78.189,52.912
-	C410.95,335.343,411.683,305.253,427.738,265.165z"/>
-<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M448.219,425.226c7.774,30.396,3.98,62.357-14.521,62.357
-	c-16.301,0-34.904-17.332-42.675-47.732c-7.777-30.399,4.243-75.016,14.521-62.364C423.584,399.707,440.442,394.826,448.219,425.226
-	z"/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-639.5422" y1="548.502" x2="-691.4051" y2="458.673" gradientTransform="matrix(0.9868 0.0515 0.0515 0.7987 840.2104 72.6462)">
-	<stop  offset="0" style="stop-color:#5B3E1D"/>
-	<stop  offset="0.1121" style="stop-color:#42301B"/>
-	<stop  offset="0.2377" style="stop-color:#2E2316"/>
-	<stop  offset="0.3753" style="stop-color:#1D1710"/>
-	<stop  offset="0.5292" style="stop-color:#0E0C08"/>
-	<stop  offset="0.7122" style="stop-color:#030302"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path fill="url(#SVGID_3_)" stroke="#010101" stroke-width="4.8437" d="M184.076,437.859c-6.111,23.875,1.745,46.508,17.54,50.549
-	c15.79,4.039,33.552-12.045,39.658-35.924c6.101-23.882-9.153-57.129-24.947-61.17C200.537,387.275,190.178,413.972,184.076,437.859
-	z"/>
-<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M314.837,65.525c72.757-12.333,165.505,89.311,165.505,187.528
-	c0,98.213-74.307,162.833-165.707,162.833"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-664.3811" y1="374.0068" x2="-500.546" y2="90.2362" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-	<stop  offset="0" style="stop-color:#000000"/>
-	<stop  offset="1" style="stop-color:#5B3E1D"/>
-</linearGradient>
-<path fill="url(#SVGID_4_)" stroke="#010101" stroke-width="4.8437" d="M314.635,415.888c-91.402,0-165.299-64.619-165.299-162.833
-	c0-98.218,88.615-199.862,165.5-187.528"/>
-<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="-760.302" y1="-37.9087" x2="-639.3506" y2="-247.4027" gradientTransform="matrix(-0.6092 0.7802 -0.4118 -0.3216 -240.6183 671.6459)">
-	<stop  offset="0" style="stop-color:#8B654B"/>
-	<stop  offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path fill="url(#SVGID_5_)" d="M169.611,266.578c-27.578-21.539-16.863-81.354,23.935-133.604
-	c40.804-52.245,93.81-72.894,126.21-59.689c26.672,10.864,14.476,85.434-26.326,137.681
-	C252.63,263.215,197.193,288.112,169.611,266.578z"/>
-<circle fill="#010101" cx="214.367" cy="388.832" r="34.682"/>
-<g>
-	<path fill="#F4DFED" d="M131.831,427.708c-23.973,79.734-18.741,132.268-9.011,135.459c10.854,3.564,43.561-47.223,60.839-128.324
-		c12.189-57.264,11.729-83.75,0.009-81.625l3.505-31.108l-8.899-2.435l-14.271,32.445
-		C152.554,347.564,150.184,366.689,131.831,427.708z"/>
-	
-		<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="-710.6404" y1="319.3252" x2="-710.6405" y2="562.8164" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-		<stop  offset="0" style="stop-color:#571A54"/>
-		<stop  offset="0.2641" style="stop-color:#7C5378"/>
-		<stop  offset="0.528" style="stop-color:#A78AA3"/>
-		<stop  offset="0.7459" style="stop-color:#CDBCCB"/>
-		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_6_)" d="M146.41,479.117l-22.914,19.186l35.325-65.182l4.683-17.371c0,0,3.1-26.758-24.228,14.713
-		c16.962-56.432,32.317-62.998,32.317-62.998l11.402-46.658l-4.725-1.131l-14.702,30.23c-11.429-4.588-13.859,14.521-32.392,75.483
-		c-24.226,79.656-20.501,124.087-8.358,137.777L146.41,479.117z"/>
-	
-		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="-789.3508" y1="444.1797" x2="-821.2424" y2="531.975" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 754.2939 -277.891)">
-		<stop  offset="0" style="stop-color:#802986"/>
-		<stop  offset="0.2641" style="stop-color:#9D66A2"/>
-		<stop  offset="0.528" style="stop-color:#BE9BC2"/>
-		<stop  offset="0.7459" style="stop-color:#DBC8DE"/>
-		<stop  offset="0.9095" style="stop-color:#F0E6F1"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_7_)" d="M147.332,501.478l31.839-92.399c0,0,6.608,60.69-7.474,93.406
-		c1.438-44.879-2.328-36.951-9.176-25.257C159.71,482.031,147.332,501.478,147.332,501.478z"/>
-	
-		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="-764.8928" y1="411.2344" x2="-797.3259" y2="500.5203" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 754.2939 -277.891)">
-		<stop  offset="0" style="stop-color:#802986"/>
-		<stop  offset="0.2641" style="stop-color:#9D66A2"/>
-		<stop  offset="0.528" style="stop-color:#BE9BC2"/>
-		<stop  offset="0.7459" style="stop-color:#DBC8DE"/>
-		<stop  offset="0.9095" style="stop-color:#F0E6F1"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_8_)" d="M156.286,463.716l38.825-93.953c0,0,2.251,62.279-11.831,94.992
-		c-0.298-44.25-5.388-28.09-8.538-23.508C165.662,454.416,156.286,463.716,156.286,463.716z"/>
-	
-		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="-872.7551" y1="422.8174" x2="-924.3751" y2="475.0038" gradientTransform="matrix(0.711 -0.7032 0.7032 0.711 517.3177 -556.6326)">
-		<stop  offset="0" style="stop-color:#571A54"/>
-		<stop  offset="0.2641" style="stop-color:#7C5378"/>
-		<stop  offset="0.528" style="stop-color:#A78AA3"/>
-		<stop  offset="0.7459" style="stop-color:#CDBCCB"/>
-		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_9_)" d="M180.916,431.115l9.787-73.404c0,0,18.589,43.111,16.428,71.426
-		c-11.771-30.424-13.671-21.049-17.576-14.961C187.396,417.539,180.916,431.115,180.916,431.115z"/>
-	<path fill="#1E3D73" d="M174.914,335.556L158.76,362.31l-23.24,76.646c0,0,1.211-8.172,1.788-15.883l-18.783,50.772
-		c0,0,8.386-31.227,3.607-28.383c-4.775,2.84,4.227-21.91-23.102,13.73c5.316-18.517,20.495-39.511,33.324-54.9
-		c-2.172,0.473-7.102,4.787-18.388,18.373c4.381-15.232,14.956-32.934,25.357-47.898c-1.159-2.682-5.151-3.889-21.234,5.224
-		C134.366,356.718,174.914,335.556,174.914,335.556z"/>
-</g>
-<g>
-	<path fill="#F4DFED" d="M94.453,401.164c-49.752,66.752-62.779,117.912-54.719,124.242c8.987,7.059,57.062-29.513,100.989-99.847
-		c31.011-49.655,39.62-74.709,27.879-76.713l13.916-28.053l-7.539-5.318l-24.483,25.623
-		C141.291,332.912,132.531,350.072,94.453,401.164z"/>
-	<path fill="#656B84" d="M90.603,454.464l-28.088,10.205l55.456-49.201l10.331-14.729c0,0,12.047-24.097-27.796,5.559
-		c35.213-47.256,51.892-48.182,51.892-48.182l26.641-39.957l-4.058-2.683l-24.133,23.4c-9.179-8.223-17.989,8.91-56.226,59.885
-		c-49.96,66.601-61.634,109.635-54.889,126.646L90.603,454.464z"/>
-	
-		<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="-752.551" y1="484.6816" x2="-736.7991" y2="395.3488" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-		<stop  offset="0" style="stop-color:#571A54"/>
-		<stop  offset="0.2641" style="stop-color:#7C5378"/>
-		<stop  offset="0.528" style="stop-color:#A78AA3"/>
-		<stop  offset="0.7459" style="stop-color:#CDBCCB"/>
-		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_10_)" d="M83.829,475.791l61.476-75.98c0,0-14.509,59.306-38.916,85.248
-		c16.678-41.694,12.058-33.366,0-26.873C101.491,460.822,83.829,475.791,83.829,475.791z"/>
-	
-		<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="-727.8064" y1="453.3486" x2="-711.9149" y2="363.2233" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-		<stop  offset="0" style="stop-color:#571A54"/>
-		<stop  offset="0.2641" style="stop-color:#7C5378"/>
-		<stop  offset="0.528" style="stop-color:#A78AA3"/>
-		<stop  offset="0.7459" style="stop-color:#CDBCCB"/>
-		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_11_)" d="M105.143,443.357l68.562-75.052c0,0-19.143,59.297-43.551,85.248
-		c14.824-41.7,10.567-27.994,0-25.022C124.802,430.041,105.143,443.357,105.143,443.357z"/>
-	<path fill="#656B84" d="M139.423,421.125l34.262-65.654c0,0,2.748,46.867-8.945,72.74c-0.676-32.615-3.041-28.432-11.413-20.061
-		C150.5,410.974,139.423,421.125,139.423,421.125z"/>
-	<path fill="#656B84" d="M166.408,329.255l-24.322,19.631l-48.011,64.111c0,0,3.931-7.273,7.104-14.322L66.185,439.99
-		c0,0,18.552-26.484,13.089-25.449c-5.464,1.041,11.451-19.148-26.399,5.02c11.313-15.588,32.751-30.137,50.064-40.227
-		c-2.205-0.299-8.316,2.076-23.552,10.988c9.312-12.818,25.302-25.842,40.183-36.357c-0.175-2.918-3.515-5.416-21.74-2.346
-		C121.065,335.3,166.408,329.255,166.408,329.255z"/>
-</g>
-<g>
-	<path fill="#D9AF82" d="M315.05,115.063c-50.514,0-83.218,15.021-109.641,64.839c-2.502,4.713-0.23,14.337-2.796,19.152
-		c-13.845,26.007-37.089,48.236-37.089,71.707c0,34.335,19.1,65.637,42.505,89.296c12.185,71.646,34.7,151.595,104.339,151.595"/>
-	<path fill="#010101" d="M203.271,178.766c-1.521,2.855-1.59,6.774-1.656,10.562c-0.062,3.283-0.123,6.677-1.14,8.588
-		c-4.537,8.519-10.146,16.707-15.577,24.624c-11.21,16.353-21.797,31.798-21.797,48.221c0,30.307,15.166,62.38,42.666,90.412
-		c12.578,73.607,36.113,150.479,106.6,150.479v-1.547c-67.084,0-89.722-78.556-101.95-150.453l-0.127-0.748l-0.54-0.549
-		c-26.957-27.257-41.805-58.361-41.805-87.594c0-14.923,10.174-29.766,20.949-45.482c5.501-8.027,11.19-16.327,15.855-25.087
-		c1.562-2.935,1.638-6.92,1.707-10.773c0.059-3.221,0.118-6.551,1.088-8.381c24.258-45.734,54.398-65.974,107.503-65.974v-2.422
-		C259.849,112.641,228.506,131.181,203.271,178.766z"/>
-</g>
-<path fill="#8B654B" d="M312.368,511.65c72.045,0,92.163-79.949,104.338-151.595c23.405-23.657,42.514-54.959,42.514-89.296
-	c0-37.004-22.588-49.51-38.609-77.154c-5.681-9.798-1.496-24.634-8.084-33.382c-26.905-35.728-53.772-45.162-97.477-45.162"/>
-<ellipse fill="#D9AF82" cx="313.792" cy="343.947" rx="21.906" ry="68.144"/>
-<path fill="#8B654B" d="M342.916,373.455c0,7.812-14.979,12.535-27.273,12.535c-12.293,0-27.81-4.736-27.81-12.549
-	c3.432-3.433,15.246,4.885,27.544,4.885C334.789,378.326,342.916,312.496,342.916,373.455z"/>
-<path fill="#D9AF82" d="M335.697,435.216c0,37.637-9.81,68.832-21.91,68.832c-12.096,0-21.899-31.195-21.899-68.832
-	c0-37.639,9.882-50.258,21.977-50.258C325.962,384.958,335.697,397.578,335.697,435.216z"/>
-<path opacity="0.36" fill="#8A644B" enable-background="new    " d="M328.365,281.605c-1.826,24.682-14.186-7.573-34.757,20.975
-	c-8.672,12.025-23.23,10.877-38.845,10.877c-39.61,0-66.544-26.031-67.859-38.869c-2.517-24.557,29.024-39.586,71.464-39.586
-	C297.028,235.002,329.255,269.622,328.365,281.605z"/>
-<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="-644.0354" y1="340.7031" x2="-568.3508" y2="340.7031" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-	<stop  offset="0" style="stop-color:#D9AF82"/>
-	<stop  offset="0.0786" style="stop-color:#DFB791"/>
-	<stop  offset="0.2053" style="stop-color:#E7C1A5"/>
-	<stop  offset="0.345" style="stop-color:#EDC9B5"/>
-	<stop  offset="0.5023" style="stop-color:#F1CFC0"/>
-	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
-	<stop  offset="1" style="stop-color:#F5D4C9"/>
-</linearGradient>
-<path opacity="0.36" fill="url(#SVGID_12_)" enable-background="new    " d="M272.246,361.529
-	c-28.722,19.461-56.346-24.299-57.491-43.314c15.913,13.822,62.032,18.457,75.685-2.516L272.246,361.529z"/>
-<path opacity="0.36" fill="#8A644B" enable-background="new    " d="M313.706,461.212c-38.167,0-61.229-13.68-61.229-31.629
-	c0-6.049,15.649-24.078,37.318-49.365c5.952-3.699,7.464,10.037,14.958,4.73C331.61,392.044,328.318,461.212,313.706,461.212z"/>
-<g>
-	<path fill="#8A644B" d="M260.464,472.117c8.341,23.938,32.817,36.465,52.688,36.465v-4.844
-		C294.99,503.738,268.056,493.921,260.464,472.117L260.464,472.117z"/>
-</g>
-<g>
-	<path fill="#8A644B" d="M180.954,271.658c0,21.359,5.388,36.679,27.101,48.222c0.587,1.121,7.021,13.387,7.021,13.387
-		c8.916,16.375,19.021,34.939,19.021,54.406h4.844c0-20.699-10.416-39.84-19.612-56.725l-7.586-14.455l-0.709-0.426
-		C190.51,305.4,180.954,291.289,180.954,271.658L180.954,271.658z"/>
-</g>
-<g>
-	<path fill="#010101" d="M208.814,230.649l-0.104-0.97c-3.106-15.25-3.226-33.651-0.312-49.217l-4.764-0.889
-		C200.613,195.722,205.583,214.815,208.814,230.649z"/>
-</g>
-<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="-667.7327" y1="310.1709" x2="-407.218" y2="310.1709" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-	<stop  offset="0" style="stop-color:#5B3E1D"/>
-	<stop  offset="1" style="stop-color:#010101"/>
-</linearGradient>
-<path fill="url(#SVGID_13_)" d="M423.943,199.054c-3.983-11.059-0.737-20.853-8.062-31.231
-	c-19.885-28.185-51.07-56.271-108.998-52.618l5.214,140.363c0,0-122.733-25.589-121.021,15.935c0.229,5.387,40.188,2.88,63.46,4.428
-	c-26.092,4.566-32.185,5.898-32.185,8.838c0,6.206,21.861,0.683,25.106,2.467c4.978,2.739-43.139,7.052-34.351,8.757
-	c10.057,1.951,44.474,3.086,57.442,3.086c28.931,0,41.077-25.413,41.077-4.485c7.348,27.894,14.739,59.239,13.974,69.882
-	c-1.477,20.661-19.62,20.188-19.62,20.188l5.089,24.285c-8.557,0.438-6.245-1.324-13.85-0.549c-14.429,0-32.354,13.03-32.354,16.055
-	l39.989,0.434c0,0-29.081,13.771-22.977,22.931c4.765,7.143,20.316,13.377,31.093,13.424c0,0,3.271,8.549,3.271,22.352
-	c0,13.812-4.035,22.564-4.035,22.564c46.171,0,67.49-49.035,80.324-118.445c6.083-32.877,20.018-58.104,36.034-71.658
-	c15.742-13.319,23.008-26.64,23.008-52.07C451.577,249.847,443.574,230.354,423.943,199.054z"/>
-<path fill="#D9AF82" d="M325.395,252.416l-13.297,4.328c0,0-65.85-96.356-46.493-121.312c12.682-16.357,24.609-18.136,40.046-19.238
-	c13.519-0.965,21.294,16.525,27.302,24.271C350.375,162.927,325.395,252.416,325.395,252.416z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="-629.0159" y1="50.6562" x2="-540.175" y2="50.6562" gradientTransform="matrix(0.676 0.6564 -0.9247 0.9523 711.8302 511.1852)">
-	<stop  offset="0" style="stop-color:#FFFFFF"/>
-	<stop  offset="0.0769" style="stop-color:#F4E9DD"/>
-	<stop  offset="0.1814" style="stop-color:#EBD6BF"/>
-	<stop  offset="0.2951" style="stop-color:#E5C7A8"/>
-	<stop  offset="0.419" style="stop-color:#DFBC96"/>
-	<stop  offset="0.5585" style="stop-color:#DCB58B"/>
-	<stop  offset="0.7265" style="stop-color:#DAB084"/>
-	<stop  offset="1" style="stop-color:#D9AF82"/>
-</linearGradient>
-<path fill="url(#SVGID_14_)" d="M305.253,199.27c-26.745,27.542-70.168,41.961-81.281,24.357
-	c-14.515-22.972-12.896-47.545,13.854-75.082c26.74-27.547,64.922-33.847,85.28-14.081
-	C343.464,154.233,332.003,171.726,305.253,199.27z"/>
-<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="-617.7107" y1="401.4551" x2="-617.7107" y2="317.8633" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-	<stop  offset="0" style="stop-color:#D9AF82"/>
-	<stop  offset="0.1127" style="stop-color:#BD936E"/>
-	<stop  offset="0.2679" style="stop-color:#A57C5E"/>
-	<stop  offset="0.4437" style="stop-color:#966E53"/>
-	<stop  offset="0.6554" style="stop-color:#8D664D"/>
-	<stop  offset="1" style="stop-color:#8A644B"/>
-</linearGradient>
-<path fill="url(#SVGID_15_)" d="M272.246,361.529c0,46.272-35.419,42.799-45.104,36.896c0-45.752-17.229-80.211-17.229-80.211
-	S249.882,354.22,272.246,361.529z"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="-925.8547" y1="344.666" x2="-972.7458" y2="361.7328" gradientTransform="matrix(-1 0 0 1 -562.3931 0.3506)">
-	<stop  offset="0" style="stop-color:#382815"/>
-	<stop  offset="0.4081" style="stop-color:#553E2B"/>
-	<stop  offset="1" style="stop-color:#8B654B"/>
-</linearGradient>
-<path fill="url(#SVGID_16_)" d="M359.338,356.349c0,46.271,21.506,44.033,31.073,44.033c7.488-45.135,35.671-81.516,35.671-81.516
-	S381.703,349.044,359.338,356.349z"/>
-<path fill="none" stroke="#010101" stroke-width="4.8437" d="M173.934,294.978"/>
-<g>
-	<path fill="#010101" d="M311.507,115.089c53.106,0,83.247,20.214,107.505,65.948c0.902,1.702,0.902,4.883,0.902,7.96
-		c-0.005,4.146-0.005,8.432,2.029,11.419c16.157,23.757,31.934,48.809,31.934,70.969c0,32.38-12.817,62.458-37.073,86.969
-		l-0.541,0.551l-0.13,0.748c-12.222,71.897-36.672,150.451-103.765,150.451v1.518c70.499,0,95.847-76.844,108.416-150.455
-		c24.803-25.336,37.937-56.355,37.937-89.781c0-23.537-16.19-49.311-32.774-73.694c-1.151-1.698-1.19-5.061-1.19-8.37
-		c0-0.109,0.004-0.537,0.004-0.646c0-3.567-0.041-7.221-1.471-9.91C398.053,131.18,366.71,112.64,311.51,112.64v2.449H311.507
-		L311.507,115.089z"/>
-</g>
-<polygon fill="#010101" points="339.974,84.79 334.59,115.675 300.608,113.719 312.435,66.413 "/>
-<circle fill="#010101" stroke="#010101" stroke-width="4.8437" cx="452.06" cy="492.948" r="19.204"/>
-<g>
-	
-		<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="-749.6116" y1="335.9512" x2="-687.9983" y2="335.9512" gradientTransform="matrix(1 0 0 1 858.79 0.3506)">
-		<stop  offset="0" style="stop-color:#571A54"/>
-		<stop  offset="0.2641" style="stop-color:#7C5378"/>
-		<stop  offset="0.528" style="stop-color:#A78AA3"/>
-		<stop  offset="0.7459" style="stop-color:#CDBCCB"/>
-		<stop  offset="0.9095" style="stop-color:#EAE1E8"/>
-		<stop  offset="1" style="stop-color:#F9F3F8"/>
-	</linearGradient>
-	<path fill="url(#SVGID_17_)" d="M109.178,338.035c9.592-7.824,34.694,4.861,34.833,4.861l26.78-8.396
-		C170.211,334.501,120.246,321.648,109.178,338.035z"/>
-</g>
-<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-1081.0227" y1="320.6133" x2="-1063.3801" y2="320.6133" gradientTransform="matrix(-0.0113 -0.7169 1.2476 -0.0198 -98.6661 -397.1379)">
-	<stop  offset="0" style="stop-color:#D9AF82"/>
-	<stop  offset="0.0786" style="stop-color:#DFB791"/>
-	<stop  offset="0.2053" style="stop-color:#E7C1A5"/>
-	<stop  offset="0.345" style="stop-color:#EDC9B5"/>
-	<stop  offset="0.5023" style="stop-color:#F1CFC0"/>
-	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
-	<stop  offset="1" style="stop-color:#F5D4C9"/>
-</linearGradient>
-<path opacity="0.36" fill="url(#SVGID_18_)" enable-background="new    " d="M313.352,358.851c6.074-0.1,11.045,2.654,11.102,6.15
-	c0.06,3.49-4.829,6.398-10.907,6.498c-6.076,0.1-11.045-2.658-11.105-6.154C302.388,361.853,307.269,358.947,313.352,358.851z"/>
-<path fill="#483218" d="M397.109,309.378c15.699-3.76,26.445-18.402,20.099-27.063c-38.738,19.354-75.295,11.369-85.529,9.147
-	C368.014,309.492,371.117,315.595,397.109,309.378z"/>
-<path fill="#B4B4B4" d="M310.92,73.714c-38.372,0-93.116,22.758-117.549,74.944c-6.089,12.999-6.656,32.87,0.64,45.014
-	c0,0,18.604-81.43,108.229-86.494"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="606.2478"
+   height="595.49866"
+   viewBox="0 0 606.24779 595.49863"
+   enable-background="new 0 0 841.89 595.28"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="tomahawk-icon.svg"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="794"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="1"
+   inkscape:cx="431.12548"
+   inkscape:cy="336.94553"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:snap-page="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"><sodipodi:guide
+     position="-3.5728101e-05,-1.501866e-05"
+     orientation="0,841.89001"
+     id="guide2994" /><sodipodi:guide
+     position="841.88997,-1.501866e-05"
+     orientation="-595.28003,0"
+     id="guide2996" /><sodipodi:guide
+     position="841.88997,595.28001"
+     orientation="0,-841.89001"
+     id="guide2998" /><sodipodi:guide
+     position="-3.5728101e-05,595.28001"
+     orientation="595.28003,0"
+     id="guide3000" /></sodipodi:namedview>
+<g
+   id="g3"
+   transform="matrix(7.3080643,0,0,7.1790074,-2773.1692,-1839.0104)">
+	<g
+   id="g5">
+		<path
+   d="m 420.947,265.168 c -17.911,0 -32.477,14.565 -32.477,32.472 0,17.906 14.565,32.476 32.477,32.476 2.568,0 5.06,-0.318 7.459,-0.888 v -28.011 l -22.338,15.806 c -0.198,0.135 -0.444,0.213 -0.681,0.213 -0.184,0 -0.372,-0.039 -0.541,-0.136 -0.396,-0.202 -0.642,-0.608 -0.642,-1.043 v -37.053 c 0,-0.435 0.246,-0.845 0.642,-1.053 0.396,-0.193 0.864,-0.159 1.222,0.092 l 22.338,15.807 v -16.028 h 0.951 8.945 v 47.234 c 9.076,-5.764 15.121,-15.888 15.121,-27.417 10e-4,-17.905 -14.569,-32.471 -32.476,-32.471 z"
+   id="path7"
+   inkscape:connector-curvature="0"
+   style="fill:none" />
+		<path
+   d="m 420.947,256.165 c -22.874,0 -41.48,18.606 -41.48,41.475 0,22.87 18.606,41.475 41.48,41.475 22.869,0 41.476,-18.605 41.476,-41.475 0,-22.869 -18.607,-41.475 -41.476,-41.475 z m 17.356,68.892 v -47.234 h -8.945 -0.951 v 16.028 l -22.338,-15.807 c -0.357,-0.251 -0.826,-0.285 -1.222,-0.092 -0.396,0.208 -0.642,0.618 -0.642,1.053 v 37.053 c 0,0.435 0.246,0.841 0.642,1.043 0.169,0.097 0.357,0.136 0.541,0.136 0.236,0 0.482,-0.078 0.681,-0.213 l 22.338,-15.806 v 28.011 c -2.399,0.569 -4.891,0.888 -7.459,0.888 -17.911,0 -32.477,-14.57 -32.477,-32.476 0,-17.906 14.565,-32.472 32.477,-32.472 17.906,0 32.477,14.565 32.477,32.472 -0.001,11.528 -6.046,21.652 -15.122,27.416 z"
+   id="path9"
+   inkscape:connector-curvature="0"
+   style="fill:#e63e30" />
+	</g>
+</g>
+</svg>

data/misc/tomahawk_pubkey.pem

@@ -0,0 +1,20 @@
+-----BEGIN PUBLIC KEY-----
+MIIDOzCCAi0GByqGSM44BAEwggIgAoIBAQDRltnNbKWFroVCsG1nTSdlTDmo7fjl
+tgOuQ0YB2s0a1bcqgQ5YJRE59pFvF/z2pkHEHdyBA6USd9N7/T9lolwNcJoByJpO
+MobUNs04elqZXliriaAdoSb2g6ZpxiedppbbyNP/BlK6o+zpyn0LVYXDI/OwJFzS
+xjGXM+rBEWdUJnogZxV31gF9W3yD1Quz6icBulT9V/Soo6me9Mc60ooKSYj4Zgqd
+3ln8tG90RFnWfbb0nbrITvR3ll6XXLfn081tjhymcXqHcgvaaqcmpKWL6ZWwX1mH
+3t1pImnif/tSSZPG21KGE3FtuQ/+YFo19apQ6U6l8kaSFxqcDLAYzBy9AhUA/QfN
+8WEIvzOEZ9uSWT7lYy64mUkCggEABsUmcs3kwjrmszIAAmPIowA0DBrxWZL03JBV
+bDKT6tNHZaFFlCufVSjiL1EFZjRARC16OWYaDcElUsZYFMcsNIIa8LyDQaq6+SSm
+quhMO5heeJiYPrutDiJzbJr0+HoY77Ll+Q4/cEkl0UAN4Ovp18WKwaq6GpHAvBnv
+71LunLGAKsVb5joXBQ8In6zQkibJhgiBJwzLK90/j0OTiDaaOwM3PsAegORBVlVE
+TAk4AQmawmF8nBGLzTyKXl83J571ku1Mm2JTl16jMYziKARKXYBmkcP1at0YddVK
+WWpAwRKSxOucVJYfV58JqmjZqst8BBeH6esQKr5dklUvvDMaEwOCAQYAAoIBAQCw
+5mo+8/R3S9cNYg9o8JNJGdSbMhSkurILHh9WNElsIC3RNtPcpijmAnWtXTVDhe6w
+77wLj37tUuFGbsu2qPXtZoup35emf9DDshZ5w5UOclPaZ9HYjlC1H64c6d66Rllk
+fY6FRDv9qVfjT84APbvMDrk6csJ5YHxFPDaqeQaFB0nxFiCMVwjEx+ZSvQNK1jJ2
+o2gtuOvSPVSphsMeJ72DDNxO+SRRVnOmWaxg9rlmFuGle6Z+UJ2FItfmPEvhSBMY
+hzndUbC7Wi4sIpBzbm9O5MiPYMv0VmN+0t1156EiC9uR4f7AKH2S94dnQob/YeY0
+jMH+XxU/wzGUCmsOx1lx
+-----END PUBLIC KEY-----

data/www/auth.html

@@ -43,8 +43,8 @@
     </style>
 </head>
 <body>
-    <a href="http://www.playdar.org/" title="Tomahawk - Powered by Playdar" id="head">
-        <img alt="Tomahawk - Powered by Playdar" src="/staticdata/tomahawk_auth_logo.png" width="196" height="45"/>
+    <a href="http://www.tomahawk-player.org" title="Tomahawk - Powered by Playdar" id="head">
+        <img alt="Tomahawk - Powered by Playdar" src="/staticdata/tomahawk_auth_logo.png" width="200" height="30">
     </a>
     
     <div id="content">

data/www/auth.na.html

@@ -32,8 +32,8 @@
     </style>
 </head>
 <body>
-    <a href="http://www.gettomahawk.com/" title="Tomahawk - Powered by Playdar" id="head">
-        <img alt="Tomahawk - Powered by Playdar" src="/staticdata/tomahawk_auth_logo.png" width="196" height="45"/>
+    <a href="http://www.tomahawk-player.org" title="Tomahawk - Powered by Playdar" id="head">
+        <img alt="Tomahawk - Powered by Playdar" src="/staticdata/tomahawk_auth_logo.png" width="200" height="30">
     </a>
     
     <div id="content">

lang/tomahawk_i18n.qrc

@@ -1,9 +1,15 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/lang">
 <file>tomahawk_en.qm</file>
+<file>tomahawk_bg.qm</file>
 <file>tomahawk_de.qm</file>
-<file>tomahawk_sv.qm</file>
-<file>tomahawk_es.qm</file>
+<file>tomahawk_fr.qm</file>
+<file>tomahawk_pl.qm</file>
 <file>tomahawk_pt_BR.qm</file>
+<file>tomahawk_ru.qm</file>
+<file>tomahawk_es.qm</file>
+<file>tomahawk_sv.qm</file>
+<file>tomahawk_ja.qm</file>
+<file>tomahawk_ar.qm</file>
 </qresource>
 </RCC>

lang/translations.cmake

@@ -1,25 +1,48 @@
-FILE (GLOB TS_FILES ${CMAKE_SOURCE_DIR}/lang/*.ts)
-QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+macro(add_tomahawk_translations language)
+    list(APPEND TOMAHAWK_LANGUAGES ${ARGV})
 
-## HACK HACK HACK - around rcc limitations to allow out of source-tree building
-SET( trans_file tomahawk_i18n )
-SET( trans_srcfile ${CMAKE_SOURCE_DIR}/lang/${trans_file}.qrc)
-SET( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc)
-SET( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx)
+    set(tomahawk_i18n_qrc_content "<!DOCTYPE RCC><RCC version=\"1.0\">\n")
 
-# Copy the QRC file to the output directory
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${trans_infile}
-  COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile}
-  MAIN_DEPENDENCY ${trans_srcfile}
-)
+    # tomahawk and qt language files
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<qresource prefix=\"/lang\">\n")
+    foreach(lang ${TOMAHAWK_LANGUAGES})
+        set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<file>tomahawk_${lang}.qm</file>\n")
+        if(NOT lang STREQUAL "en" AND EXISTS ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm)
+            file(COPY ${QT_TRANSLATIONS_DIR}/qt_${lang}.qm DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+            set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}<file>qt_${lang}.qm</file>\n")
+        endif()
 
-# Run the resource compiler (rcc_options should already be set)
-ADD_CUSTOM_COMMAND(
-  OUTPUT ${trans_outfile}
-  COMMAND ${QT_RCC_EXECUTABLE}
-  ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile}
-  MAIN_DEPENDENCY ${trans_infile}
-  DEPENDS ${QM_FILES}
-)
+        # build explicitly enabled languages
+        list(APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/tomahawk_${lang}.ts")
+    endforeach()
+
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}</qresource>\n")
+    set(tomahawk_i18n_qrc_content "${tomahawk_i18n_qrc_content}</RCC>\n")
+
+    file(WRITE ${CMAKE_BINARY_DIR}/lang/tomahawk_i18n.qrc "${tomahawk_i18n_qrc_content}" )
+
+    QT4_ADD_TRANSLATION(QM_FILES ${TS_FILES})
+
+    ## HACK HACK HACK - around rcc limitations to allow out of source-tree building
+    SET( trans_file tomahawk_i18n )
+    SET( trans_srcfile ${CMAKE_BINARY_DIR}/lang/${trans_file}.qrc)
+    SET( trans_infile ${CMAKE_CURRENT_BINARY_DIR}/${trans_file}.qrc)
+    SET( trans_outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${trans_file}.cxx)
+
+    # Copy the QRC file to the output directory
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${trans_infile}
+        COMMAND ${CMAKE_COMMAND} -E copy ${trans_srcfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_srcfile}
+    )
+
+    # Run the resource compiler (rcc_options should already be set)
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${trans_outfile}
+        COMMAND ${QT_RCC_EXECUTABLE}
+        ARGS ${rcc_options} -name ${trans_file} -o ${trans_outfile} ${trans_infile}
+        MAIN_DEPENDENCY ${trans_infile}
+        DEPENDS ${QM_FILES}
+    )
+endmacro()
 

resources.qrc

@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/">
-        <file>data/images/avatar-dude-plus.png</file>
-        <file>data/images/avatar-dude.png</file>
         <file>data/images/back-pressed.png</file>
         <file>data/images/back-rest.png</file>
         <file>data/images/filter.png</file>
@@ -9,6 +7,8 @@
         <file>data/images/not-loved.png</file>
         <file>data/images/no-album-art-placeholder.png</file>
         <file>data/images/no-artist-image-placeholder.png</file>
+        <file>data/images/artist-placeholder-grid.png</file>
+        <file>data/images/album-placeholder-grid.png</file>
         <file>data/images/track-placeholder.png</file>
         <file>data/images/now-playing-panel.png</file>
         <file>data/images/now-playing-speaker.png</file>
@@ -66,12 +66,10 @@
         <file>data/images/echonest_logo.png</file>
         <file>data/images/loading-animation.gif</file>
         <file>data/images/info.png</file>
-        <file>data/images/home.png</file>
         <file>data/images/back.png</file>
         <file>data/images/forward.png</file>
         <file>data/images/music-icon.png</file>
         <file>data/images/configure.png</file>
-        <file>data/images/create-playlist.png</file>
         <file>data/images/private-listening.png</file>
         <file>data/images/add.png</file>
         <file>data/images/recently-played.png</file>
@@ -87,6 +85,7 @@
         <file>data/images/station.png</file>
         <file>data/images/new-additions.png</file>
         <file>data/images/charts.png</file>
+        <file>data/images/new-releases.png</file>
         <file>data/images/loved_playlist.png</file>
         <file>data/images/dashboard.png</file>
         <file>data/images/artist-icon.png</file>
@@ -134,7 +133,18 @@
         <file>data/images/no-album-no-case.png</file>
         <file>data/images/rdio.png</file>
         <file>data/images/grooveshark.png</file>
+        <file>data/images/lastfm-icon.png</file>
+        <file>data/images/spotifycore-logo.png</file>
+        <file>data/images/playlist-header-tiled.png</file>
+        <file>data/images/share.png</file>
         <file>data/sql/dbmigrate-27_to_28.sql</file>
         <file>data/images/process-stop.png</file>
+        <file>data/icons/tomahawk-icon-128x128-grayscale.png</file>
+        <file>data/images/collection.png</file>
+        <file>data/misc/tomahawk_pubkey.pem</file>
+        <file>data/images/track-icon-sidebar.png</file>
+        <file>data/images/jump-link.png</file>
+        <file>data/images/scrollbar-vertical-handle.png</file>
+        <file>data/images/scrollbar-horizontal-handle.png</file>
     </qresource>
 </RCC>

src/AudioControls.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -16,23 +17,25 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "audiocontrols.h"
-#include "ui_audiocontrols.h"
+#include "AudioControls.h"
+#include "ui_AudioControls.h"
 
 #include <QtNetwork/QNetworkReply>
 #include <QtGui/QDropEvent>
 #include <QtGui/QMouseEvent>
 
-#include "audio/audioengine.h"
-#include "playlist/playlistview.h"
-#include "database/database.h"
-#include "widgets/imagebutton.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-#include "album.h"
-#include "dropjob.h"
-#include "globalactionmanager.h"
-#include "viewmanager.h"
+#include "audio/AudioEngine.h"
+#include "playlist/PlaylistView.h"
+#include "database/Database.h"
+#include "widgets/ImageButton.h"
+#include "utils/TomahawkUtilsGui.h"
+#include "utils/Logger.h"
+#include "Album.h"
+#include "DropJob.h"
+#include "SocialWidget.h"
+#include "GlobalActionManager.h"
+#include "ViewManager.h"
+#include "Source.h"
 
 using namespace Tomahawk;
 
@@ -40,9 +43,10 @@ using namespace Tomahawk;
 AudioControls::AudioControls( QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::AudioControls )
-    , m_repeatMode( PlaylistInterface::NoRepeat )
+    , m_repeatMode( PlaylistModes::NoRepeat )
     , m_shuffled( false )
     , m_lastSliderCheck( 0 )
+    , m_parent( parent )
 {
     ui->setupUi( this );
     setAcceptDrops( true );
@@ -50,13 +54,10 @@ AudioControls::AudioControls( QWidget* parent )
     QFont font( ui->artistTrackLabel->font() );
     font.setPixelSize( 12 );
 
-#ifdef Q_WS_MAC
-    font.setPixelSize( font.pixelSize() - 2 );
-#endif
-
     ui->artistTrackLabel->setFont( font );
     ui->artistTrackLabel->setElideMode( Qt::ElideMiddle );
     ui->artistTrackLabel->setType( QueryLabel::ArtistAndTrack );
+    ui->artistTrackLabel->setJumpLinkVisible( true );
 
     ui->albumLabel->setFont( font );
     ui->albumLabel->setType( QueryLabel::Album );
@@ -81,8 +82,12 @@ AudioControls::AudioControls( QWidget* parent )
     ui->repeatButton->setPixmap( RESPATH "images/repeat-off-pressed.png", QIcon::Off, QIcon::Active );
     ui->volumeLowButton->setPixmap( RESPATH "images/volume-icon-muted.png" );
     ui->volumeHighButton->setPixmap( RESPATH "images/volume-icon-full.png" );
+    ui->socialButton->setPixmap( RESPATH "images/share.png" );
     ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
     ui->loveButton->setCheckable( true );
+    
+    ui->socialButton->setFixedSize( QSize( 20, 20 ) );
+    ui->loveButton->setFixedSize( QSize( 20, 20 ) );
 
 #ifdef Q_WS_MAC
     ui->ownerLabel->setForegroundRole( QPalette::Text );
@@ -92,14 +97,12 @@ AudioControls::AudioControls( QWidget* parent )
     ui->metaDataArea->setStyleSheet( "QWidget#metaDataArea {\nborder-width: 4px;\nborder-image: url(" RESPATH "images/now-playing-panel.png) 4 4 4 4 stretch stretch; }" );
 
     ui->seekSlider->setEnabled( true );
+    ui->seekSlider->setTimeLine( &m_sliderTimeLine );
     ui->volumeSlider->setRange( 0, 100 );
     ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
 
     m_phononTickCheckTimer.setSingleShot( true );
 
-    m_sliderTimeLine.setCurveShape( QTimeLine::LinearCurve );
-    ui->seekSlider->setTimeLine( &m_sliderTimeLine );
-
     connect( &m_phononTickCheckTimer, SIGNAL( timeout() ), SLOT( phononTickCheckTimeout() ) );
     connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );
 
@@ -119,8 +122,9 @@ AudioControls::AudioControls( QWidget* parent )
     connect( ui->shuffleButton,    SIGNAL( clicked() ), SLOT( onShuffleClicked() ) );
 
     connect( ui->artistTrackLabel, SIGNAL( clickedArtist() ), SLOT( onArtistClicked() ) );
-    connect( ui->artistTrackLabel, SIGNAL( clickedTrack() ), SLOT( onTrackClicked() ) );
-    connect( ui->albumLabel,       SIGNAL( clickedAlbum() ), SLOT( onAlbumClicked() ) );
+    connect( ui->artistTrackLabel, SIGNAL( clickedTrack() ),  SLOT( onTrackClicked() ) );
+    connect( ui->albumLabel,       SIGNAL( clickedAlbum() ),  SLOT( onAlbumClicked() ) );
+    connect( ui->socialButton,     SIGNAL( clicked() ),       SLOT( onSocialButtonClicked() ) );
     connect( ui->loveButton,       SIGNAL( clicked( bool ) ), SLOT( onLoveButtonClicked( bool ) ) );
 
     // <From AudioEngine>
@@ -199,17 +203,22 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 
     ui->seekSlider->setRange( 0, duration );
     ui->seekSlider->setValue( 0 );
+    ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
 
     m_phononTickCheckTimer.stop();
 
     m_sliderTimeLine.stop();
     m_sliderTimeLine.setDuration( duration );
     m_sliderTimeLine.setFrameRange( 0, duration );
+    m_sliderTimeLine.setCurveShape( QTimeLine::LinearCurve );
     m_sliderTimeLine.setCurrentTime( 0 );
     m_seekMsecs = -1;
 
     ui->seekSlider->setVisible( true );
 
+    int updateRate = (double)1000 / ( (double)ui->seekSlider->contentsRect().width() / (double)( duration / 1000 ) );
+    m_sliderTimeLine.setUpdateInterval( qBound( 40, updateRate, 500 ) );
+
     m_noTimeChange = false;
     m_lastSliderCheck = 0;
 }
@@ -220,12 +229,12 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 {
     if ( !m_currentTrack.isNull() )
     {
-        disconnect( m_currentTrack->album().data(), SIGNAL( updated() ), this, SLOT( onAlbumCoverUpdated() ) );
+        disconnect( m_currentTrack->toQuery().data(), SIGNAL( updated() ), this, SLOT( onCoverUpdated() ) );
         disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
     }
 
     m_currentTrack = result;
-    connect( m_currentTrack->album().data(), SIGNAL( updated() ), SLOT( onAlbumCoverUpdated() ) );
+    connect( m_currentTrack->toQuery().data(), SIGNAL( updated() ), SLOT( onCoverUpdated() ) );
     connect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );
 
     ui->artistTrackLabel->setResult( result );
@@ -243,34 +252,36 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 
     ui->loveButton->setEnabled( true );
     ui->loveButton->setVisible( true );
+    ui->socialButton->setEnabled( true );
+    ui->socialButton->setVisible( true );
 
-    setAlbumCover();
+    setCover();
     setSocialActions();
 }
 
 
 void
-AudioControls::onAlbumCoverUpdated()
+AudioControls::onCoverUpdated()
 {
-    Album* album = qobject_cast< Album* >( sender() );
-    if ( !album || album != m_currentTrack->album().data() )
+    Query* query = qobject_cast< Query* >( sender() );
+    if ( !query || !m_currentTrack || query != m_currentTrack->toQuery().data() )
         return;
 
-    setAlbumCover();
+    setCover();
 }
 
 
 void
-AudioControls::setAlbumCover()
+AudioControls::setCover()
 {
-    if ( !m_currentTrack->album()->cover( ui->coverImage->size() ).isNull() )
+    if ( !m_currentTrack->toQuery()->cover( ui->coverImage->size() ).isNull() )
     {
         QPixmap cover;
-        cover = m_currentTrack->album()->cover( ui->coverImage->size() );
-        ui->coverImage->setPixmap( cover );
+        cover = m_currentTrack->toQuery()->cover( ui->coverImage->size() );
+        ui->coverImage->setPixmap( cover, false );
     }
     else
-        ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ) );
+        ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ), true );
 }
 
 
@@ -278,16 +289,10 @@ void
 AudioControls::onSocialActionsLoaded()
 {
     Query* query = qobject_cast< Query* >( sender() );
-    if ( !query || !m_currentTrack || query != m_currentTrack->toQuery().data() )
+    if ( !query || !m_currentTrack || !query->equals( m_currentTrack->toQuery() ) )
         return;
 
-    query_ptr currentQuery = m_currentTrack->toQuery();
-    if ( query->artist() == currentQuery->artist() &&
-         query->track() == currentQuery->track() &&
-         query->album() == currentQuery->album() )
-    {
-        setSocialActions();
-    }
+    setSocialActions();
 }
 
 
@@ -321,7 +326,6 @@ AudioControls::onPlaybackResumed()
 {
     tDebug( LOGEXTRA ) << Q_FUNC_INFO;
     ui->stackedLayout->setCurrentWidget( ui->pauseButton );
-    ui->loveButton->setVisible( true );
     m_sliderTimeLine.resume();
 }
 
@@ -348,7 +352,7 @@ AudioControls::onPlaybackStopped()
     ui->ownerLabel->setText( "" );
     ui->timeLabel->setText( "" );
     ui->timeLeftLabel->setText( "" );
-    ui->coverImage->setPixmap( QPixmap() );
+    ui->coverImage->setPixmap( QPixmap(), true );
     ui->seekSlider->setVisible( false );
     m_sliderTimeLine.stop();
     m_sliderTimeLine.setCurrentTime( 0 );
@@ -356,6 +360,8 @@ AudioControls::onPlaybackStopped()
     ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
     ui->loveButton->setEnabled( false );
     ui->loveButton->setVisible( false );
+    ui->socialButton->setEnabled( false );
+    ui->socialButton->setVisible( false );
 }
 
 
@@ -369,7 +375,7 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
         ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
         m_lastTextSecondShown = seconds;
     }
-    
+
     //tDebug( LOGEXTRA ) << Q_FUNC_INFO << "msElapsed =" << msElapsed << "and timer current time =" << m_sliderTimeLine.currentTime() << "and m_seekMsecs =" << m_seekMsecs;
     if ( msElapsed > 0 && msElapsed != m_lastSliderCheck && m_seekMsecs == -1 && msElapsed - 500 < m_lastSliderCheck )
         return;
@@ -386,9 +392,10 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
     if ( sender() != &m_phononTickCheckTimer )
         m_phononTickCheckTimer.start( 1000 );
 
+    int currentTime = m_sliderTimeLine.currentTime();
     if ( m_noTimeChange )
     {
-        if ( m_sliderTimeLine.currentTime() != msElapsed )
+        if ( currentTime != msElapsed )
         {
             m_sliderTimeLine.setPaused( true );
             m_noTimeChange = false;
@@ -397,12 +404,12 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
             m_sliderTimeLine.resume();
         }
     }
-    else if ( m_sliderTimeLine.currentTime() >= msElapsed || m_seekMsecs != -1 )
+    else if ( currentTime >= msElapsed || m_seekMsecs != -1 )
     {
         m_sliderTimeLine.setPaused( true );
 
         m_noTimeChange = false;
-        if ( m_sliderTimeLine.currentTime() == msElapsed )
+        if ( currentTime == msElapsed )
             m_noTimeChange = true;
 
         m_sliderTimeLine.setCurrentTime( msElapsed );
@@ -412,12 +419,10 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
     }
     else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning && AudioEngine::instance()->state() == AudioEngine::Playing )
     {
-        ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
         m_sliderTimeLine.start();
     }
     else if ( m_sliderTimeLine.state() == QTimeLine::Paused && AudioEngine::instance()->state() != AudioEngine::Paused )
     {
-        ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
         m_sliderTimeLine.resume();
     }
 
@@ -426,13 +431,13 @@ AudioControls::onPlaybackTimer( qint64 msElapsed )
 
 
 void
-AudioControls::onRepeatModeChanged( PlaylistInterface::RepeatMode mode )
+AudioControls::onRepeatModeChanged( PlaylistModes::RepeatMode mode )
 {
     m_repeatMode = mode;
 
     switch ( m_repeatMode )
     {
-        case PlaylistInterface::NoRepeat:
+        case PlaylistModes::NoRepeat:
         {
             // switch to RepeatOne
             ui->repeatButton->setPixmap( RESPATH "images/repeat-off-rest.png" );
@@ -440,7 +445,7 @@ AudioControls::onRepeatModeChanged( PlaylistInterface::RepeatMode mode )
         }
         break;
 
-        case PlaylistInterface::RepeatOne:
+        case PlaylistModes::RepeatOne:
         {
             // switch to RepeatAll
             ui->repeatButton->setPixmap( RESPATH "images/repeat-1-on-rest.png" );
@@ -448,7 +453,7 @@ AudioControls::onRepeatModeChanged( PlaylistInterface::RepeatMode mode )
         }
         break;
 
-        case PlaylistInterface::RepeatAll:
+        case PlaylistModes::RepeatAll:
         {
             // switch to NoRepeat
             ui->repeatButton->setPixmap( RESPATH "images/repeat-all-on-rest.png" );
@@ -467,24 +472,24 @@ AudioControls::onRepeatClicked()
 {
     switch ( m_repeatMode )
     {
-        case PlaylistInterface::NoRepeat:
+        case PlaylistModes::NoRepeat:
         {
             // switch to RepeatOne
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::RepeatOne );
+            ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatOne );
         }
         break;
 
-        case PlaylistInterface::RepeatOne:
+        case PlaylistModes::RepeatOne:
         {
             // switch to RepeatAll
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::RepeatAll );
+            ViewManager::instance()->setRepeatMode( PlaylistModes::RepeatAll );
         }
         break;
 
-        case PlaylistInterface::RepeatAll:
+        case PlaylistModes::RepeatAll:
         {
             // switch to NoRepeat
-            ViewManager::instance()->setRepeatMode( PlaylistInterface::NoRepeat );
+            ViewManager::instance()->setRepeatMode( PlaylistModes::NoRepeat );
         }
         break;
 
@@ -540,7 +545,7 @@ AudioControls::onAlbumClicked()
 void
 AudioControls::onTrackClicked()
 {
-    ViewManager::instance()->showCurrentTrack();
+    ViewManager::instance()->show( m_currentTrack->toQuery() );
 }
 
 
@@ -583,16 +588,24 @@ AudioControls::droppedTracks( QList< query_ptr > tracks )
     {
         // queue and play the first no matter what
         GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
-
-        // just queue the rest
-        for ( int i = 1; i < tracks.size(); i++ )
-        {
-            ViewManager::instance()->queue()->model()->append( tracks[ i ] );
-        }
+        ViewManager::instance()->queue()->model()->append( tracks );
     }
 }
 
 
+void
+AudioControls::onSocialButtonClicked()
+{
+    if ( !m_socialWidget.isNull() )
+        return;
+
+    m_socialWidget = new SocialWidget( m_parent );
+    m_socialWidget.data()->setPosition( m_socialWidget.data()->mapFromGlobal( QCursor::pos() ) );
+    m_socialWidget.data()->setQuery( m_currentTrack->toQuery() );
+    m_socialWidget.data()->show();
+}
+
+
 void
 AudioControls::onLoveButtonClicked( bool checked )
 {

src/AudioControls.h

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -23,13 +24,14 @@
 #include <QtCore/QTimer>
 #include <QtCore/QTimeLine>
 
-#include "result.h"
-#include "playlistinterface.h"
-#include "query.h"
+#include "Result.h"
+#include "PlaylistInterface.h"
+#include "Query.h"
 
 class QDropEvent;
 class QDragEnterEvent;
 class QDragMoveEvent;
+class SocialWidget;
 
 namespace Ui
 {
@@ -49,9 +51,9 @@ signals:
     void pausePressed();
 
 public slots:
-    void onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
+    void onRepeatModeChanged( Tomahawk::PlaylistModes::RepeatMode mode );
     void onShuffleModeChanged( bool enabled );
-    
+
 protected:
     void changeEvent( QEvent* e );
     void dragEnterEvent ( QDragEnterEvent* );
@@ -60,7 +62,7 @@ protected:
 
 private slots:
     void phononTickCheckTimeout();
-    
+
     void onPlaybackStarted( const Tomahawk::result_ptr& result );
     void onPlaybackLoading( const Tomahawk::result_ptr& result );
     void onPlaybackPaused();
@@ -77,22 +79,24 @@ private slots:
     void onArtistClicked();
     void onAlbumClicked();
     void onTrackClicked();
+    void onSocialButtonClicked();
     void onLoveButtonClicked( bool );
 
-    void onAlbumCoverUpdated();
-
     void droppedTracks( QList<Tomahawk::query_ptr> );
 
+    void onCoverUpdated();
     void onSocialActionsLoaded();
 
 private:
-    void setAlbumCover();
+    void setCover();
     void setSocialActions();
 
-    Ui::AudioControls *ui;
+    Ui::AudioControls* ui;
+    
+    QWeakPointer<SocialWidget> m_socialWidget;
 
     Tomahawk::result_ptr m_currentTrack;
-    Tomahawk::PlaylistInterface::RepeatMode m_repeatMode;
+    Tomahawk::PlaylistModes::RepeatMode m_repeatMode;
     bool m_shuffled;
 
     QTimer m_phononTickCheckTimer;
@@ -101,6 +105,8 @@ private:
     qint64 m_lastSliderCheck;
     bool m_noTimeChange;
     qint64 m_lastTextSecondShown;
+
+    QWidget* m_parent;
 };
 
 #endif // AUDIOCONTROLS_H

src/AudioControls.ui

@@ -142,7 +142,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="coverImage">
+       <widget class="FadingPixmap" name="coverImage">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -151,14 +151,14 @@
         </property>
         <property name="minimumSize">
          <size>
-          <width>58</width>
-          <height>58</height>
+          <width>60</width>
+          <height>60</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
-          <width>58</width>
-          <height>58</height>
+          <width>60</width>
+          <height>60</height>
          </size>
         </property>
         <property name="alignment">
@@ -177,6 +177,9 @@
         <property name="bottomMargin">
          <number>2</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="1,0,0">
           <property name="topMargin">
@@ -185,6 +188,12 @@
           <property name="bottomMargin">
            <number>0</number>
           </property>
+          <property name="leftMargin">
+           <number>0</number>
+          </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
           <item>
            <layout class="QVBoxLayout" name="trackLabelLayout">
             <property name="topMargin">
@@ -193,6 +202,15 @@
             <property name="bottomMargin">
              <number>0</number>
             </property>
+            <property name="leftMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="spacing">
+             <number>3</number>
+            </property>
             <item>
              <widget class="QueryLabel" name="artistTrackLabel">
               <property name="sizePolicy">
@@ -207,9 +225,6 @@
                 <height>16</height>
                </size>
               </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
               <property name="text">
                <string>Artist</string>
               </property>
@@ -229,9 +244,6 @@
                 <height>16</height>
                </size>
               </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
-              </property>
               <property name="text">
                <string>Album</string>
               </property>
@@ -287,6 +299,22 @@
                 </property>
                </spacer>
               </item>
+              <item>
+               <widget class="ImageButton" name="socialButton">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="cursor">
+                 <cursorShape>PointingHandCursor</cursorShape>
+                </property>
+                <property name="text">
+                 <string>social</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="ImageButton" name="loveButton">
                 <property name="sizePolicy">
@@ -340,6 +368,15 @@
           <property name="leftMargin">
            <number>4</number>
           </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
+          <property name="topMargin">
+           <number>0</number>
+          </property>
+          <property name="bottomMargin">
+           <number>0</number>
+          </property>
           <item>
            <widget class="QLabel" name="timeLabel">
             <property name="text">
@@ -416,6 +453,9 @@
       <property name="rightMargin">
        <number>2</number>
       </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
       <property name="bottomMargin">
        <number>0</number>
       </property>
@@ -554,12 +594,17 @@
   <customwidget>
    <class>ImageButton</class>
    <extends>QPushButton</extends>
-   <header>widgets/imagebutton.h</header>
+   <header>widgets/ImageButton.h</header>
   </customwidget>
   <customwidget>
    <class>QueryLabel</class>
    <extends>QLabel</extends>
-   <header>widgets/querylabel.h</header>
+   <header>widgets/QueryLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>FadingPixmap</class>
+   <extends>QLabel</extends>
+   <header>widgets/FadingPixmap.h</header>
   </customwidget>
  </customwidgets>
  <resources/>

src/CMakeLists.txt

@@ -13,8 +13,6 @@ SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
-
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE( AddAppIconMacro )
 
@@ -37,121 +35,65 @@ ENDIF()
 #ENDFOREACH( moddir )
 
 SET( tomahawkSources ${tomahawkSources}
-     web/api_v1.cpp
+     web/Api_v1.cpp
 
-     musicscanner.cpp
-     shortcuthandler.cpp
-     scanmanager.cpp
-     ubuntuunityhack.cpp
-     tomahawkapp.cpp
+     MusicScanner.cpp
+     ShortcutHandler.cpp
+     ScanManager.cpp
+     UbuntuUnityHack.cpp
+     TomahawkApp.cpp
      main.cpp
 )
 
 IF(LIBLASTFM_FOUND)
     SET(tomahawkSources ${tomahawkSources}
-        scrobbler.cpp
+        Scrobbler.cpp
     )
 ENDIF(LIBLASTFM_FOUND)
 
 SET( tomahawkSourcesGui ${tomahawkSourcesGui}
-     sourcetree/sourcesmodel.cpp
-     sourcetree/sourcesproxymodel.cpp
-     sourcetree/sourcetreeview.cpp
-     sourcetree/sourcedelegate.cpp
-     sourcetree/animationhelper.cpp
-     sourcetree/items/sourcetreeitem.cpp
-     sourcetree/items/sourceitem.cpp
-     sourcetree/items/playlistitems.cpp
-     sourcetree/items/categoryitems.cpp
-     sourcetree/items/genericpageitems.cpp
-     sourcetree/items/temporarypageitem.cpp
-     sourcetree/items/groupitem.cpp
-     sourcetree/items/historyitem.cpp
+     sourcetree/SourcesModel.cpp
+     sourcetree/SourcesProxyModel.cpp
+     sourcetree/SourceTreeView.cpp
+     sourcetree/SourceDelegate.cpp
+     sourcetree/AnimationHelper.cpp
+     sourcetree/items/SourceTreeItem.cpp
+     sourcetree/items/SourceItem.cpp
+     sourcetree/items/PlaylistItems.cpp
+     sourcetree/items/CategoryItems.cpp
+     sourcetree/items/GenericPageItems.cpp
+     sourcetree/items/TemporaryPageItem.cpp
+     sourcetree/items/GroupItem.cpp
+     sourcetree/items/HistoryItem.cpp
 
-     breakpad/BreakPad.cpp
-
-     tomahawktrayicon.cpp
-     audiocontrols.cpp
-     settingsdialog.cpp
-     diagnosticsdialog.cpp
-     configdelegatebase.cpp
-     sipconfigdelegate.cpp
-     resolverconfigdelegate.cpp
-     settingslistdelegate.cpp
-     resolversmodel.cpp
-     tomahawkwindow.cpp
+     TomahawkTrayIcon.cpp
+     AudioControls.cpp
+     SettingsDialog.cpp
+     DiagnosticsDialog.cpp
+     SettingsListDelegate.cpp
+     TomahawkWindow.cpp
      LoadXSPFDialog.cpp
+     SocialWidget.cpp
 )
 
-SET( tomahawkHeaders ${tomahawkHeaders}
-     tomahawkapp.h
-
-     web/api_v1.h
-
-     musicscanner.h
-     scanmanager.h
-     ubuntuunityhack.h
-     shortcuthandler.h
-)
-
-IF(LIBLASTFM_FOUND)
-    SET(tomahawkHeaders ${tomahawkHeaders}
-        scrobbler.h
-    )
-ENDIF(LIBLASTFM_FOUND)
-
-IF(LIBATTICA_FOUND)
-    SET( tomahawkSourcesGui ${tomahawkSourcesGui} GetNewStuffDialog.cpp GetNewStuffDelegate.cpp GetNewStuffModel.cpp )
-    SET( tomahawkHeadersGui ${tomahawkHeadersGui} GetNewStuffDialog.h GetNewStuffDelegate.h GetNewStuffModel.h )
-    INCLUDE_DIRECTORIES( ${LIBATTICA_INCLUDE_DIR} )
-ENDIF(LIBATTICA_FOUND)
-
-
-SET( tomahawkHeadersGui ${tomahawkHeadersGui}
-     sourcetree/sourcesmodel.h
-     sourcetree/sourcesproxymodel.h
-     sourcetree/sourcetreeview.h
-     sourcetree/sourcedelegate.h
-     sourcetree/animationhelper.h
-     sourcetree/items/sourcetreeitem.h
-     sourcetree/items/sourceitem.h
-     sourcetree/items/playlistitems.h
-     sourcetree/items/categoryitems.h
-     sourcetree/items/genericpageitems.h
-     sourcetree/items/temporarypageitem.h
-     sourcetree/items/groupitem.h
-     sourcetree/items/historyitem.h
-
-     tomahawktrayicon.h
-     audiocontrols.h
-     settingsdialog.h
-     diagnosticsdialog.h
-     configdelegatebase.h
-     resolverconfigdelegate.h
-     sipconfigdelegate.h
-     settingslistdelegate.h
-     resolversmodel.h
-     delegateconfigwrapper.h
-     tomahawkwindow.h
-     LoadXSPFDialog.h
-)
+IF( WITH_BREAKPAD )
+    LIST(APPEND tomahawkSourcesGui breakpad/BreakPad.cpp)
+ENDIF()
 
 SET( tomahawkUI ${tomahawkUI}
-     tomahawkwindow.ui
-     diagnosticsdialog.ui
-     stackedsettingsdialog.ui
-     proxydialog.ui
+     TomahawkWindow.ui
+     DiagnosticsDialog.ui
+     StackedSettingsDialog.ui
+     ProxyDialog.ui
 
-     audiocontrols.ui
-
-     GetNewStuffDialog.ui
+     AudioControls.ui
      LoadXSPFDialog.ui
+     SocialWidget.ui
 )
 
 INCLUDE_DIRECTORIES(
     .
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/thirdparty/liblastfm2/src
 
     audio
     database
@@ -159,7 +101,6 @@ INCLUDE_DIRECTORIES(
     network
     sourcetree
     topbar
-    utils
     libtomahawk
     mac
 
@@ -171,8 +112,11 @@ INCLUDE_DIRECTORIES(
     ${TAGLIB_INCLUDES}
     ${PHONON_INCLUDES}
     ${QJSON_INCLUDE_DIR}
+    ${LIBATTICA_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}
     ${LIBECHONEST_INCLUDE_DIR}/..
+    ${LIBLASTFM_INCLUDE_DIRS}
+    ${LIBLASTFM_INCLUDE_DIRS}/..
 )
 
 SET( OS_SPECIFIC_LINK_LIBRARIES "" )
@@ -187,42 +131,38 @@ ENDIF( UNIX )
 IF( APPLE )
     INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/thirdparty/SPMediaKeyTap )
 
-    SET( tomahawkHeaders ${tomahawkHeaders} mac/tomahawkapp_mac.h mac/macshortcuthandler.h )
-    SET( tomahawkSources ${tomahawkSources} mac/tomahawkapp_mac.mm mac/macshortcuthandler.cpp )
-
-    IF(HAVE_SPARKLE)
-        SET( tomahawkHeaders ${tomahawkHeaders} ${SPARKLE}/Headers )
-    ENDIF(HAVE_SPARKLE)
+    SET( tomahawkSources ${tomahawkSources} mac/TomahawkApp_Mac.mm mac/MacShortcutHandler.cpp )
 ENDIF( APPLE )
 
-IF(GLOOX_FOUND)
-  INCLUDE_DIRECTORIES( ${GLOOX_INCLUDE_DIR} )
-  SET( tomahawkHeaders ${tomahawkHeaders} xmppbot/xmppbot.h )
-  SET( tomahawkSources ${tomahawkSources} xmppbot/xmppbot.cpp )
-ENDIF(GLOOX_FOUND)
-ADD_SUBDIRECTORY( sip )
+ADD_SUBDIRECTORY( accounts )
+ADD_SUBDIRECTORY( infoplugins )
 
 IF(QCA2_FOUND)
     INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
 ENDIF(QCA2_FOUND)
 
 INCLUDE(GNUInstallDirs)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
+# translations
 include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
+add_tomahawk_translations(ar bg ca de en es fr ja pl pt_BR ru sv tr zh_CN zh_TW)
 
-SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${tomahawkHeaders} ${trans_outfile})
+SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${trans_outfile})
 
 IF( BUILD_GUI )
-    LIST(APPEND tomahawkHeaders ${tomahawkHeadersGui})
     LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
     qt4_wrap_ui( tomahawkUI_H ${tomahawkUI} )
+
+    IF( WITH_CRASHREPORTER )
+        ADD_SUBDIRECTORY( breakpad/CrashReporter )
+    ENDIF()
 ENDIF()
 
 kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
 qt4_add_resources( RC_SRCS "../resources.qrc" )
-qt4_wrap_cpp( tomahawkMoc ${tomahawkHeaders} )
+
 SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMoc} ${tomahawkSources} ${RC_SRCS} )
 
 IF( UNIX AND NOT APPLE )
@@ -230,28 +170,28 @@ IF( UNIX AND NOT APPLE )
 ENDIF( UNIX AND NOT APPLE )
 IF( APPLE )
     ADD_EXECUTABLE( tomahawk MACOSX_BUNDLE ${final_src} )
-    SET_TARGET_PROPERTIES(tomahawk PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist"
-)
+    SET_TARGET_PROPERTIES(tomahawk PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist")
 ENDIF( APPLE )
 IF( WIN32 )
     ADD_EXECUTABLE( tomahawk WIN32 ${final_src} )
 ENDIF( WIN32 )
 
+SET_TARGET_PROPERTIES(tomahawk PROPERTIES AUTOMOC TRUE)
+
 MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" )
 
 SET(LINK_LIBRARIES  "")
 IF(LIBLASTFM_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_lastfm2 )
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${LIBLASTFM_LIBRARIES} )
 ENDIF(LIBLASTFM_FOUND)
-IF(GLOOX_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${GLOOX_LIBRARIES} )
-ENDIF(GLOOX_FOUND)
 IF(QCA2_FOUND)
-    SET(LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} ${QCA2_LIBRARIES} )
 ENDIF(QCA2_FOUND)
+IF(WITH_BREAKPAD)
+    SET( LINK_LIBRARIES ${LINK_LIBRARIES} tomahawk_breakpad )
+ENDIF()
 
 TARGET_LINK_LIBRARIES( tomahawk
-    tomahawk_breakpad
     ${LINK_LIBRARIES}
     ${TOMAHAWK_LIBRARIES}
     ${PHONON_LIBS}

src/Config.h.in

@@ -17,9 +17,12 @@
 #cmakedefine LEOPARD
 #cmakedefine HAVE_SPARKLE
 
+#cmakedefine WITH_BREAKPAD
+#cmakedefine WITH_CRASHREPORTER
+#cmakedefine WITH_BINARY_ATTICA
+
+
 #cmakedefine LIBLASTFM_FOUND
-#cmakedefine GLOOX_FOUND
 #cmakedefine QCA2_FOUND
-#cmakedefine LIBATTICA_FOUND
 
 #endif // CONFIG_H_IN

src/ConfigDelegateBase.h

@@ -19,7 +19,7 @@
 #ifndef CONFIGDELEGATEBASE_H
 #define CONFIGDELEGATEBASE_H
 
-#include "dllmacro.h"
+#include "DllMacro.h"
 
 #include <QStyledItemDelegate>
 
@@ -36,16 +36,15 @@ public:
   virtual bool editorEvent ( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
 
   // if you want to use a checkbox, you need to have this say where to paint it
-  virtual QRect checkRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0;
+  virtual QRect checkRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx, int role ) const = 0;
   // if you want to use a config wrench, you need to have this say where to paint it
   virtual QRect configRectForIndex( const QStyleOptionViewItem& option, const QModelIndex& idx ) const = 0;
 
+  virtual QList<int> extraCheckRoles() const { return QList<int>(); }
 signals:
     void configPressed( const QModelIndex& idx );
 
 protected:
-    void drawCheckBox( QStyleOptionViewItemV4& opt, QPainter* p, const QWidget* w ) const;
-    void drawConfigWrench( QPainter* painter, QStyleOptionViewItemV4& option, QStyleOptionToolButton& topt ) const;
 
 private:
     QModelIndex m_configPressed;

src/DiagnosticsDialog.cpp

@@ -0,0 +1,262 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <dev@dominik-schmidt.de>
+ *   Copyright 2011, Jeff Mitchell <jeff@tomahawk-player.org>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "DiagnosticsDialog.h"
+#include "ui_DiagnosticsDialog.h"
+
+#include "config.h"
+
+#include "accounts/AccountManager.h"
+#include "network/Servent.h"
+#include "SourceList.h"
+
+#include <QLabel>
+#include <QTextEdit>
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QApplication>
+#include <QClipboard>
+#include <QDebug>
+
+#include "utils/Logger.h"
+#include "sip/SipHandler.h"
+
+
+DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
+    : QDialog( parent )
+    , ui( new Ui::DiagnosticsDialog )
+{
+    ui->setupUi( this );
+
+    connect( ui->clipboardButton, SIGNAL( clicked() ), this, SLOT( copyToClipboard() ) );
+    connect( ui->buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
+
+    ui->scrollAreaWidgetContents->setLayout( new QVBoxLayout() );
+    
+    updateLogView();
+}
+
+
+void
+DiagnosticsDialog::updateLogView()
+{
+    QString log;
+
+    log.append(
+        QString("TOMAHAWK DIAGNOSTICS LOG -%1 \n\n")
+            .arg( QDateTime::currentDateTime().toString() )
+    );
+
+    // network
+    log.append( "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n" );
+
+    // network
+    log.append( "NETWORK:\n    General:\n" );
+    if ( Servent::instance()->visibleExternally() )
+    {
+        log.append(
+            QString(
+                "      visible: true\n"
+                "      host: %1\n"
+                "      port: %2\n"
+                "\n"
+            ).arg( Servent::instance()->externalAddress() )
+             .arg( Servent::instance()->externalPort() )
+
+        );
+    }
+    else
+    {
+        log.append( "      visible: false" );
+    }
+
+    ui->scrollAreaWidgetContents->layout()->addWidget( new QLabel( log, this ) );
+    // Peers / Accounts, TODO
+    ui->scrollAreaWidgetContents->layout()->addWidget( new QLabel( "ACCOUNTS:\n", this ) );
+    
+    const QList< Tomahawk::source_ptr > sources = SourceList::instance()->sources( true );
+    const QList< Tomahawk::Accounts::Account* > accounts = Tomahawk::Accounts::AccountManager::instance()->accounts( Tomahawk::Accounts::SipType );
+    foreach ( Tomahawk::Accounts::Account* account, accounts )
+    {
+        Q_ASSERT( account && account->sipPlugin() );
+        if ( !account || !account->sipPlugin() )
+            continue;
+
+        connect( account, SIGNAL( connectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ),
+                            SLOT( onAccountConnectionStateChanged( Tomahawk::Accounts::Account::ConnectionState ) ) );
+        connect( account, SIGNAL( error( int, QString ) ),
+                            SLOT( onAccountError( int, QString ) ) );
+
+        connect( account->sipPlugin(), SIGNAL( peerOnline( QString ) ), SLOT( onPeerOnline( QString ) ) );
+        connect( account->sipPlugin(), SIGNAL( peerOffline( QString ) ), SLOT( onPeerOffline( QString ) ) );
+        connect( account->sipPlugin(), SIGNAL( sipInfoReceived( QString, SipInfo ) ), SLOT( onSipInfoReceived( QString, SipInfo ) ) );
+        connect( account->sipPlugin(), SIGNAL( softwareVersionReceived( QString, QString ) ), SLOT( onSoftwareVersionReceived( QString, QString ) ) );
+        
+        QLabel* accountInfoLabel = new QLabel( this );
+        ui->scrollAreaWidgetContents->layout()->addWidget( accountInfoLabel );
+        m_accountDescriptionStore.insert( account, accountInfoLabel );
+        
+        updateAccountLabel( account );
+    }
+}
+
+
+void
+DiagnosticsDialog::copyToClipboard()
+{
+    QString log;
+    foreach ( QLabel* label, m_accountDescriptionStore.values() )
+    {
+        log += label->text() + "\n\n";
+    }
+
+    QApplication::clipboard()->setText( log );
+}
+
+
+void
+DiagnosticsDialog::onAccountConnectionStateChanged( Tomahawk::Accounts::Account::ConnectionState /* state */ )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< Tomahawk::Accounts::Account* >( sender() );
+    Q_ASSERT( account );
+    
+    updateAccountLabel( account );    
+}
+
+
+void
+DiagnosticsDialog::onAccountError( int /* errorId */ , QString /* errorString */ )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< Tomahawk::Accounts::Account* >( sender() );
+    Q_ASSERT( account );
+}
+
+
+void
+DiagnosticsDialog::onPeerOnline( const QString& )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< SipPlugin* >( sender() )->account();
+    Q_ASSERT( account );
+    
+    updateAccountLabel( account );
+}
+
+
+void
+DiagnosticsDialog::onPeerOffline( const QString& )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< SipPlugin* >( sender() )->account();
+    Q_ASSERT( account );
+    
+    updateAccountLabel( account );
+}
+
+
+void
+DiagnosticsDialog::onSipInfoReceived( const QString& /* peerId */ , const SipInfo& /* info */ )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< SipPlugin* >( sender() )->account();
+    Q_ASSERT( account );
+    
+    updateAccountLabel( account );
+}
+
+
+void
+DiagnosticsDialog::onSoftwareVersionReceived( const QString& /* peerId */ , const QString& /* versionString */ )
+{
+    Tomahawk::Accounts::Account* account = qobject_cast< SipPlugin* >( sender() )->account();
+    Q_ASSERT( account );
+    
+    updateAccountLabel( account );
+}
+
+
+void
+DiagnosticsDialog::updateAccountLabel( Tomahawk::Accounts::Account* account )
+{
+    QLabel* accountInfoLabel = m_accountDescriptionStore.value( account );
+    
+    if ( accountInfoLabel )
+    {
+        QString accountInfo;
+        QString stateString;
+        switch( account->connectionState() )
+        {
+            case Tomahawk::Accounts::Account::Connecting:
+                stateString = "Connecting";
+                break;
+            case Tomahawk::Accounts::Account::Connected:
+                stateString = "Connected";
+                break;
+
+            case Tomahawk::Accounts::Account::Disconnected:
+                stateString = "Disconnected";
+                break;
+            case Tomahawk::Accounts::Account::Disconnecting:
+                stateString = "Disconnecting";
+        }
+        accountInfo.append(
+            QString( "  %2 (%1): %3 (%4)\n" )
+                .arg( account->accountServiceName() )
+                .arg( account->sipPlugin()->friendlyName() )
+                .arg( account->accountFriendlyName())
+                .arg( stateString )
+        );
+
+        foreach( const QString& peerId, account->sipPlugin()->peersOnline() )
+        {
+            QString versionString = SipHandler::instance()->versionString( peerId );
+            SipInfo sipInfo = SipHandler::instance()->sipInfo( peerId );
+            if ( !sipInfo.isValid() )
+            {
+                accountInfo.append(
+                    QString("       %1: %2 %3" /*"(%4)"*/ "\n")
+                        .arg( peerId )
+                        .arg( "sipinfo invalid" )
+                        .arg( versionString )
+                        // .arg( connected ? "connected" : "not connected")
+                );
+            }
+            else if ( sipInfo.isVisible() )
+            {
+                accountInfo.append(
+                    QString("       %1: %2:%3 %4" /*" (%5)"*/ "\n")
+                        .arg( peerId )
+                        .arg( sipInfo.host().hostName() )
+                        .arg( sipInfo.port() )
+                        .arg( versionString )
+                        // .arg( connected ? "connected" : "not connected")
+                );
+            }
+            else
+            {
+                accountInfo.append(
+                    QString("       %1: visible: false %2" /*" (%3)"*/ "\n")
+                        .arg( peerId )
+                        .arg( versionString )
+                        // .arg( connected ? "connected" : "not connected")
+                );
+            }
+        }
+        accountInfo.append( "\n" );
+        
+        accountInfoLabel->setText( accountInfo );
+    }
+}

src/DiagnosticsDialog.h

@@ -19,7 +19,15 @@
 #ifndef DIGANOSTICSDIALOG_H
 #define DIAGNOSTICSDIALOG_H
 
+#include "accounts/Account.h"
+
 #include <QDialog>
+#include <QMap>
+
+
+class QLabel;
+
+class SipInfo;
 
 namespace Ui
 {
@@ -37,8 +45,19 @@ public:
 private slots:
     void updateLogView();
     void copyToClipboard();
+    
+    void onAccountConnectionStateChanged( Tomahawk::Accounts::Account::ConnectionState state );
+    void onAccountError( int errorId, QString errorString );
+    void onPeerOnline( const QString& );
+    void onPeerOffline( const QString& );
+    void onSipInfoReceived( const QString& peerId, const SipInfo& info );
+    void onSoftwareVersionReceived( const QString& peerId, const QString& versionString );
 
+    void updateAccountLabel( Tomahawk::Accounts::Account* );
 private:
+    
+    QMap< Tomahawk::Accounts::Account*, QLabel* > m_accountDescriptionStore;
+    
     Ui::DiagnosticsDialog* ui;
 };
 

src/DiagnosticsDialog.ui

@@ -26,19 +26,26 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QTextEdit" name="logView"/>
+      <widget class="QScrollArea" name="scrollArea">
+       <property name="widgetResizable">
+        <bool>true</bool>
+       </property>
+       <widget class="QWidget" name="scrollAreaWidgetContents">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>708</width>
+          <height>386</height>
+         </rect>
+        </property>
+       </widget>
+      </widget>
      </item>
     </layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QPushButton" name="updateButton">
-       <property name="text">
-        <string>Update</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="clipboardButton">
        <property name="text">

src/GetNewStuffDelegate.cpp

@@ -1,323 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#include "GetNewStuffDelegate.h"
-
-#include "GetNewStuffModel.h"
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QtGui/QPainter>
-#include <QApplication>
-#include <QMouseEvent>
-#include "AtticaManager.h"
-
-#define PADDING 4
-#define PADDING_BETWEEN_STARS 2
-#define STAR_SIZE 12
-
-#ifdef Q_WS_MAC
-#define SIZEHINT_HEIGHT 70
-#else
-#define SIZEHINT_HEIGHT 60
-#endif
-
-GetNewStuffDelegate::GetNewStuffDelegate( QObject* parent )
-    : QStyledItemDelegate ( parent )
-    , m_widestTextWidth( 0 )
-    , m_hoveringOver( -1 )
-{
-    m_defaultCover.load( RESPATH "images/sipplugin-online.png" );
-    m_ratingStarPositive.load( RESPATH "images/starred.png" );
-    m_ratingStarNegative.load( RESPATH "images/star-unstarred.png" );
-    m_onHoverStar.load( RESPATH "images/star-hover.png" );
-
-    m_ratingStarPositive = m_ratingStarPositive.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-    m_ratingStarNegative = m_ratingStarNegative.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-    m_onHoverStar = m_onHoverStar.scaled( STAR_SIZE, STAR_SIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation  );
-
-    const int w = SIZEHINT_HEIGHT - 2*PADDING;
-    m_defaultCover = m_defaultCover.scaled( w, w, Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    // save the widest wifth
-    QFont f( QApplication::font() );
-    f.setPointSize( f.pointSize() - 1 );
-    QFontMetrics fm( f );
-    QStringList l = QStringList() << tr( "Installed" ) << tr( "Installing" ) << tr( "Failed" ) << tr( "Uninstalling" );
-    foreach ( const QString& str, l )
-    {
-        if ( fm.width( str ) > m_widestTextWidth )
-            m_widestTextWidth = fm.width( str );
-    }
-}
-
-void
-GetNewStuffDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    QStyleOptionViewItemV4 opt = option;
-    initStyleOption( &opt, index );
-
-    QApplication::style()->drawPrimitive( QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget );
-
-    painter->setRenderHint( QPainter::Antialiasing );
-
-    QFont titleFont = opt.font;
-    titleFont.setBold( true );
-    titleFont.setPointSize( titleFont.pointSize() + 2 );
-    QFontMetrics titleMetrics( titleFont );
-
-    QFont authorFont = opt.font;
-    authorFont.setItalic( true );
-    authorFont.setPointSize( authorFont.pointSize() - 1 );
-    QFontMetrics authorMetrics( authorFont );
-
-    QFont descFont = authorFont;
-    descFont.setItalic( false );
-    QFontMetrics descMetrics( descFont );
-
-    QFont installFont = opt.font;
-    installFont.setPointSize( installFont.pointSize() - 1 );
-    QFontMetrics installMetrics( descFont );
-
-    const int height = opt.rect.height();
-    const int center = height / 2 + opt.rect.top();
-
-    // Pixmap
-    QPixmap p = index.data( Qt::DecorationRole ).value< QPixmap >();
-    const int pixmapWidth = height - 2*PADDING;
-    QRect pixmapRect( PADDING, PADDING + opt.rect.top(), pixmapWidth, pixmapWidth );
-    if ( p.isNull() ) // default image... TODO
-        p = m_defaultCover;
-    else
-        p = p.scaled( pixmapRect.size(), Qt::KeepAspectRatio, Qt::SmoothTransformation );
-
-    painter->drawPixmap( pixmapRect, p );
-
-    // Go from right edge now, stars, install button, and downloaded info
-
-    // install / status button
-    AtticaManager::ResolverState state = static_cast< AtticaManager::ResolverState >( index.data( GetNewStuffModel::StateRole ).toInt() );
-    QString actionText;
-    switch( state )
-    {
-        case AtticaManager::Uninstalled:
-            actionText = tr( "Install" );
-            break;
-        case AtticaManager::Installing:
-            actionText = tr( "Installing" );
-            break;
-        case AtticaManager::Upgrading:
-            actionText = tr( "Upgrading" );
-            break;
-        case AtticaManager::Failed:
-            actionText = tr( "Failed" );
-            break;
-        case AtticaManager::Installed:
-            actionText = tr( "Uninstall" );
-            break;
-        case AtticaManager::NeedsUpgrade:
-            actionText = tr( "Upgrade" );
-            break;
-    }
-
-    const int btnWidth = m_widestTextWidth + 7;
-    const int leftEdge = opt.rect.width() - PADDING - btnWidth - 3;
-    const QRect btnRect( leftEdge, center - ( installMetrics.height() + 4 ) / 2, btnWidth, installMetrics.height() + 4 );
-    m_cachedButtonRects[ QPair<int, int>(index.row(), index.column()) ] = btnRect;
-
-    QPen saved = painter->pen();
-    painter->setPen( opt.palette.color( QPalette::Active, QPalette::AlternateBase ) );
-
-    QPainterPath btnPath;
-    const int radius = 3;
-    //btnPath.addRoundedRect( btnRect, 3, 3 );
-    // draw top half gradient
-    const int btnCenter = btnRect.bottom() - ( btnRect.height() / 2 );
-    btnPath.moveTo( btnRect.left(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnRect.top() + radius );
-    btnPath.quadTo( QPoint( btnRect.topLeft() ), QPoint( btnRect.left() + radius, btnRect.top() ) );
-    btnPath.lineTo( btnRect.right() - radius, btnRect.top() );
-    btnPath.quadTo( QPoint( btnRect.topRight() ), QPoint( btnRect.right(), btnRect.top() + radius ) );
-    btnPath.lineTo( btnRect.right(),btnCenter );
-    btnPath.lineTo( btnRect.left(), btnCenter );
-
-    QLinearGradient g;
-    g.setColorAt( 0, QColor(54, 127, 211) );
-    g.setColorAt( 0.5, QColor(43, 104, 182) );
-    //painter->setPen( bg.darker() );
-    painter->fillPath( btnPath, g );
-    //painter->drawPath( btnPath );
-
-    btnPath = QPainterPath();
-    btnPath.moveTo( btnRect.left(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnRect.bottom() - radius );
-    btnPath.quadTo( QPoint( btnRect.bottomLeft() ), QPoint( btnRect.left() + radius, btnRect.bottom() ) );
-    btnPath.lineTo( btnRect.right() - radius, btnRect.bottom() );
-    btnPath.quadTo( QPoint( btnRect.bottomRight() ), QPoint( btnRect.right(), btnRect.bottom() - radius ) );
-    btnPath.lineTo( btnRect.right(), btnCenter );
-    btnPath.lineTo( btnRect.left(), btnCenter );
-
-    g.setColorAt( 0, QColor(34, 85, 159) );
-    g.setColorAt( 0.5, QColor(35, 79, 147) );
-    painter->fillPath( btnPath, g );
-
-    painter->setFont( installFont );
-    painter->drawText( btnRect, Qt::AlignCenter, actionText );
-
-    painter->setPen( saved );
-
-    // rating stars
-    int rating = index.data( GetNewStuffModel::RatingRole ).toInt();
-    const int ratingWidth = 5 * ( m_ratingStarPositive.width() + PADDING_BETWEEN_STARS );
-    int runningEdge = ( btnRect.right() - btnRect.width() / 2 ) - ratingWidth / 2;
-    for ( int i = 1; i < 6; i++ )
-    {
-        QRect r( runningEdge, btnRect.top() - m_ratingStarPositive.height() - PADDING, m_ratingStarPositive.width(), m_ratingStarPositive.height() );
-        if ( i == 1 )
-            m_cachedStarRects[ QPair<int, int>(index.row(), index.column()) ] = r;
-
-        const bool userHasRated = index.data( GetNewStuffModel::UserHasRatedRole ).toBool();
-        if ( !userHasRated && // Show on-hover animation if the user hasn't rated it yet, and is hovering over it
-             m_hoveringOver > -1 &&
-             m_hoveringItem == index )
-        {
-            if ( i <= m_hoveringOver ) // positive star
-                painter->drawPixmap( r, m_onHoverStar );
-            else
-                painter->drawPixmap( r, m_ratingStarNegative );
-        }
-        else
-        {
-            if ( i <= rating ) // positive or rated star
-            {
-                if ( userHasRated )
-                    painter->drawPixmap( r, m_onHoverStar );
-                else
-                    painter->drawPixmap( r, m_ratingStarPositive );
-            }
-            else
-                painter->drawPixmap( r, m_ratingStarNegative );
-        }
-        runningEdge += m_ratingStarPositive.width() + PADDING_BETWEEN_STARS;
-    }
-
-    // downloaded num times, underneath button
-    QString count = tr( "%1 downloads" ).arg( index.data( GetNewStuffModel::DownloadCounterRole ).toInt() );
-    const QRect countRect( btnRect.left(), btnRect.bottom() + PADDING, btnRect.width(), opt.rect.bottom() - PADDING - btnRect.bottom() );
-    QFont countFont = descFont;
-    countFont.setPointSize( countFont.pointSize() - 2 );
-    countFont.setBold( true );
-    painter->setFont( countFont );
-    painter->drawText( countRect, Qt::AlignCenter | Qt::TextWordWrap, count );
-
-    // author and version
-    QString author = index.data( GetNewStuffModel::AuthorRole ).toString();
-    const int authorWidth = authorMetrics.width( author );
-    const int topTextLine = opt.rect.top() + PADDING;
-    const QRect authorRect( btnRect.x() - 3*PADDING - authorWidth, topTextLine, authorWidth + 6, authorMetrics.height() );
-    painter->setFont( authorFont );
-    painter->drawText( authorRect, Qt::AlignCenter, author );
-
-    const QRect versionRect = authorRect.translated( 0, authorRect.height() );
-    QString version = index.data( GetNewStuffModel::VersionRole ).toString();
-    painter->drawText( versionRect, Qt::AlignCenter, version );
-
-    // title
-    QString title = index.data( Qt::DisplayRole ).toString();
-    const int rightTitleEdge = authorRect.left() - PADDING;
-    const int leftTitleEdge = pixmapRect.right() + PADDING;
-    const QRect textRect( leftTitleEdge, topTextLine, rightTitleEdge - leftTitleEdge, versionRect.bottom() - opt.rect.top() - PADDING );
-    painter->setFont( titleFont );
-    painter->drawText( textRect, Qt::AlignVCenter | Qt::AlignLeft, title );
-
-    // description
-    QString desc = index.data( GetNewStuffModel::DescriptionRole ).toString();
-    const int descWidth = btnRect.left() - leftTitleEdge - PADDING;
-    const QRect descRect( leftTitleEdge, versionRect.bottom(), descWidth, opt.rect.bottom() - versionRect.bottom() + PADDING );
-    painter->setFont( descFont );
-    painter->drawText( descRect, Qt::AlignLeft | Qt::TextWordWrap, desc );
-}
-
-
-QSize
-GetNewStuffDelegate::sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const
-{
-    Q_UNUSED( option );
-    Q_UNUSED( index );
-    return QSize( 200, SIZEHINT_HEIGHT );
-}
-
-bool
-GetNewStuffDelegate::editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index )
-{
-    Q_UNUSED( option );
-
-    if ( event->type() != QEvent::MouseButtonRelease &&
-         event->type() != QEvent::MouseMove )
-        return false;
-
-    if ( event->type() == QEvent::MouseButtonRelease && m_cachedButtonRects.contains( QPair<int, int>( index.row(), index.column() ) ) )
-    {
-        QRect rect = m_cachedButtonRects[ QPair<int, int>( index.row(), index.column() ) ];
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-
-        if ( rect.contains( me->pos() ) )
-        {
-            model->setData( index, true );
-
-            return true;
-        }
-    }
-
-    if ( m_cachedStarRects.contains( QPair<int, int>( index.row(), index.column() ) ) )
-    {
-        QRect fullStars = m_cachedStarRects[ QPair<int, int>( index.row(), index.column() ) ];
-        const int starsWidth = 5 * ( m_ratingStarPositive.width() + PADDING_BETWEEN_STARS );
-        fullStars.setWidth( starsWidth );
-
-        QMouseEvent* me = static_cast< QMouseEvent* >( event );
-
-        if ( fullStars.contains( me->pos() ) )
-        {
-            const int eachStar = starsWidth / 5;
-            const int clickOffset = me->pos().x() - fullStars.x();
-            const int whichStar = (clickOffset / eachStar) + 1;
-
-            if ( event->type() == QEvent::MouseButtonRelease )
-            {
-                model->setData( index, whichStar, GetNewStuffModel::RatingRole );
-            }
-            else if ( event->type() == QEvent::MouseMove )
-            {
-                // 0-indexed
-                m_hoveringOver = whichStar;
-                m_hoveringItem = index;
-            }
-
-            return true;
-        }
-    }
-
-    if ( m_hoveringOver > -1 )
-    {
-        emit update( m_hoveringItem );
-        m_hoveringOver = -1;
-        m_hoveringItem = QPersistentModelIndex();
-    }
-    return false;
-}

src/GetNewStuffDelegate.h

@@ -1,50 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GETNEWSTUFFDELEGATE_H
-#define GETNEWSTUFFDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-
-class
-GetNewStuffDelegate : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-    explicit GetNewStuffDelegate( QObject* parent = 0 );
-    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-signals:
-    void update( const QModelIndex& idx );
-
-protected:
-    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-
-private:
-    QPixmap m_defaultCover, m_onHoverStar, m_ratingStarPositive, m_ratingStarNegative;
-
-    int m_widestTextWidth;
-    int m_hoveringOver;
-    QPersistentModelIndex m_hoveringItem;
-    mutable QHash< QPair<int, int>, QRect > m_cachedButtonRects;
-    mutable QHash< QPair<int, int>, QRect > m_cachedStarRects;
-};
-
-#endif // GETNEWSTUFFDELEGATE_H

src/GetNewStuffDialog.cpp

@@ -1,54 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#include "GetNewStuffDialog.h"
-
-#include "ui_GetNewStuffDialog.h"
-#include "GetNewStuffDelegate.h"
-#include "GetNewStuffModel.h"
-
-GetNewStuffDialog::GetNewStuffDialog( QWidget* parent, Qt::WindowFlags f )
-    : QDialog( parent, f )
-    , ui( new Ui::GetNewStuffDialog )
-    , m_model( new GetNewStuffModel( this ) )
-{
-    ui->setupUi( this );
-
-    ui->listView->setModel( m_model );
-    GetNewStuffDelegate* del = new GetNewStuffDelegate( ui->listView );
-    connect( del, SIGNAL( update( QModelIndex ) ), ui->listView, SLOT( update( QModelIndex ) ) );
-    ui->listView->setItemDelegate( del );
-    ui->listView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-
-    ui->listView->setMouseTracking( true );
-
-    setMinimumSize( 560, 350 );
-
-#ifdef Q_WS_MAC
-    setMaximumSize( 560, 350 );
-    setSizeGripEnabled( false );
-
-    ui->listView->setAttribute( Qt::WA_MacShowFocusRect, false );
-#endif
-}
-
-
-GetNewStuffDialog::~GetNewStuffDialog()
-{
-    delete ui;
-}

src/GetNewStuffDialog.ui

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>GetNewStuffDialog</class>
- <widget class="QDialog" name="GetNewStuffDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>449</width>
-    <height>282</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Download New Resolvers</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QListView" name="listView"/>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>GetNewStuffDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>GetNewStuffDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

src/GetNewStuffModel.cpp

@@ -1,156 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#include "GetNewStuffModel.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QPixmap>
-#include <QUrl>
-#include "AtticaManager.h"
-
-GetNewStuffModel::GetNewStuffModel( QObject* parent )
-    : QAbstractListModel ( parent )
-{
-
-    if ( AtticaManager::instance()->resolversLoaded() )
-        m_contentList = AtticaManager::instance()->resolvers();
-
-    connect( AtticaManager::instance(), SIGNAL( resolversReloaded( Attica::Content::List ) ), this, SLOT( resolversReloaded( Attica::Content::List ) ) );
-    connect( AtticaManager::instance(), SIGNAL( resolverStateChanged( QString ) ), this, SLOT( resolverStateChanged( QString ) ) );
-
-}
-
-GetNewStuffModel::~GetNewStuffModel()
-{
-}
-
-void
-GetNewStuffModel::resolversReloaded( const Attica::Content::List& resolvers )
-{
-    beginResetModel();
-    m_contentList = resolvers;
-    endResetModel();
-}
-
-void
-GetNewStuffModel::resolverStateChanged( const QString& resolverId )
-{
-    for ( int i = 0; i < m_contentList.count(); i++ )
-    {
-        const Attica::Content resolver = m_contentList[ i ];
-        if ( resolver.id() == resolverId )
-        {
-            QModelIndex idx = index( i, 0, QModelIndex() );
-            emit dataChanged( idx, idx );
-        }
-    }
-}
-
-
-QVariant
-GetNewStuffModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() || !hasIndex( index.row(), index.column(), index.parent() ) )
-        return QVariant();
-
-    Attica::Content resolver = m_contentList[ index.row() ];
-    switch ( role )
-    {
-        case Qt::DisplayRole:
-            return resolver.name();
-        case Qt::DecorationRole:
-            return QVariant::fromValue< QPixmap >( AtticaManager::instance()->iconForResolver( resolver ) );
-        case DownloadUrlRole:
-            // TODO
-            return QUrl();
-        case RatingRole:
-            return resolver.rating() / 20; // rating is out of 100
-        case DownloadCounterRole:
-            return resolver.downloads();
-        case VersionRole:
-            return resolver.version();
-        case DescriptionRole:
-            return resolver.description();
-        case TypeRole:
-            return ResolverType;
-        case AuthorRole:
-            return resolver.author();
-        case StateRole:
-            return (int)AtticaManager::instance()->resolverState( resolver );
-        case UserHasRatedRole:
-            return AtticaManager::instance()->userHasRated( resolver );
-    }
-    return QVariant();
-}
-
-int
-GetNewStuffModel::rowCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-    return m_contentList.count();
-}
-
-bool
-GetNewStuffModel::setData( const QModelIndex &index, const QVariant &value, int role )
-{
-    Q_UNUSED( value );
-    if ( !hasIndex( index.row(), index.column(), index.parent() ) )
-        return false;
-
-
-    Attica::Content resolver = m_contentList[ index.row() ];
-    AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( resolver );
-    if ( role == Qt::EditRole )
-    {
-        switch( state )
-        {
-            case AtticaManager::Uninstalled:
-                // install
-                AtticaManager::instance()->installResolver( resolver );
-                break;
-            case AtticaManager::Installing:
-            case AtticaManager::Upgrading:
-                // Do nothing, busy
-                break;
-            case AtticaManager::Installed:
-                // Uninstall
-                AtticaManager::instance()->uninstallResolver( resolver );
-                break;
-            case AtticaManager::NeedsUpgrade:
-                AtticaManager::instance()->upgradeResolver( resolver );
-                break;
-            default:
-                //FIXME -- this handles e.g. Failed
-                break;
-        };
-    } else if ( role == RatingRole )
-    {
-        // For now only allow rating if a resolver is installed!
-        if ( state != AtticaManager::Installed && state != AtticaManager::NeedsUpgrade )
-            return false;
-        if ( AtticaManager::instance()->userHasRated( resolver ) )
-            return false;
-        m_contentList[ index.row() ].setRating( value.toInt() * 20 );
-        AtticaManager::instance()->uploadRating( m_contentList[ index.row() ] );
-    }
-    emit dataChanged( index, index );
-
-    return true;
-}

src/GetNewStuffModel.h

@@ -1,64 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GETNEWSTUFFMODEL_H
-#define GETNEWSTUFFMODEL_H
-
-#include <QModelIndex>
-
-#include <attica/content.h>
-#include <QPixmap>
-
-class GetNewStuffModel: public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum NewStuffRoles {
-        // DisplayRole is title
-        // DecorationRole is qicon for item
-        DownloadUrlRole = Qt::UserRole + 1,
-        RatingRole = Qt::UserRole + 2,
-        DownloadCounterRole = Qt::UserRole + 3,
-        VersionRole = Qt::UserRole + 4,
-        DescriptionRole = Qt::UserRole + 5,
-        TypeRole = Qt::UserRole + 6, // Category in attica-speak. What sort of item this is (resolver, etc).
-        AuthorRole = Qt::UserRole + 7,
-        StateRole = Qt::UserRole + 8,
-        UserHasRatedRole = Qt::UserRole + 9
-    };
-
-    enum Types {
-        ResolverType = 0,
-    };
-
-    explicit GetNewStuffModel( QObject* parent = 0 );
-    virtual ~GetNewStuffModel();
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual bool setData( const QModelIndex &index, const QVariant &value, int role );
-
-private slots:
-    void resolversReloaded( const Attica::Content::List& );
-    void resolverStateChanged( const QString& resolverId );
-
-private:
-    Attica::Content::List m_contentList;
-};
-
-#endif // GETNEWSTUFFMODEL_H

src/HeadlessCheck.h

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -28,7 +29,6 @@
 
 #define TOMAHAWK_APPLICATION QApplication
 #include <QApplication>
-#include "tomahawkwindow.h"
 
 #endif
 

src/LoadXSPFDialog.cpp

@@ -17,6 +17,8 @@
  */
 
 #include "LoadXSPFDialog.h"
+#include "TomahawkSettings.h"
+#include "Source.h"
 
 #include "ui_LoadXSPFDialog.h"
 #include <QFileDialog>
@@ -44,7 +46,11 @@ LoadXSPFDialog::~LoadXSPFDialog()
 void
 LoadXSPFDialog::getLocalFile()
 {
-    QString url = QFileDialog::getOpenFileName( this, tr( "Load XSPF File" ), QDir::homePath(), tr( "XSPF Files (*.xspf)" ) );
+    const QString path = TomahawkSettings::instance()->importXspfPath();
+    QString url = QFileDialog::getOpenFileName( this, tr( "Load XSPF File" ), path, tr( "XSPF Files (*.xspf)" ) );
+    if ( !url.isEmpty() )
+        TomahawkSettings::instance()->setImportXspfPath( QFileInfo( url ).absoluteDir().absolutePath() );
+
     m_ui->lineEdit->setText( url );
 }
 

src/LoadXSPFDialog.ui

@@ -19,7 +19,7 @@
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>Playlist Url</string>
+        <string>Playlist URL</string>
        </property>
       </widget>
      </item>

src/MusicScanner.cpp

@@ -1,6 +1,7 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -16,22 +17,22 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "musicscanner.h"
+#include "MusicScanner.h"
 
 #include <QtCore/QCoreApplication>
 
-#include "utils/tomahawkutils.h"
-#include "tomahawksettings.h"
-#include "sourcelist.h"
-#include "database/database.h"
-#include "database/databasecommand_dirmtimes.h"
-#include "database/databasecommand_filemtimes.h"
-#include "database/databasecommand_collectionstats.h"
-#include "database/databasecommand_addfiles.h"
-#include "database/databasecommand_deletefiles.h"
+#include "utils/TomahawkUtils.h"
+#include "TomahawkSettings.h"
+#include "SourceList.h"
+#include "database/Database.h"
+#include "database/DatabaseCommand_DirMtimes.h"
+#include "database/DatabaseCommand_FileMTimes.h"
+#include "database/DatabaseCommand_CollectionStats.h"
+#include "database/DatabaseCommand_AddFiles.h"
+#include "database/DatabaseCommand_DeleteFiles.h"
 #include "taghandlers/tag.h"
 
-#include "utils/logger.h"
+#include "utils/Logger.h"
 
 using namespace Tomahawk;
 
@@ -105,15 +106,17 @@ MusicScanner::MusicScanner( const QStringList& dirs, quint32 bs )
     , m_batchsize( bs )
     , m_dirListerThreadController( 0 )
 {
-    m_ext2mime.insert( "mp3", TomahawkUtils::extensionToMimetype( "mp3" ) );
-    m_ext2mime.insert( "ogg", TomahawkUtils::extensionToMimetype( "ogg" ) );
-    m_ext2mime.insert( "oga", TomahawkUtils::extensionToMimetype( "oga" ) );
-    m_ext2mime.insert( "mpc", TomahawkUtils::extensionToMimetype( "mpc" ) );
-    m_ext2mime.insert( "wma", TomahawkUtils::extensionToMimetype( "wma" ) );
-    m_ext2mime.insert( "aac", TomahawkUtils::extensionToMimetype( "aac" ) );
-    m_ext2mime.insert( "m4a", TomahawkUtils::extensionToMimetype( "m4a" ) );
-    m_ext2mime.insert( "mp4", TomahawkUtils::extensionToMimetype( "mp4" ) );
+    m_ext2mime.insert( "mp3",  TomahawkUtils::extensionToMimetype( "mp3" ) );
+    m_ext2mime.insert( "ogg",  TomahawkUtils::extensionToMimetype( "ogg" ) );
+    m_ext2mime.insert( "oga",  TomahawkUtils::extensionToMimetype( "oga" ) );
+    m_ext2mime.insert( "mpc",  TomahawkUtils::extensionToMimetype( "mpc" ) );
+    m_ext2mime.insert( "wma",  TomahawkUtils::extensionToMimetype( "wma" ) );
+    m_ext2mime.insert( "aac",  TomahawkUtils::extensionToMimetype( "aac" ) );
+    m_ext2mime.insert( "m4a",  TomahawkUtils::extensionToMimetype( "m4a" ) );
+    m_ext2mime.insert( "mp4",  TomahawkUtils::extensionToMimetype( "mp4" ) );
     m_ext2mime.insert( "flac", TomahawkUtils::extensionToMimetype( "flac" ) );
+    m_ext2mime.insert( "aiff", TomahawkUtils::extensionToMimetype( "aiff" ) );
+    m_ext2mime.insert( "aif",  TomahawkUtils::extensionToMimetype( "aif" ) );
 }
 
 
@@ -173,7 +176,6 @@ MusicScanner::scan()
                      SLOT( commitBatch( QVariantList, QVariantList ) ), Qt::DirectConnection );
 
     m_dirListerThreadController = new QThread( this );
-    m_dirListerThreadController->setPriority( QThread::IdlePriority );
 
     m_dirLister = QWeakPointer< DirLister >( new DirLister( m_dirs ) );
     m_dirLister.data()->moveToThread( m_dirListerThreadController );
@@ -185,7 +187,7 @@ MusicScanner::scan()
     connect( m_dirLister.data(), SIGNAL( finished() ),
                                    SLOT( listerFinished() ), Qt::QueuedConnection );
 
-    m_dirListerThreadController->start();
+    m_dirListerThreadController->start( QThread::IdlePriority );
     QMetaObject::invokeMethod( m_dirLister.data(), "go" );
 }
 
@@ -199,18 +201,16 @@ MusicScanner::listerFinished()
     foreach( const QString& key, m_filemtimes.keys() )
         m_filesToDelete << m_filemtimes[ key ].keys().first();
 
-    tDebug() << "Lister finished: to delete:" << m_filesToDelete;
+    tDebug( LOGINFO ) << "Scanning complete, saving to database. ( deleted" << m_filesToDelete.count() << "- scanned" << m_scanned << "- skipped" << m_skipped << ")";
+    tDebug( LOGEXTRA ) << "Skipped the following files (no tags / no valid audio):";
+    foreach ( const QString& s, m_skippedFiles )
+        tDebug( LOGEXTRA ) << s;
 
     if ( m_filesToDelete.length() || m_scannedfiles.length() )
     {
         commitBatch( m_scannedfiles, m_filesToDelete );
         m_scannedfiles.clear();
         m_filesToDelete.clear();
-
-        tDebug( LOGINFO ) << "Scanning complete, saving to database. ( scanned" << m_scanned << "skipped" << m_skipped << ")";
-        tDebug( LOGEXTRA ) << "Skipped the following files (no tags / no valid audio):";
-        foreach ( const QString& s, m_skippedFiles )
-            tDebug( LOGEXTRA ) << s;
     }
     else
         cleanup();
@@ -287,7 +287,7 @@ MusicScanner::scanFile( const QFileInfo& fi )
         m_filemtimes.remove( "file://" + fi.canonicalFilePath() );
     }
 
-    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath();
+    //tDebug( LOGVERBOSE ) << Q_FUNC_INFO << "Scanning file:" << fi.canonicalFilePath();
     QVariant m = readFile( fi );
     if ( m.toMap().isEmpty() )
         return;
@@ -335,9 +335,8 @@ MusicScanner::readFile( const QFileInfo& fi )
 
     int bitrate = 0;
     int duration = 0;
-
+    
     Tag *tag = Tag::fromFile( f );
-
     if ( f.audioProperties() )
     {
         TagLib::AudioProperties *properties = f.audioProperties();
@@ -345,10 +344,14 @@ MusicScanner::readFile( const QFileInfo& fi )
         bitrate = properties->bitrate();
     }
 
-    QString artist = tag->artist().trimmed();
-    QString album  = tag->album().trimmed();
-    QString track  = tag->title().trimmed();
-    if ( artist.isEmpty() || track.isEmpty() )
+    QString artist, album, track;
+    if ( tag )
+    {
+        artist = tag->artist().trimmed();
+        album  = tag->album().trimmed();
+        track  = tag->title().trimmed();
+    }
+    if ( !tag || artist.isEmpty() || track.isEmpty() )
     {
         // FIXME: do some clever filename guessing
         m_skippedFiles << fi.canonicalFilePath();