Initial commit. Embedded the standard VSXuWidget into tomahawk. still takes

audio from pulseaudio.
*sigh* Fix returning years in scriptresolvers
2025-09-07 04:30:43 +02:00 · 2012-02-07 01:57:38 +05:30 · 2012-02-04 01:53:54 +01:00 · 2012-02-03 17:10:03 +01:00 · 2012-02-02 16:08:42 -05:00 · 2012-02-02 16:05:51 -05:00
1932 changed files with 530538 additions and 16465 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ thirdparty/qtweetlib/WARNING-twitter-api-keys
 clang/
 win/
 gcc/
+tags
+.DS_Store
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "thirdparty/jreen"]
-	path = thirdparty/jreen
-	url = git://github.com/euroelessar/jreen.git
-[submodule "thirdparty/qtweetlib/QTweetLib"]
-	path = thirdparty/qtweetlib/QTweetLib
-	url = git://github.com/minimoog/QTweetLib.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )

 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 2 )
-SET( TOMAHAWK_VERSION_PATCH 1 )
+SET( TOMAHAWK_VERSION_MINOR 3 )
+SET( TOMAHAWK_VERSION_PATCH 99 )

 #SET( TOMAHAWK_VERSION_RC 0 )

@@ -24,6 +24,7 @@ SET( TOMAHAWK_VERSION_PATCH 1 )
 # build options
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)

 # generate version string

@@ -48,13 +49,15 @@ IF( NOT BUILD_RELEASE )
 ENDIF()


-
 # set paths
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )

+# make predefined install dirs available everywhere
+INCLUDE(GNUInstallDirs)
+
 # installer creation
 INCLUDE( TomahawkCPack.cmake )

@@ -72,6 +75,10 @@ ELSE()
    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
 ENDIF()

+IF( BUILD_GUI AND UNIX AND NOT APPLE )
+    FIND_PACKAGE( X11 )
+ENDIF()
+
 macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
 macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n     the qtwebkit-devel package is installed as well")

@@ -81,8 +88,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.7)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.8 is needed for dynamic playlists and the infosystem")
+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(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")
@@ -98,7 +105,35 @@ check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 macro_optional_find_package(Boost)
 macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination

+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(QuaZip)
+macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" FALSE "" "")
+
+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(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")
+
+macro_optional_find_package(VSXu)
+macro_log_feature(VSXU_FOUND "VSXu" "Vovoid VSXu Ultra" "https://www.vsxu.com" FALSE "" "VSXu is needed for some really cool music visualization.\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
@@ -106,34 +141,19 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++
 #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)

+#### submodules start
+# automatically init submodules here, don't delete this code we may add submodules again

 # this installs headers and such and should really be handled in a separate package by packagers
-IF( INTERNAL_JREEN )
-    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/jreen )
-    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
-    SET( LIBJREEN_LIBRARY jreen )
-    SET( LIBJREEN_LIBRARIES ${LIBJREEN_LIBRARY} )
-    SET( LIBJREEN_FOUND  true )
-    MESSAGE(STATUS "INTERNAL libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
-ELSE( INTERNAL_JREEN )
-    macro_optional_find_package(Jreen)
-ENDIF( INTERNAL_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\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")

-# this installs headers and such and should really be handled in a separate package by packagers
-IF( INTERNAL_QTWEETLIB )
-    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/qtweetlib )
-    # copy headers to build/QTweetLib so we can use proper includes inside the code
-    FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
-    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_BINARY_DIR} )
-    SET( QTWEETLIB_LIBRARY  tomahawk_qtweetlib )
-    SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
-    SET( QTWEETLIB_FOUND  true )
-    MESSAGE(STATUS "INTERNAL libQTweetLib: ${QTWEETLIB_INCLUDE_DIR}, ${QTWEETLIB_LIBRARY}")
-ELSE( INTERNAL_QTWEETLIB )
-    macro_optional_find_package(QTweetLib)
-ENDIF( INTERNAL_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\n     Use -DINTERNAL_QTWEETLIB=ON to build the git submodule inside Tomahawk \n")
+# IF( FALSE )
+#     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+#         EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+#         EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+#     ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+# ENDIF()
+
+#### submodules end

 ### libportfwd
 SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
@@ -142,8 +162,8 @@ SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
 ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )

 # we need pthreads too
-macro_optional_find_package(Threads)
-macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+#macro_optional_find_package(Threads)
+#macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")

 macro_optional_find_package(KDE4)
 macro_optional_find_package(KDE4Installed)
@@ -153,9 +173,12 @@ macro_optional_find_package(KDE4Installed)

 # macro_optional_find_package(KDE4)
 IF(KDE4_FOUND)
-    #KDE4 adds and removes some compiler flags that we don't like
-    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+    IF( CMAKE_C_FLAGS )
+        # KDE4 adds and removes some compiler flags that we don't like
+        # (only for gcc not for clang e.g.)
+        STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+    ENDIF()
 ELSE()
    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
 ENDIF()
@@ -190,3 +213,9 @@ 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()
--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
@@ -2,6 +2,7 @@
 # This module looks for clucene (http://clucene.sf.net) support
 # It will define the following values
 #
+# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
 # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
 # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
 # CLUCENE_LIBRARIES    = the libraries to link against CLucene
@@ -12,7 +13,16 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)

+# try to locate a patched unstable version (for comp's sake *sigh*) first
+FIND_PACKAGE(CLuceneUnstable)
+IF(CLUCENEUNSTABLE_FOUND)
+    SET(CLucene_FOUND TRUE)
+    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
+    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
+    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})

+    #MESSAGE(FATAL_ERROR NARF)
+ELSE(CLUCENEUNSTABLE_FOUND)
 IF(CLucene_FIND_VERSION)
  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
 ELSEIF()
@@ -98,8 +108,11 @@ ENDIF (CLUCENE_LIBRARY_DIR)

 IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
  SET(CLucene_FOUND TRUE)
+  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
 ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)

+ENDIF(CLUCENEUNSTABLE_FOUND)
+
 IF(CLucene_FOUND)
  IF(NOT CLucene_FIND_QUIETLY)
    MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
@@ -111,7 +124,8 @@ ELSE(CLucene_FOUND)
 ENDIF(CLucene_FOUND)

 MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIR 
-  CLUCENE_LIBRARY_DIR 
+  CLUCENE_INCLUDE_DIRS
+  CLUCENE_INCLUDE_DIR
+  CLUCENE_LIBRARY_DIR
  CLUCENE_LIBRARIES
  )
--- a/CMakeModules/FindCLuceneUnstable.cmake
+++ b/CMakeModules/FindCLuceneUnstable.cmake
@@ -0,0 +1,37 @@
+# - Try to find clucene-unstable
+#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
+#
+#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
+#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
+#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
+
+# Include dir
+find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
+  NAMES CLucene.h
+  PATH_SUFFIXES clucene-unstable
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+# Finally the library itself
+find_library(CLUCENE_UNSTABLE_SHARED_LIB
+  NAMES clucene-unstable-shared
+  PATHS ${KDE4_LIB_DIR}
+)
+
+find_library(CLUCENE_UNSTABLE_CORE_LIB
+  NAMES clucene-unstable-core
+  PATHS ${KDE4_LIB_DIR}
+)
+
+
+SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
+SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+
+
+MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+
--- a/CMakeModules/FindLibAttica.cmake
+++ b/CMakeModules/FindLibAttica.cmake
@@ -0,0 +1,63 @@
+# Try to find the Attica library
+# Once done this will define
+#
+#   LIBATTICA_FOUND          Indicates that Attica was found
+#   LIBATTICA_LIBRARIES      Libraries needed to use Attica
+#   LIBATTICA_LIBRARY_DIRS   Paths needed for linking against Attica
+#   LIBATTICA_INCLUDE_DIR    Path needed for finding Attica include files
+#
+# The minimum required version of LibAttica can be specified using the
+# standard syntax, e.g. find_package(LibAttica 0.20)
+
+# Copyright (c) 2009 Frederik Gladhorn <gladhorn@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+# Support LIBATTICA_MIN_VERSION for compatibility:
+IF(NOT LibAttica_FIND_VERSION)
+  SET(LibAttica_FIND_VERSION "${LIBATTICA_MIN_VERSION}")
+ENDIF(NOT LibAttica_FIND_VERSION)
+
+# the minimum version of LibAttica we require
+IF(NOT LibAttica_FIND_VERSION)
+  SET(LibAttica_FIND_VERSION "0.1.0")
+ENDIF(NOT LibAttica_FIND_VERSION)
+
+
+IF (NOT WIN32)
+   # use pkg-config to get the directories and then use these values
+   # in the FIND_PATH() and FIND_LIBRARY() calls
+   FIND_PACKAGE(PkgConfig)
+   PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica)
+   SET(LIBATTICA_DEFINITIONS ${PC_ATTICA_CFLAGS_OTHER})
+ENDIF (NOT WIN32)
+
+FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h
+   HINTS
+   ${PC_LIBATTICA_INCLUDEDIR}
+   ${PC_LIBATTICA_INCLUDE_DIRS}
+   PATH_SUFFIXES attica
+   )
+
+# Store the version number in the cache, so we don't have to search everytime:
+IF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
+  FILE(READ ${LIBATTICA_INCLUDE_DIR}/attica/version.h LIBATTICA_VERSION_CONTENT)
+  STRING (REGEX MATCH "LIBATTICA_VERSION_STRING \".*\"\n" LIBATTICA_VERSION_MATCH "${LIBATTICA_VERSION_CONTENT}")
+  IF(LIBATTICA_VERSION_MATCH)
+    STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" _LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH})
+  ENDIF(LIBATTICA_VERSION_MATCH)
+  SET(LIBATTICA_VERSION "${_LIBATTICA_VERSION}" CACHE STRING "Version number of LibAttica" FORCE)
+ENDIF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
+
+
+FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica
+   HINTS
+   ${PC_LIBATTICA_LIBDIR}
+   ${PC_LIBATTICA_LIBRARY_DIRS}
+   )
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica  REQUIRED_VARS LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR
+                                             VERSION_VAR LIBATTICA_VERSION)
+
+MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES)
--- a/CMakeModules/FindPhonon.cmake
+++ b/CMakeModules/FindPhonon.cmake
@@ -19,53 +19,19 @@ macro(_phonon_find_version)
   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
   set(PHONON_VERSION "${CMAKE_MATCH_1}")
-   message(STATUS "Phonon Version: ${PHONON_VERSION}")
 endmacro(_phonon_find_version)

-if(PHONON_FOUND)
-   # Already found, nothing more to do except figuring out the version
+# the dirs listed with HINTS are searched before the default sets of dirs
+find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
+
+if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+   set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
   _phonon_find_version()
-else(PHONON_FOUND)
-   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
-      set(PHONON_FIND_QUIETLY TRUE)
-   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)

-   # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
-   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
-   # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
-   find_library(PHONON_LIBRARY NAMES phonon phonon4)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)

-   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
-   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
-
-   _phonon_find_version()
-   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
-      set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
-      set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
-      set(PHONON_FOUND TRUE)
-   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
-      set(PHONON_FOUND FALSE)
-   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
-
-   if(PHONON_FOUND)
-      if(NOT PHONON_FIND_QUIETLY)
-         message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
-         message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
-      endif(NOT PHONON_FIND_QUIETLY)
-   else(PHONON_FOUND)
-      if(Phonon_FIND_REQUIRED)
-         if(NOT PHONON_INCLUDE_DIR)
-            message(STATUS "Phonon includes NOT found!")
-         endif(NOT PHONON_INCLUDE_DIR)
-         if(NOT PHONON_LIBRARY)
-            message(STATUS "Phonon library NOT found!")
-         endif(NOT PHONON_LIBRARY)
-         message(FATAL_ERROR "Phonon library or includes NOT found!")
-      else(Phonon_FIND_REQUIRED)
-         message(STATUS "Unable to find Phonon")
-      endif(Phonon_FIND_REQUIRED)
-   endif(PHONON_FOUND)
-
-
-   mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
-endif(PHONON_FOUND)
+mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)
--- a/CMakeModules/FindQCA2.cmake
+++ b/CMakeModules/FindQCA2.cmake
@@ -0,0 +1,48 @@
+# - Try to find QCA2 (Qt Cryptography Architecture 2)
+# Once done this will define
+#
+#  QCA2_FOUND - system has QCA2
+#  QCA2_INCLUDE_DIR - the QCA2 include directory
+#  QCA2_LIBRARIES - the libraries needed to use QCA2
+#  QCA2_DEFINITIONS - Compiler switches required for using QCA2
+#
+# use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+
+# Copyright (c) 2006, Michael Larouche, <michael.larouche@kdemail.net>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+include(FindLibraryWithDebug)
+
+if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
+
+  # in cache already
+  set(QCA2_FOUND TRUE)
+
+else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
+
+
+  if (NOT WIN32)
+    find_package(PkgConfig)
+    pkg_check_modules(PC_QCA2 qca2)
+    set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
+  endif (NOT WIN32)
+
+  find_library_with_debug(QCA2_LIBRARIES
+                  WIN32_DEBUG_POSTFIX d
+                  NAMES qca
+                  HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
+                  )
+
+  find_path(QCA2_INCLUDE_DIR qca.h
+            HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
+            PATH_SUFFIXES QtCrypto)
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(QCA2  DEFAULT_MSG  QCA2_LIBRARIES QCA2_INCLUDE_DIR)
+
+  mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES)
+
+endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
--- a/CMakeModules/FindQuaZip.cmake
+++ b/CMakeModules/FindQuaZip.cmake
@@ -0,0 +1,11 @@
+find_package(Qt4)
+find_path(QuaZip_INCLUDE_DIR quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
+find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
+set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
+mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
+
+if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
+   set(QuaZip_FOUND TRUE)
+endif()
--- a/CMakeModules/FindVSXu.cmake
+++ b/CMakeModules/FindVSXu.cmake
@@ -0,0 +1,48 @@
+# Find VSXU - JSON handling library for Qt
+#
+# This module defines
+#  VSXU_FOUND - whether the qsjon library was found
+#  VSXU_LIBRARIES - the vsxu library
+#  VSXU_INCLUDE_DIRS - the include path of the vsxu library
+#
+
+if (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)
+
+  # Already in cache
+  set (VSXU_FOUND TRUE)
+
+else (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)
+
+  if (NOT WIN32)
+    # use pkg-config to get the values of VSXU_INCLUDE_DIRS
+    # and VSXU_LIBRARY_DIRS to add as hints to the find commands.
+    include (FindPkgConfig)
+    pkg_check_modules (VSXU REQUIRED libvsxu)
+  endif (NOT WIN32)
+
+  find_library (VSXU_LIBRARIES
+    NAMES
+    libvsxu_engine
+    PATHS
+    ${VSXU_LIBRARY_DIRS}
+    ${LIB_INSTALL_DIR}
+    ${KDE4_LIB_DIR}
+  )
+
+  find_path (VSXU_INCLUDE_DIRS
+    NAMES
+    vsxu_platform.h
+    PATHS
+    ${VSXU_INCLUDE_DIRS}
+    ${INCLUDE_INSTALL_DIR}
+    ${KDE4_INCLUDE_DIR}
+  )
+
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(VSXu DEFAULT_MSG VSXU_LIBRARIES VSXU_INCLUDE_DIRS)
+
+  if ( UNIX AND NOT APPLE )
+    set ( VSXU_LIBRARIES "${VSXU_LIBRARIES} ${VSXU_LDFLAGS}" CACHE INTERNAL "")
+  endif ()
+
+endif (VSXU_INCLUDE_DIRS AND VSXU_LIBRARIES)
--- a/CMakeModules/GNUInstallDirs.cmake
+++ b/CMakeModules/GNUInstallDirs.cmake
@@ -0,0 +1,182 @@
+# - Define GNU standard installation directories
+# Provides install directory variables as defined for GNU software:
+#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+# Inclusion of this module defines the following variables:
+#  CMAKE_INSTALL_<dir>      - destination for files of a given type
+#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+# where <dir> is one of:
+#  BINDIR           - user executables (bin)
+#  SBINDIR          - system admin executables (sbin)
+#  LIBEXECDIR       - program executables (libexec)
+#  SYSCONFDIR       - read-only single-machine data (etc)
+#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#  LOCALSTATEDIR    - modifiable single-machine data (var)
+#  LIBDIR           - object code libraries (lib or lib64)
+#  INCLUDEDIR       - C header files (include)
+#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#  DATAROOTDIR      - read-only architecture-independent data root (share)
+#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#  INFODIR          - info documentation (DATAROOTDIR/info)
+#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#  MANDIR           - man documentation (DATAROOTDIR/man)
+#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+# install() commands for the corresponding file type.  If the includer does
+# not define a value the above-shown default will be used and the value will
+# appear in the cache for editing by the user.
+# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the value
+# of CMAKE_INSTALL_PREFIX.
+
+#=============================================================================
+# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
+# Copyright 2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Installation directories
+#
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # Note that the future of multi-arch handling may be even
+  # more complicated than that: http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING
+      AND NOT EXISTS "/etc/debian_version")
+    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+      message(AUTHOR_WARNING
+        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+        "Please enable at least one language before including GNUInstallDirs.")
+    else()
+      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+        set(_LIBDIR_DEFAULT "lib64")
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+endif()
+
+#-----------------------------------------------------------------------------
+# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
+# the cache and store the defaults in local variables if the cache values are
+# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
+
+if(NOT CMAKE_INSTALL_DATADIR)
+  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+endif()
+
+if(NOT CMAKE_INSTALL_INFODIR)
+  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+endif()
+
+if(NOT CMAKE_INSTALL_MANDIR)
+  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+endif()
+
+if(NOT CMAKE_INSTALL_DOCDIR)
+  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+endif()
+
+#-----------------------------------------------------------------------------
+
+mark_as_advanced(
+  CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_SBINDIR
+  CMAKE_INSTALL_LIBEXECDIR
+  CMAKE_INSTALL_SYSCONFDIR
+  CMAKE_INSTALL_SHAREDSTATEDIR
+  CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_INCLUDEDIR
+  CMAKE_INSTALL_OLDINCLUDEDIR
+  CMAKE_INSTALL_DATAROOTDIR
+  CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_INFODIR
+  CMAKE_INSTALL_LOCALEDIR
+  CMAKE_INSTALL_MANDIR
+  CMAKE_INSTALL_DOCDIR
+  )
+
+# Result directories
+#
+foreach(dir
+    BINDIR
+    SBINDIR
+    LIBEXECDIR
+    SYSCONFDIR
+    SHAREDSTATEDIR
+    LOCALSTATEDIR
+    LIBDIR
+    INCLUDEDIR
+    OLDINCLUDEDIR
+    DATAROOTDIR
+    DATADIR
+    INFODIR
+    LOCALEDIR
+    MANDIR
+    DOCDIR
+    )
+  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+  else()
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+  endif()
+endforeach()
--- a/CMakeModules/NSIS.template.in
+++ b/CMakeModules/NSIS.template.in
@@ -203,7 +203,7 @@ Function PageReinstall
      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
   build_check:
      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
-      IntCmp $R0 ${VER_BUILD} new_version older_version
+      IntCmp $R0 ${VER_BUILD} same_version new_version older_version

   new_version:
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
@@ -273,9 +273,13 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
        ;Main executable.
        File "${INSTALL_PATH}\bin\tomahawk.exe"

+        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
+        File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
+
        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\libquazip.dll"
        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
        File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
   !endif
@@ -283,10 +287,14 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
        ;Main executable.
        File "${BUILD_PATH}\tomahawk.exe"

+        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
+        File "${BUILD_PATH}\libtomahawk_breakpad.dll"
+
        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}\libquazip.dll"
        File "${BUILD_PATH}\libtomahawk_sip*.dll"
   !endif

@@ -321,12 +329,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   File "${MING_BIN}\libstdc++-6.dll"

   ;Phonon stuff
-
-   ;Fix the phonon build to not use Dbus
-   File "${QT_DLL_PATH}\QtDbus4.dll"
-   File "${MING_BIN}\libdbus-1-3.dll"
-   File "${MING_BIN}\dbus-daemon.exe"
-
   File "${VLC_BIN}\libphonon.dll"
   SetOutPath "$INSTDIR\phonon_backend"
   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
@@ -339,13 +341,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   SetOutPath "$INSTDIR\plugins"
   File /r "${VLC_PLUGIN_PATH}\*.dll"
   SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libmad-0.dll" ; MP3
-   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
-   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
-   File "${MING_BIN}\libvorbis-0.dll" ; OGG
-   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
-
-

   ; Other
   File "${MING_BIN}\libqjson.dll"
@@ -370,6 +365,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   File "${MING_LIB}\libclucene-shared.dll"

   File "${MING_BIN}\libqtsparkle.dll"
+   File "${MING_BIN}\libattica.dll"
 SectionEnd

 SectionGroup "Shortcuts"
@@ -459,7 +455,8 @@ Section -post
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"

   ; Register tomahawk:// protocol handler
-   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
+   WriteRegStr HKCR "tomahawk" "" "URL:Tomahawk Protocol"
+   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
   WriteRegStr HKCR "tomahawk\shell" "" "open"
   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
--- a/140
+++ b/140
@@ -1,3 +1,143 @@
+Version 0.3.3:
+    * Automatically load Super Collection tracks when no official release
+      information is available.
+    * Fixed stations not fetching new tracks under certain circumstances.
+    * Fixed Footnotes not always updating when selecting a new track.
+    * Added support for ow.ly, fb.me, itun.es and tinyurl.com URL shorteners.
+    * Fixed playback issues with non-latin filenames on Windows.
+    * Fixed tomahawk:// protocol not working properly on Windows.
+    * Fixed dupe menu entry appearing on OS X.
+    * Fixed invisible sidebar items on Linux.
+
+Version 0.3.2: 
+    * Improved syncing process, it's faster and more reliable now.
+    * Fixed UPnP issues.
+    * Fixed not updating collections and views after a collection changes.
+    * Fixed not showing a source's proper name at all times.
+    * Improved music scanner reliability.
+    * Fixed various labels not being painted in the right color when selected.
+    * Support .oga (ogg mimetype) files.
+    * Fixed stuck Now Playing indicator icon.
+    * Fixed sidebar width of settings dialog on Windows.
+    * Fixed not always showing delete icon on hovered temporary pages.
+    * Fixed inability to select externally mounted drives.
+    * Fixed bug where speaker would be stuck next to a playlist.
+    * Fixed bug where first startup would show a loading spinner in the
+      Dashboard's "Recent Additions" forever.
+    * Automatically upgrade resolvers when an update is found.
+    * Fixed last played track of a friend never expiring.
+    * Fixed parsing of rdio tracks.
+    * Changed steering mechanism in stations to be user-friendlier.
+    * Fixed loading biographies of artist names with special characters.
+    * Fixed behaviour of dropping Spotify playlists on the sidebar.
+    * Fixed hard to read source-name in the audio control area on OS X.
+    * Fixed crashes when playing Grooveshark tracks.
+    * Fixed bug where clicking the latch button would flicker and unlatch.
+    * Fixed Jabber accounts not connecting properly when proxy is in use.
+
+Version 0.3.1:
+    * Fixed not resolving to local files.
+    * Fixed shutdown crash on Windows.
+    * Support more widget types in Javascript resolver configs.
+    * Fixed bug where red headphone would be visible on My Collection
+      when listened along to source went offline.
+    * Draw author name as well as avatar in recently played playlists.
+    * Fixed Tomahawk integration in Unity.
+    * Fixed incorrect item selected in source tree when deleting temporary
+      pages.
+    * Fixed currently played label disappearing after 10 minutes regardless
+      of length of track.
+    * Fixed crash on Sparkle upgrade on OS X.
+
+Version 0.3.0:
+    * Make artist names in the album view clickable.
+    * Don't start playing if a tomahawk:// link was clicked while Tomahawk
+      is paused.
+    * Make artist name clickable in header of Album pages.
+    * Added a drop shadow to cover images, and put placeholder in jewel case.
+    * Added shuffle and repeat support to tree view.
+    * Draw a speaker next to the currently playing playlist.
+    * Refresh station previews whenever a filter is changed.
+    * Support and show official releases on album and track pages.
+    * Filter out duplicates from station previews and upcoming tracks.
+    * Added YouTube resolver.
+    * Fixed bug where going offline then online would not re-connect to many
+      peers.
+    * Added support for auto-updating live XSPF playlists. 
+    * Don't show an age of 41 years for tracks that have no age information.
+    * Show config UI for resolvers that have them as soon as you add them.
+    * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize
+      your catalog with The Echo Nest and enable personal recommendations
+      from you and your friends.
+    * Added support for Grooveshark resolver (requires Grooveshark Anywhere).
+    * Fixed re-resolving when resolvers or sources go off- / online.
+    * Correctly sort recently played tracks on the Dashboard.
+    * Show a Lion full-screen toggle button if running on Lion.
+    * Show a list of users who are currently listening along to you.
+    * Show headphone icon in source item to allow users to listen along; paint
+      headphones red on a source if you are currently listening along to it.
+    * Added new job status view in the bottom of the source list that displays
+      current jobs such as resolving, parsing playlists, and loading from
+      database.
+    * Parse and convert a Spotify playlist URL when dropped anywhere on the
+      sidebar.
+    * Convert resolvers to use asynchronous calls to avoid blocking Tomahawk's
+      UI, greatly increasing responsiveness of Tomahawk while resolving.
+    * Fixed no playlists overlay not disappearing when playlists were added.
+    * Add support for parsing itunes track, artist and album links.
+    * Fixed crash when syncing playlists with peers.
+    * Add support for browsing, downloading and rating resolvers from within
+      Tomahawk directly.
+    * Support multi-folder selection and scanning.
+    * Fixed handling of special characters in tomahawk:// links
+    * Improve sidebar performance by caching pixmaps and shrinking them.
+    * Send updated playlists to peers when tracks are moved/copied.
+    * Remove splitter handles in sidebar.
+    * Fixed Tomahawk preventing system shutdown / logout.
+    * Ignore leading 'The' when sorting artists.
+    * Added Charts page, which shows various sources' top hits & artists.
+    * The Collection tree-views can now be filtered.
+    * Fixed crash when pressing enter in an empty playlist.
+    * Moved the song queue to the bottom of the sidebar.
+    * Added Footnotes, a contextual view that you can slide it.
+    * Show recently added playlists in dashboard rather than recently opened
+      playlists.
+    * Fixed seek slider and give it some smooth animation between ticks.
+    * Fixed Twitter issue where it would repeatedly send DMs to friends.
+    * Add a new drag and drop menu when dropping items onto playlists,
+      allowing users to drop the dragged tracks, the whole album, or
+      the whole artists's tracks.
+    * Bring Tomahawk window to the front when clicking a Tomahawk link.
+    * Fixed crash in source list when initially syncing with remote sources.
+    * Open temporary artist, album, and search playlists as temporary items
+      in the sidebar.
+    * Fixed sorting of playlists and items in the artist view.
+    * Allow dragging and dropping albums and artists to playlists.
+    * Added MPRIS 2.1 support.
+
+Version 0.2.3:
+    * Fixed opening Rdio and Spotify links.
+    * Fixed potential crash in sidebar during syncing of sources.
+    * When Listening Along, the last song a peer plays is no longer duplicated.
+    * Fixed an issue where the Twitter plugin could get out of sync if the
+      database was cleared, leading to eventual crashes when re-connecting.
+    * Fixed duplicate albums showing up on Dashboard.
+    * Automatically sort search results by score.
+    * Fixed stations being stuck not fetching more songs.
+    * Fixed issue where artist bio could be referring to a different artist.
+    * Opening a "tomahawk" URL (or other URL with Tomahawk) brings the Tomahawk
+      window to the foreground.
+
+Version 0.2.2:
+    * Fixed crash pressing previous and next when playing a song from the Queue.
+    * Fixed issue where wrench for newly added resolvers would not show up.
+    * Fixed sidebar statistics not updating after collection scan finished.
+    * Fixed omitting a few tracks in the Collection tree-view.
+    * Fixed sidebar & track sorting issues.
+    * Seek- & volume sliders now directly jump to the position you clicked on.
+    * Added ability to drag artists and albums within Tomahawk.
+    * (OS X) Fixed Ogg Vorbis support.
+
 Version 0.2.1:
    * Fixed crashing trying to play an unavailable track.
    * Fixed a crash caused by using Javascript resolvers.
--- a/27
+++ b/27
@@ -27,18 +27,25 @@ Doxygen Documentation
 Dependencies
 ------------

-  CMake 2.8.0 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.3x http://www.boost.org/
-  CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
-  libechonest 1.1.8 http://projects.kde.org/projects/playground/libs/libechonest/
+  CMake 2.8.0 - 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/
+
+ The following dependencies are optional, but recommended:
+
+  Attica 0.2.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
+  Jreen 1.0.1 - https://github.com/euroelessar/jreen
+  QTweetLib 0.3.0 - https://github.com/minimoog/QTweetLib

 Third party libraries that we ship with our source:

-  MiniUPnP http://miniupnp.free.fr/
-  liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
+  MiniUPnP 1.6 - http://miniupnp.free.fr/
+  liblastfm 0.4.0 - http://github.com/jonocole/liblastfm/
+  QuaZip 0.4.3 - http://quazip.sourceforge.net/

 Enjoy!
--- a/admin/CMakeLists.txt
+++ b/admin/CMakeLists.txt
@@ -1,3 +1,3 @@
 IF(WIN32)
    INSTALL(DIRECTORY win DESTINATION share/tomahawk/admin )
-ENDIF(WIN32)
+ENDIF(WIN32)
--- a/admin/copy_syms.sh
+++ b/admin/copy_syms.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+DUMPID=`head -n1 $1 | cut -f4 -d' '`
+mkdir -p $2/$DUMPID
+cp $1 $2/$DUMPID/
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -41,7 +41,7 @@ VERSION=$1

    header "Copying Sparkle framework"
    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-
+    
    header "Creating DMG"
    cd ..

--- a/admin/mac/macdeploy.py
+++ b/admin/mac/macdeploy.py
@@ -207,7 +207,7 @@ TOMAHAWK_PLUGINS = [
 ]

 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.7.3/plugins',
+    '/usr/local/Cellar/qt/4.7.4/plugins',
 ]


@@ -250,7 +250,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', 'plugins')
 binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)

 fixed_libraries = []
@@ -500,6 +500,11 @@ 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'

 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
--- a/admin/unix/tomahawk.desktop
+++ b/admin/unix/tomahawk.desktop
@@ -4,8 +4,9 @@ Version=1.0
 Name=Tomahawk
 GenericName=Music Player
 TryExec=tomahawk
-Exec=tomahawk
+Exec=tomahawk %u
 Comment=Tomahawk - Social Music Player
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
+MimeType=x-scheme-handler/tomahawk;
--- a/admin/win/update-vlc.sh
+++ b/admin/win/update-vlc.sh
@@ -1,22 +1,31 @@
 #!/bin/bash
-echo "Remove old vlc dir..."
-
 mkdir -p vlc/
+
+if [ "$1" = "-c" ] ; then
+echo "Continuing last download.."
+rm -rvf vlc/prefix/
+else
+echo "Remove old vlc dir..."
+rm -rvf vlc/*
+fi
+
 cd vlc/

-#rm -vf vlc-*.7z
-#rm -rf vlc/
-
-echo "Download specified binary..."
+echo "Download phonon archive..."
 #wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
 #wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
-wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
+#wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
+wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z

 echo "Extract binary..."
-7z x phonon-vlc-last.7z
+7z x phonon*.7z
 #mv -v vlc-*/ vlc/
 #unzip tomahawk-vlc-0.1.zip

+echo "Download phonon_vlc_no_video.dll..."
+wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
+cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll
+
 echo "Strip unneeded plugins from vlc/plugins..."
 cd prefix/bin/plugins
 rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
--- a/data/icons/tomahawk-icon.svg
+++ b/data/icons/tomahawk-icon.svg
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!-- 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="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
-<path fill="#010101" d="M543.773,253.359c0-49.962-19.305-86.572-54.194-104.54C477.838,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.186,51.825,20.321,71.748
-	c-1.816,1.566-3.444,3.283-4.768,5.24c0,0,2.582,2.36,3.689,3.374c-4.262,2.123-8.22,4.322-11.555,6.669
-	c0,0,3.022,7.355,5.898,14.352c-11.991,9.687-21.314,18.92-27.553,27.51c0,0,1.612,1.789,2.011,2.224
-	c-12.355,9.158-22.133,18.206-28.528,27.021c0,0,6.925,7.351,12.408,13.167c-17.824,28.759-43.348,74.85-43.348,102.987
-	c0,3.281,0.346,6.318,1.093,9.054c1.764,6.442,5.752,11.437,11.229,14.058c15.255,7.311,39.648-6.364,72.589-40.434
-	c-0.828,8.288-1.457,16.663-1.457,24.737c0,16.804,2.266,32.07,8.77,41.249c4.886,6.895,10.898,9.07,15.084,9.683
-	c6.721,0.989,26.375,3.796,57.992-61.296c2.678,0.705,5.421,1.179,8.235,1.179c8.798,0,17.067-3.425,23.287-9.639
-	c4.286-4.288,7.133-9.584,8.562-15.313c7.516-2.129,14.555-6.702,20.779-13.191c19.563,24.861,44.78,37.643,75.38,37.643
-	c7.318,0,14.474-0.755,21.281-2.243c0.392-0.075,2.555-0.622,2.555-0.622l0.62-0.167c23.05-5.824,42.463-20.41,58-43.254
-	c7.2,9.231,15.733,15.994,24.849,19.458c1.139,6.658,4.224,12.806,9.1,17.69c6.22,6.214,14.488,9.639,23.288,9.639
-	c8.798,0,17.065-3.425,23.285-9.639c6.221-6.228,9.649-14.494,9.649-23.292s-3.429-17.066-9.649-23.294
-	c-2.988-2.988-6.476-5.296-10.248-6.923c0.277-2.947,0.613-5.848,0.613-9.007c0-10.031-1.4-20.982-4.192-31.9
-	c-1.196-4.672-2.757-8.745-4.511-12.567c2.838-6.467,4.805-13.268,4.805-20.426c0-7.317-1.74-14.422-4.706-21.011
-	C509.263,358.346,543.773,313.068,543.773,253.359z M451.232,150.998c-33.395-54.619-88.048-93.359-134.569-85.472
-	c-49.024-7.864-102.777,30.64-135.326,85.018c-2.648,0.208-5.278,0.497-7.875,0.88c8.694-54.414,69.429-111.108,143.107-111.108
-	c74.113,0,135.141,57.197,143.269,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.348-81.865,170.997
-	c15.97,7.654,74.912-46.056,139.701-143.288c45.751-68.648,60.797-94.429,45.68-95.922l20.614-43.357l-10.685-6.644l-33.912,33.371
+	 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.099,113.042-39.738,189.89-20.813,192.654
-	c18.912,2.787,59.039-67.616,89.306-182.6c21.381-81.178,27.255-111.03,11.438-108.001l5.133-48.806l-13.207-3.354l-22.194,42.936
+<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.831" r="37.801"/>
+<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.809,13.607-58.455,52.219-58.455,97.818c0,56.947,34.681,103.109,89.925,103.109
-	c35.784,0,67.089-19.432,84.771-48.551c14.01,3.533,28.778,5.463,44.066,5.463c13.16,0,25.932-1.438,38.173-4.077
-	c17.966,28.357,49.108,47.165,84.604,47.165c55.665,0,90.696-46.162,90.696-103.109
-	C528.216,210.073,512.208,173.073,475.237,157.792z M314.742,274.908c-10.501,0-20.723-0.878-30.584-2.506
+	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.694-54.414,69.43-111.108,143.107-111.108c74.113,0,135.142,57.197,143.268,112.08c-6.617-1.398-13.471-2.141-20.49-2.141
+	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="-55.6953" y1="95.2363" x2="39.7773" y2="95.2363" gradientTransform="matrix(-0.3782 -0.8348 1.083 -0.4907 70.5233 338.0542)">
+<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.027-36.091,71.213
-	c-31.323,14.194-65.948,5.312-77.338-19.829C106,292.849,122.366,274.543,153.69,260.35z"/>
-<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-180.8516" y1="181.2642" x2="-85.3789" y2="181.2642" gradientTransform="matrix(-0.9008 -0.3607 0.555 -1.386 252.7537 479.2919)">
+<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.473-64.122
-	c27.122,10.86,36.111,52.165,20.056,92.248c-16.053,40.089-51.062,63.772-78.189,52.911
+<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.776,30.397,3.982,62.358-14.521,62.358
-	c-16.301,0-34.904-17.333-42.675-47.733c-7.777-30.4,4.243-75.016,14.521-62.365C423.583,399.707,440.442,394.825,448.219,425.226z"
-	/>
-<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="217.0322" y1="557.499" x2="165.1699" y2="467.6709" gradientTransform="matrix(0.9868 0.0515 0.0515 0.7987 -5.5217 21.3475)">
+<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"/>
@@ -64,29 +64,30 @@
 	<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.881-9.153-57.129-24.947-61.17C200.537,387.275,190.178,413.973,184.076,437.859
+	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.755-12.333,165.503,89.311,165.503,187.528
-	c0,98.215-74.305,162.834-165.707,162.834"/>
-<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="194.4072" y1="374.3564" x2="358.2427" y2="90.5851">
+<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.634,415.888c-91.402,0-165.297-64.619-165.297-162.834
+<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="297.3164" y1="139.4717" x2="418.2684" y2="-70.0234" gradientTransform="matrix(-0.6092 0.7802 -0.4118 -0.3216 476.7253 -96.4624)">
+<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.802-52.245,93.808-72.894,126.21-59.689c26.67,10.864,14.474,85.434-26.328,137.681
+	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.831" r="34.682"/>
+<circle fill="#010101" cx="214.367" cy="388.832" r="34.682"/>
 <g>
-	<path fill="#F4DFED" d="M131.831,427.709c-23.973,79.733-18.741,132.267-9.011,135.459c10.855,3.563,43.561-47.223,60.839-128.324
-		c12.189-57.265,11.727-83.75,0.009-81.625l3.505-31.111l-8.901-2.432l-14.271,32.445
-		C152.554,347.564,150.184,366.689,131.831,427.709z"/>
-	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="148.1519" y1="319.6758" x2="148.1518" y2="563.168">
+	<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"/>
@@ -94,11 +95,11 @@
 		<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.098-26.758-24.228,14.713
-		c16.962-56.432,32.317-62.998,32.317-62.998l11.404-46.658l-4.725-1.131l-14.702,30.23c-11.429-4.588-13.859,14.521-32.392,75.485
-		c-24.224,79.655-20.501,124.085-8.358,137.776L146.41,479.117z"/>
+	<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="75.7998" y1="402.9658" x2="43.9086" y2="490.7602" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
+		<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"/>
@@ -106,10 +107,10 @@
 		<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.4c0,0,6.608,60.692-7.474,93.405
-		c1.438-44.878-2.328-36.951-9.176-25.254C159.71,482.03,147.332,501.478,147.332,501.478z"/>
+	<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="100.2559" y1="370.0205" x2="67.8228" y2="459.3065" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
+		<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"/>
@@ -117,10 +118,10 @@
 		<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.952c0,0,2.251,62.278-11.831,94.991
-		c-0.298-44.249-5.388-28.089-8.538-23.508C165.662,454.416,156.286,463.716,156.286,463.716z"/>
+	<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="19.1768" y1="337.1123" x2="-32.4432" y2="389.2988" gradientTransform="matrix(0.711 -0.7032 0.7032 0.711 -56.5767 131.5096)">
+		<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"/>
@@ -128,21 +129,22 @@
 		<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.425
-		c-11.773-30.423-13.671-21.048-17.578-14.96C187.396,417.538,180.916,431.115,180.916,431.115z"/>
-	<path fill="#1E3D73" d="M174.914,335.556L158.76,362.31l-23.24,76.647c0,0,1.211-8.173,1.788-15.883l-18.783,50.773
-		c0,0,8.386-31.226,3.609-28.382c-4.777,2.84,4.225-21.91-23.102,13.729c5.316-18.514,20.495-39.508,33.324-54.9
-		c-2.172,0.474-7.1,4.788-18.387,18.374c4.38-15.232,14.957-32.934,25.358-47.898c-1.159-2.683-5.151-3.889-21.234,5.221
-		C134.366,356.719,174.914,335.556,174.914,335.556z"/>
+	<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.163c-49.752,66.752-62.779,117.913-54.719,124.242c8.987,7.059,57.064-29.51,100.989-99.844
-		c31.011-49.657,39.62-74.709,27.879-76.714l13.916-28.052l-7.539-5.319L150.496,341.1
-		C141.291,332.911,132.531,350.072,94.453,401.163z"/>
-	<path fill="#656B84" d="M90.603,454.464L62.515,464.67l55.456-49.201l10.331-14.731c0,0,12.047-24.096-27.794,5.558
-		c35.211-47.255,51.89-48.182,51.89-48.182l26.641-39.956l-4.058-2.681l-24.133,23.399c-9.177-8.222-17.989,8.911-56.224,59.885
-		c-49.96,66.6-61.634,109.635-54.889,126.645L90.603,454.464z"/>
-	<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="106.2383" y1="485.0312" x2="121.9901" y2="395.6984">
+	<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"/>
@@ -150,9 +152,10 @@
 		<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.474-75.981c0,0-14.507,59.304-38.916,85.248
-		c16.678-41.696,12.058-33.368,0-26.873C101.491,460.821,83.829,475.791,83.829,475.791z"/>
-	<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="130.9844" y1="453.7012" x2="146.8758" y2="363.5764">
+	<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"/>
@@ -160,37 +163,36 @@
 		<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.356l68.564-75.05c0,0-19.143,59.297-43.551,85.248
-		c14.824-41.701,10.567-27.993,0-25.023C124.802,430.041,105.143,443.356,105.143,443.356z"/>
-	<path fill="#656B84" d="M139.423,421.124l34.26-65.654c0,0,2.748,46.867-8.945,72.74c-0.676-32.615-3.041-28.432-11.413-20.06
-		C150.5,410.974,139.423,421.124,139.423,421.124z"/>
-	<path fill="#656B84" d="M166.408,329.256l-24.322,19.63l-48.011,64.112c0,0,3.931-7.274,7.104-14.322l-34.994,41.313
-		c0,0,18.552-26.484,13.089-25.448c-5.464,1.04,11.451-19.148-26.399,5.019c11.313-15.587,32.751-30.137,50.064-40.227
-		c-2.205-0.298-8.316,2.077-23.552,10.989c9.313-12.818,25.302-25.842,40.183-36.357c-0.175-2.919-3.515-5.416-21.74-2.346
-		C121.065,335.3,166.408,329.256,166.408,329.256z"/>
+	<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" enable-background="new    " d="M315.05,115.063c-50.514,0-83.218,15.021-109.641,64.839
-		c-2.502,4.713-0.232,14.337-2.796,19.152c-13.845,26.007-37.089,48.236-37.089,71.707c0,34.337,19.1,65.637,42.505,89.297
-		c12.185,71.644,34.7,151.593,104.339,151.593"/>
-	<path fill="#010101" d="M203.271,178.766c-1.519,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.382,42.666,90.413
-		c12.578,73.606,36.115,150.477,106.6,150.477v-1.546c-67.084,0-89.722-78.554-101.95-150.453l-0.127-0.748l-0.54-0.549
-		c-26.957-27.255-41.805-58.361-41.805-87.594c0-14.923,10.174-29.766,20.949-45.482c5.501-8.027,11.192-16.327,15.857-25.087
-		c1.56-2.935,1.636-6.92,1.707-10.773c0.057-3.221,0.118-6.551,1.088-8.381c24.256-45.734,54.398-65.974,107.503-65.974v-2.422
+	<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.593c23.405-23.66,42.512-54.96,42.512-89.297
-	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.475-45.162"/>
+<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.454c0,7.813-14.98,12.535-27.275,12.535c-12.293,0-27.808-4.735-27.808-12.549
-	c3.43-3.43,15.246,4.886,27.544,4.886C334.789,378.326,342.916,312.495,342.916,373.454z"/>
-<path fill="#D9AF82" d="M335.697,435.217c0,37.637-9.81,68.831-21.91,68.831c-12.096,0-21.901-31.194-21.901-68.831
-	c0-37.639,9.882-50.259,21.977-50.259C325.962,384.958,335.697,397.578,335.697,435.217z"/>
-<path opacity="0.36" fill="#8A644B" d="M328.365,281.605c-1.826,24.681-14.186-7.573-34.757,20.974
-	c-8.672,12.026-23.23,10.877-38.845,10.877c-39.61,0-66.544-26.03-67.859-38.868c-2.517-24.557,29.024-39.586,71.464-39.586
+<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="214.7554" y1="341.0537" x2="290.4385" y2="341.0537">
+<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"/>
@@ -199,40 +201,38 @@
 	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
 	<stop  offset="1" style="stop-color:#F5D4C9"/>
 </linearGradient>
-<path opacity="0.36" fill="url(#SVGID_12_)" d="M272.246,361.529c-28.722,19.46-56.346-24.299-57.491-43.314
-	c15.913,13.821,62.032,18.457,75.683-2.517L272.246,361.529z"/>
-<path opacity="0.36" fill="#8A644B" d="M313.706,461.213c-38.167,0-61.231-13.681-61.231-31.63c0-6.048,15.651-24.078,37.32-49.365
-	c5.952-3.699,7.464,10.038,14.958,4.731C331.61,392.044,328.318,461.213,313.706,461.213z"/>
+<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.116c8.339,23.94,32.817,36.466,52.688,36.466v-4.845
-		C294.99,503.737,268.056,493.921,260.464,472.116L260.464,472.116z"/>
+	<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.099,48.222c0.587,1.121,7.021,13.387,7.021,13.387
-		c8.916,16.375,19.02,34.94,19.02,54.406h4.844c0-20.699-10.416-39.839-19.612-56.725l-7.586-14.455l-0.709-0.426
-		C190.509,305.4,180.954,291.289,180.954,271.658L180.954,271.658z"/>
+	<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.108-15.25-3.226-33.651-0.312-49.217l-4.764-0.889
+	<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="191.0591" y1="310.5205" x2="451.5771" y2="310.5205">
+<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.061-31.231
-	c-19.885-28.185-51.072-56.27-108.998-52.618l5.212,140.363c0,0-122.733-25.589-121.021,15.935c0.227,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.863,0.683,25.108,2.467c4.976,2.739-43.139,7.052-34.351,8.757
-	c10.057,1.951,44.474,3.086,57.444,3.086c28.929,0,41.077-25.412,41.077-4.485c7.346,27.893,14.739,59.24,13.972,69.882
-	c-1.475,20.662-19.62,20.188-19.62,20.188l5.089,24.285c-8.557,0.439-6.245-1.324-13.85-0.549
-	c-14.427,0-32.354,13.032-32.354,16.054l39.989,0.435c0,0-29.081,13.771-22.975,22.928c4.763,7.143,20.316,13.378,31.091,13.424
-	c0,0,3.273,8.55,3.273,22.352c0,13.811-4.035,22.565-4.035,22.565c46.171,0,67.49-49.036,80.324-118.446
-	c6.083-32.876,20.018-58.106,36.034-71.657c15.742-13.321,23.008-26.641,23.008-52.071
-	C451.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.848-96.356-46.493-121.312
-	c12.682-16.357,24.611-18.136,40.046-19.238c13.519-0.965,21.294,16.525,27.302,24.271
-	C350.375,162.927,325.395,252.416,325.395,252.416z"/>
-<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="260.7119" y1="113.4033" x2="349.5527" y2="113.4033" gradientTransform="matrix(0.676 0.6564 -0.9247 0.9523 168.3961 -132.5865)">
+<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"/>
@@ -242,10 +242,10 @@
 	<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.283,24.357
-	c-14.513-22.972-12.896-47.545,13.854-75.082c26.74-27.547,64.922-33.847,85.28-14.081
+<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="241.0796" y1="401.8057" x2="241.0796" y2="318.2148">
+<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"/>
@@ -253,27 +253,29 @@
 	<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.274-35.419,42.799-45.106,36.896c0-45.751-17.227-80.21-17.227-80.21
-	S249.882,354.221,272.246,361.529z"/>
-<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="175.4648" y1="345.0176" x2="128.5757" y2="362.0838" gradientTransform="matrix(-1 0 0 1 538.9277 0)">
+<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.35c0,46.27,21.504,44.032,31.073,44.032c7.488-45.135,35.671-81.515,35.671-81.515
-	S381.703,349.045,359.338,356.35z"/>
+<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.503,65.948c0.904,1.702,0.904,4.883,0.904,7.96
-		c-0.005,4.146-0.005,8.432,2.029,11.419c16.157,23.757,31.933,48.809,31.933,70.969c0,32.381-12.818,62.458-37.074,86.969
-		l-0.541,0.549l-0.128,0.748c-12.222,71.899-36.672,150.453-103.765,150.453v1.517c70.499,0,95.847-76.845,108.416-150.456
-		c24.801-25.335,37.935-56.354,37.935-89.78c0-23.537-16.19-49.311-32.774-73.694c-1.153-1.698-1.192-5.061-1.192-8.37
-		c0-0.109,0.004-0.537,0.004-0.646c0-3.567-0.041-7.221-1.469-9.91c-25.237-47.585-56.579-66.125-111.78-66.125V115.089z"/>
+	<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="109.1782" y1="336.3027" x2="170.7935" y2="336.3027">
+	
+		<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"/>
@@ -281,10 +283,10 @@
 		<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.034c9.592-7.823,34.696,4.862,34.833,4.862l26.782-8.396
-		C170.211,334.501,120.246,321.648,109.178,338.034z"/>
+	<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="-102.0645" y1="221.0444" x2="-84.4219" y2="221.0444" gradientTransform="matrix(-0.0113 -0.7169 1.2476 -0.0198 36.6184 302.7065)">
+<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"/>
@@ -293,10 +295,10 @@
 	<stop  offset="0.6917" style="stop-color:#F4D3C7"/>
 	<stop  offset="1" style="stop-color:#F5D4C9"/>
 </linearGradient>
-<path opacity="0.36" fill="url(#SVGID_18_)" d="M313.352,358.852c6.074-0.1,11.045,2.653,11.102,6.149
-	c0.058,3.49-4.829,6.399-10.907,6.498c-6.078,0.101-11.045-2.657-11.107-6.153C302.388,361.854,307.269,358.946,313.352,358.852z"/>
-<path fill="#483218" d="M397.109,309.378c15.699-3.759,26.445-18.402,20.099-27.063c-38.74,19.354-75.295,11.369-85.531,9.147
+<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.118,22.758-117.549,74.944c-6.089,12.999-6.656,32.87,0.638,45.014
-	c0,0,18.604-81.43,108.231-86.494"/>
+<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>
--- a/data/images/add.png
+++ b/data/images/add.png
--- a/data/images/album-icon.png
+++ b/data/images/album-icon.png
--- a/data/images/album-shadow.png
+++ b/data/images/album-shadow.png
--- a/data/images/apply-check.png
+++ b/data/images/apply-check.png
--- a/data/images/artist-icon.png
+++ b/data/images/artist-icon.png
--- a/data/images/back.png
+++ b/data/images/back.png
--- a/data/images/charts.png
+++ b/data/images/charts.png
--- a/data/images/close.png
+++ b/data/images/close.png
--- a/data/images/closed-padlock.png
+++ b/data/images/closed-padlock.png
--- a/data/images/collapse.png
+++ b/data/images/collapse.png
--- a/data/images/cover-shadow.png
+++ b/data/images/cover-shadow.png
--- a/data/images/downloading.png
+++ b/data/images/downloading.png
--- a/data/images/drop-album.png
+++ b/data/images/drop-album.png
--- a/data/images/drop-all-songs.png
+++ b/data/images/drop-all-songs.png
--- a/data/images/drop-local-songs.png
+++ b/data/images/drop-local-songs.png
--- a/data/images/drop-song.png
+++ b/data/images/drop-song.png
--- a/data/images/drop-top-songs.png
+++ b/data/images/drop-top-songs.png
--- a/data/images/filter.png
+++ b/data/images/filter.png
--- a/data/images/forward.png
+++ b/data/images/forward.png
--- a/data/images/headphones-bigger.png
+++ b/data/images/headphones-bigger.png
--- a/data/images/headphones-off.png
+++ b/data/images/headphones-off.png
--- a/data/images/headphones-sidebar.png
+++ b/data/images/headphones-sidebar.png
--- a/data/images/headphones.png
+++ b/data/images/headphones.png
--- a/data/images/itunes.png
+++ b/data/images/itunes.png
--- a/data/images/loading-animation.gif
+++ b/data/images/loading-animation.gif
--- a/data/images/loved_playlist.png
+++ b/data/images/loved_playlist.png
--- a/data/images/no-album-art-placeholder.png
+++ b/data/images/no-album-art-placeholder.png
--- a/data/images/no-album-no-case.png
+++ b/data/images/no-album-no-case.png
--- a/data/images/now-playing-speaker-dark.png
+++ b/data/images/now-playing-speaker-dark.png
--- a/data/images/open-padlock.png
+++ b/data/images/open-padlock.png
--- a/data/images/open.png
+++ b/data/images/open.png
--- a/data/images/private-listening.png
+++ b/data/images/private-listening.png
--- a/data/images/rdio.png
+++ b/data/images/rdio.png
--- a/data/images/recently-played.png
+++ b/data/images/recently-played.png
--- a/data/images/search-icon.png
+++ b/data/images/search-icon.png
--- a/data/images/spotify-logo.png
+++ b/data/images/spotify-logo.png
--- a/data/images/star-hover.png
+++ b/data/images/star-hover.png
--- a/data/images/star-unstarred.png
+++ b/data/images/star-unstarred.png
--- a/data/images/starred.png
+++ b/data/images/starred.png
--- a/data/images/station.png
+++ b/data/images/station.png
--- a/data/images/supercollection.png
+++ b/data/images/supercollection.png
--- a/data/icons/audio-x-generic-16x16.png
+++ b/data/icons/audio-x-generic-16x16.png
--- a/data/icons/audio-x-generic-22x22.png
+++ b/data/icons/audio-x-generic-22x22.png
--- a/data/icons/audio-x-generic-32x32.png
+++ b/data/icons/audio-x-generic-32x32.png
--- a/data/images/track-placeholder.png
+++ b/data/images/track-placeholder.png
--- a/data/images/uploading.png
+++ b/data/images/uploading.png
--- a/data/images/user-avatar.png
+++ b/data/images/user-avatar.png
--- a/data/js/tomahawk.js
+++ b/data/js/tomahawk.js
@@ -2,7 +2,7 @@
 // if run in phantomjs add fake Tomahawk environment
 if(window.Tomahawk === undefined)
 {
-    alert("PHANTOMJS ENVIRONMENT");
+//    alert("PHANTOMJS ENVIRONMENT");
    var Tomahawk = {
        fakeEnv: function()
        {
@@ -91,6 +91,11 @@ var TomahawkResolver = {
        var configJson = JSON.stringify( config );

        window.localStorage[ this.scriptPath() ] = configJson;
+
+        this.newConfigSaved();
+    },
+    newConfigSaved: function()
+    {
    },
    resolve: function( qid, artist, album, title )
    {
@@ -179,6 +184,21 @@ Tomahawk.syncRequest = function(url)
 	}
 };

+Tomahawk.asyncRequest = function(url, callback)
+{
+    var xmlHttpRequest = new XMLHttpRequest();
+    xmlHttpRequest.open('GET', url, true);
+    xmlHttpRequest.onreadystatechange = function() {
+        if (xmlHttpRequest.readyState == 4 && xmlHttpRequest.status == 200) {
+            callback.call(window, xmlHttpRequest);
+        } else if (xmlHttpRequest.readyState === 4) {
+            Tomahawk.log("Failed to do GET request: to: " + url);
+            Tomahawk.log("Status Code was: " + xmlHttpRequest.status);
+        }
+    }
+    xmlHttpRequest.send(null);
+};
+
 /**
 *
 * Secure Hash Algorithm (SHA256)
--- a/data/sql/dbmigrate-26_to_27.sql
+++ b/data/sql/dbmigrate-26_to_27.sql
@@ -0,0 +1,10 @@
+-- Script to migate from db version 26 to 27
+-- Nothing to do
+
+CREATE TABLE IF NOT EXISTS collection_attributes (
+    id INTEGER REFERENCES source(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED, -- source id, null for local source
+    k TEXT NOT NULL,
+    v TEXT NOT NULL
+);
+UPDATE settings SET v = '27' WHERE k == 'schema_version';
+
--- a/data/sql/dbmigrate-27_to_28.sql
+++ b/data/sql/dbmigrate-27_to_28.sql
@@ -0,0 +1,7 @@
+-- Script to migate from db version 27 to 28.
+-- Added albumartist and discnumber to file_join
+
+ALTER TABLE file_join ADD COLUMN composer INTEGER REFERENCES artist(id) ON DELETE CASCADE ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE file_join ADD COLUMN discnumber INTEGER;
+
+UPDATE settings SET v = '28' WHERE k == 'schema_version';
--- a/lang/tomahawk_de.ts
+++ b/lang/tomahawk_de.ts
--- a/lang/tomahawk_en.ts
+++ b/lang/tomahawk_en.ts
--- a/lang/tomahawk_es.ts
+++ b/lang/tomahawk_es.ts
--- a/lang/tomahawk_i18n.qrc
+++ b/lang/tomahawk_i18n.qrc
@@ -1,5 +1,9 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/lang">
+<file>tomahawk_en.qm</file>
 <file>tomahawk_de.qm</file>
+<file>tomahawk_sv.qm</file>
+<file>tomahawk_es.qm</file>
+<file>tomahawk_pt_BR.qm</file>
 </qresource>
 </RCC>
--- a/lang/tomahawk_pl.ts
+++ b/lang/tomahawk_pl.ts
--- a/lang/tomahawk_pt_BR.ts
+++ b/lang/tomahawk_pt_BR.ts
--- a/lang/tomahawk_sv.ts
+++ b/lang/tomahawk_sv.ts
--- a/resources.qrc
+++ b/resources.qrc
@@ -4,7 +4,6 @@
        <file>data/images/avatar-dude.png</file>
        <file>data/images/back-pressed.png</file>
        <file>data/images/back-rest.png</file>
-        <file>data/images/cover-shadow.png</file>
        <file>data/images/filter.png</file>
        <file>data/images/loved.png</file>
        <file>data/images/not-loved.png</file>
@@ -13,6 +12,7 @@
        <file>data/images/track-placeholder.png</file>
        <file>data/images/now-playing-panel.png</file>
        <file>data/images/now-playing-speaker.png</file>
+        <file>data/images/now-playing-speaker-dark.png</file>
        <file>data/images/pause-pressed.png</file>
        <file>data/images/pause-rest.png</file>
        <file>data/images/play-pressed.png</file>
@@ -72,6 +72,7 @@
        <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>
        <file>data/images/supercollection.png</file>
@@ -85,8 +86,19 @@
        <file>data/images/automatic-playlist.png</file>
        <file>data/images/station.png</file>
        <file>data/images/new-additions.png</file>
+        <file>data/images/charts.png</file>
        <file>data/images/loved_playlist.png</file>
        <file>data/images/dashboard.png</file>
+        <file>data/images/artist-icon.png</file>
+        <file>data/images/album-icon.png</file>
+        <file>data/images/search-icon.png</file>
+        <file>data/images/star-hover.png</file>
+        <file>data/images/starred.png</file>
+        <file>data/images/star-unstarred.png</file>
+        <file>data/images/track-icon-22x22.png</file>
+        <file>data/images/track-icon-32x32.png</file>
+        <file>data/images/track-icon-16x16.png</file>
+        <file>data/images/apply-check.png</file>
        <file>data/stylesheets/topbar-radiobuttons.css</file>
        <file>data/icons/tomahawk-icon-16x16.png</file>
        <file>data/icons/tomahawk-icon-32x32.png</file>
@@ -94,9 +106,6 @@
        <file>data/icons/tomahawk-icon-128x128.png</file>
        <file>data/icons/tomahawk-icon-256x256.png</file>
        <file>data/icons/tomahawk-icon-512x512.png</file>
-        <file>data/icons/audio-x-generic-22x22.png</file>
-        <file>data/icons/audio-x-generic-32x32.png</file>
-        <file>data/icons/audio-x-generic-16x16.png</file>
        <file>data/www/auth.html</file>
        <file>data/www/auth.na.html</file>
        <file>data/www/tomahawk_banner_small.png</file>
@@ -104,7 +113,26 @@
        <file>data/sql/dbmigrate-23_to_24.sql</file>
        <file>data/sql/dbmigrate-24_to_25.sql</file>
        <file>data/sql/dbmigrate-25_to_26.sql</file>
+        <file>data/sql/dbmigrate-26_to_27.sql</file>
        <file>data/js/tomahawk.js</file>
        <file>data/images/avatar_frame.png</file>
+        <file>data/images/drop-all-songs.png</file>
+        <file>data/images/drop-local-songs.png</file>
+        <file>data/images/drop-top-songs.png</file>
+        <file>data/images/drop-song.png</file>
+        <file>data/images/drop-album.png</file>
+        <file>data/images/spotify-logo.png</file>
+        <file>data/images/itunes.png</file>
+        <file>data/images/uploading.png</file>
+        <file>data/images/downloading.png</file>
+        <file>data/images/headphones.png</file>
+        <file>data/images/headphones-off.png</file>
+        <file>data/images/headphones-sidebar.png</file>
+        <file>data/images/closed-padlock.png</file>
+        <file>data/images/open-padlock.png</file>
+        <file>data/images/headphones-bigger.png</file>
+        <file>data/images/no-album-no-case.png</file>
+        <file>data/images/rdio.png</file>
+        <file>data/sql/dbmigrate-27_to_28.sql</file>
    </qresource>
 </RCC>
--- a/src/CMakeLists.linux.cmake
+++ b/src/CMakeLists.linux.cmake
@@ -1,15 +1,10 @@
-SET( OS_SPECIFIC_LINK_LIBRARIES
-     ${OS_SPECIFIC_LINK_LIBRARIES}
-     tomahawklib
-)
-
 FILE( GLOB _icons "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" )
 FOREACH( _file ${_icons} )
 STRING( REPLACE "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-" "" _res ${_file} )
 STRING( REPLACE ".png" "" _res ${_res} )
- INSTALL( FILES ${_file} RENAME tomahawk.png DESTINATION share/icons/hicolor/${_res}/apps )
+ INSTALL( FILES ${_file} RENAME tomahawk.png DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${_res}/apps )
 ENDFOREACH( _file )

-INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon.svg RENAME tomahawk.svg  DESTINATION share/icons/hicolor/scalable )
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon.svg RENAME tomahawk.svg  DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps )

-INSTALL( FILES ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.desktop DESTINATION share/applications )
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
--- a/src/CMakeLists.osx.cmake
+++ b/src/CMakeLists.osx.cmake
@@ -1,10 +1,11 @@
-SET( TOMAHAWK_LIBRARIES  tomahawklib )
+SET( TOMAHAWK_LIBRARIES tomahawklib )

 SET( OS_SPECIFIC_LINK_LIBRARIES
    ${OS_SPECIFIC_LINK_LIBRARIES}
    ${COREAUDIO_LIBRARY}
    ${COREFOUNDATION_LIBRARY}

+    crypto
    SPMediaKeyTap

    /System/Library/Frameworks/AppKit.framework
@@ -26,12 +27,15 @@ if (APPLE)
  # Uses Darwin kernel version.
  # 9.8.0  -> 10.5/Leopard
  # 10.4.0 -> 10.6/Snow Leopard
+  # 11.x.x -> Lion
  string(REGEX MATCH "[0-9]+" DARWIN_VERSION ${CMAKE_HOST_SYSTEM_VERSION})
-  if (DARWIN_VERSION GREATER 9)
+  if (DARWIN_VERSION GREATER 10)
+    SET(LION 1)
+  elseif (DARWIN_VERSION GREATER 9)
    SET(SNOW_LEOPARD 1)
  elseif (DARWIN_VERSION GREATER 8)
    SET(LEOPARD 1)
-  endif (DARWIN_VERSION GREATER 9)
+  endif (DARWIN_VERSION GREATER 10)

 # Use two different sparkle update tracks for debug and release
 # We have to change the URL in the Info.plist file :-/
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,8 @@ 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,12 +39,10 @@ ENDIF()
 SET( tomahawkSources ${tomahawkSources}
     web/api_v1.cpp

-     resolvers/scriptresolver.cpp
-     resolvers/qtscriptresolver.cpp
-
     musicscanner.cpp
     shortcuthandler.cpp
     scanmanager.cpp
+     ubuntuunityhack.cpp
     tomahawkapp.cpp
     main.cpp
 )
@@ -57,14 +57,19 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
     sourcetree/sourcesmodel.cpp
     sourcetree/sourcesproxymodel.cpp
     sourcetree/sourcetreeview.cpp
+     sourcetree/sourcedelegate.cpp
+     sourcetree/animationhelper.cpp
     sourcetree/items/sourcetreeitem.cpp
-     sourcetree/items/collectionitem.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

-     transferview.cpp
-     PipelineStatusView.cpp
     tomahawktrayicon.cpp
     audiocontrols.cpp
     settingsdialog.cpp
@@ -75,6 +80,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
     settingslistdelegate.cpp
     resolversmodel.cpp
     tomahawkwindow.cpp
+     LoadXSPFDialog.cpp
 )

 SET( tomahawkHeaders ${tomahawkHeaders}
@@ -82,11 +88,9 @@ SET( tomahawkHeaders ${tomahawkHeaders}

     web/api_v1.h

-     resolvers/scriptresolver.h
-     resolvers/qtscriptresolver.h
-
     musicscanner.h
     scanmanager.h
+     ubuntuunityhack.h
     shortcuthandler.h
 )

@@ -96,19 +100,28 @@ IF(LIBLASTFM_FOUND)
    )
 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/collectionitem.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

-     transferview.h
-     PipelineStatusView.h
     tomahawktrayicon.h
     audiocontrols.h
     settingsdialog.h
@@ -120,6 +133,7 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
     resolversmodel.h
     delegateconfigwrapper.h
     tomahawkwindow.h
+     LoadXSPFDialog.h
 )

 SET( tomahawkUI ${tomahawkUI}
@@ -127,9 +141,11 @@ SET( tomahawkUI ${tomahawkUI}
     diagnosticsdialog.ui
     stackedsettingsdialog.ui
     proxydialog.ui
-     searchbox.ui

     audiocontrols.ui
+
+     GetNewStuffDialog.ui
+     LoadXSPFDialog.ui
 )

 INCLUDE_DIRECTORIES(
@@ -150,6 +166,7 @@ INCLUDE_DIRECTORIES(
    ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/qxtweb
    ${THIRDPARTY_DIR}/qtweetlib/qtweetlib/src
    ${THIRDPARTY_DIR}/qtweetlib/tomahawk-custom
+    ${THIRDPARTY_DIR}/breakpad

    ${TAGLIB_INCLUDES}
    ${PHONON_INCLUDES}
@@ -161,22 +178,21 @@ INCLUDE_DIRECTORIES(
 SET( OS_SPECIFIC_LINK_LIBRARIES "" )

 IF( WIN32 )
-  INCLUDE( "CMakeLists.win32.txt" )
+  INCLUDE( "CMakeLists.win32.cmake" )
 ENDIF( WIN32 )
 IF( UNIX )
-  INCLUDE( "CMakeLists.unix.txt" )
+  INCLUDE( "CMakeLists.unix.cmake" )
 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 )
+    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)
-
 ENDIF( APPLE )

 IF(GLOOX_FOUND)
@@ -186,10 +202,11 @@ IF(GLOOX_FOUND)
 ENDIF(GLOOX_FOUND)
 ADD_SUBDIRECTORY( sip )

-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} )
+IF(QCA2_FOUND)
+    INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
+ENDIF(QCA2_FOUND)

+INCLUDE(GNUInstallDirs)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
               ${CMAKE_CURRENT_BINARY_DIR}/config.h)

@@ -197,13 +214,17 @@ include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )

 SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${tomahawkHeaders} ${trans_outfile})

-IF( "${gui}" STREQUAL "no" )
-ELSE()
+IF( BUILD_GUI )
+    LIST(APPEND tomahawkHeaders ${tomahawkHeadersGui})
+    LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
    qt4_wrap_ui( tomahawkUI_H ${tomahawkUI} )
-    qt4_wrap_cpp( tomahawkMocGui ${tomahawkHeadersGui} )
-    SET( final_src ${final_src} ${tomahawkUI_H} ${tomahawkMocGui} ${tomahawkSourcesGui} ${RC_SRCS} )
 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 )
    ADD_EXECUTABLE( tomahawk ${final_src} )
 ENDIF( UNIX AND NOT APPLE )
@@ -225,8 +246,12 @@ 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} )
+ENDIF(QCA2_FOUND)

 TARGET_LINK_LIBRARIES( tomahawk
+    tomahawk_breakpad
    ${LINK_LIBRARIES}
    ${TOMAHAWK_LIBRARIES}
    ${PHONON_LIBS}
@@ -237,10 +262,8 @@ TARGET_LINK_LIBRARIES( tomahawk
    ${QXTWEB_LIBRARIES}
    ${QJSON_LIBRARIES}
    ${TAGLIB_LIBRARIES}
-    ${CLUCENE_LIBRARIES}
 )

-
 IF( APPLE )
  IF(HAVE_SPARKLE)
    MESSAGE("Sparkle Found, installing framekwork in bundle")
@@ -249,12 +272,12 @@ IF( APPLE )
  ENDIF(HAVE_SPARKLE)
 ENDIF( APPLE )

-INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION bin )
+INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )

-IF( UNIX AND NOT APPLE AND KDE4_INSTALLED ) #install protocol file
+IF( UNIX AND NOT APPLE AND KDE4_INSTALLED AND LEGACY_KDE_INTEGRATION ) #install protocol file
  FILE( READ ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.protocol protocol )
  STRING( REPLACE "/path/to/binary" # match this
-              "${CMAKE_INSTALL_PREFIX}/bin/tomahawk" # this is linux (kde) so pretty safe I think
+              "${CMAKE_INSTALL_FULL_BINDIR}/tomahawk" # this is linux (kde) so pretty safe I think
              edited_protocol # save in this variable
              "${protocol}" # from the contents of this var
          )
@@ -262,7 +285,7 @@ IF( UNIX AND NOT APPLE AND KDE4_INSTALLED ) #install protocol file
  IF( ${SERVICES_INSTALL_DIR} )
    SET( PROTOCOL_INSTALL_DIR ${SERVICES_INSTALL_DIR} )
  ELSE()
-    SET( PROTOCOL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/kde4/services" )
+    SET( PROTOCOL_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/kde4/services" )
  ENDIF()
  INSTALL( FILES ${CMAKE_BINARY_DIR}/tomahawk.protocol DESTINATION ${PROTOCOL_INSTALL_DIR} )
 ENDIF()
--- a/src/CMakeLists.unix.cmake
+++ b/src/CMakeLists.unix.cmake
@@ -4,12 +4,12 @@ ADD_DEFINITIONS( -g )
 ADD_DEFINITIONS( -fno-operator-names )
 ADD_DEFINITIONS( -fPIC )

-SET( QXTWEB_LIBRARIES  qxtweb-standalone )
+SET( QXTWEB_LIBRARIES qxtweb-standalone )

 IF( APPLE )
-    INCLUDE( "CMakeLists.osx.txt" )
+    INCLUDE( "CMakeLists.osx.cmake" )
 ENDIF( APPLE )

 IF( UNIX AND NOT APPLE )
-    INCLUDE( "CMakeLists.linux.txt" )
+    INCLUDE( "CMakeLists.linux.cmake" )
 ENDIF( UNIX AND NOT APPLE )
--- a/src/CMakeLists.win32.cmake
+++ b/src/CMakeLists.win32.cmake
@@ -3,6 +3,7 @@ SET( CMAKE_BUILD_TYPE "Release" )
 ADD_DEFINITIONS( /DNOMINMAX )
 ADD_DEFINITIONS( /DWIN32_LEAN_AND_MEAN )
 ADD_DEFINITIONS( -static-libgcc )
+ADD_DEFINITIONS( -DUNICODE )

 SET( QXTWEB_LIBRARIES  qxtweb-standalone )

--- a/src/GetNewStuffDelegate.cpp
+++ b/src/GetNewStuffDelegate.cpp
@@ -0,0 +1,323 @@
+/* === 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;
+}
--- a/src/GetNewStuffDelegate.h
+++ b/src/GetNewStuffDelegate.h
@@ -0,0 +1,50 @@
+/* === 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
--- a/src/GetNewStuffDialog.cpp
+++ b/src/GetNewStuffDialog.cpp
@@ -0,0 +1,54 @@
+/* === 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;
+}
--- a/src/GetNewStuffDialog.h
+++ b/src/GetNewStuffDialog.h
@@ -0,0 +1,41 @@
+/* === 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/>.
+ */
+
+#ifndef GETNEWSTUFFDIALOG_H
+#define GETNEWSTUFFDIALOG_H
+
+#include <QDialog>
+
+class GetNewStuffModel;
+namespace Ui {
+    class GetNewStuffDialog;
+}
+
+class GetNewStuffDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit GetNewStuffDialog( QWidget *parent = 0, Qt::WindowFlags f = 0 );
+    ~GetNewStuffDialog();
+
+private:
+    Ui::GetNewStuffDialog *ui;
+    GetNewStuffModel* m_model;
+};
+
+#endif // GETNEWSTUFFDIALOG_H
--- a/src/GetNewStuffDialog.ui
+++ b/src/GetNewStuffDialog.ui
@@ -0,0 +1,67 @@
+<?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>
--- a/src/GetNewStuffModel.cpp
+++ b/src/GetNewStuffModel.cpp
@@ -0,0 +1,156 @@
+/* === 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;
+}
--- a/src/GetNewStuffModel.h
+++ b/src/GetNewStuffModel.h
@@ -0,0 +1,64 @@
+/* === 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
--- a/src/LoadXSPFDialog.cpp
+++ b/src/LoadXSPFDialog.cpp
@@ -0,0 +1,61 @@
+/* === 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 "LoadXSPFDialog.h"
+
+#include "ui_LoadXSPFDialog.h"
+#include <QFileDialog>
+
+LoadXSPFDialog::LoadXSPFDialog( QWidget* parent, Qt::WindowFlags f )
+    : QDialog( parent, f )
+    , m_ui( new Ui_LoadXSPF )
+{
+    m_ui->setupUi( this );
+
+#ifdef Q_WS_MAC
+    m_ui->horizontalLayout->setContentsMargins( 0, 0, 0, 0 );
+    m_ui->horizontalLayout->setSpacing( 5 );
+    m_ui->verticalLayout->setContentsMargins( 0, 10, 0, 0 );
+    m_ui->verticalLayout->setSpacing( 0 );
+#endif
+
+    connect( m_ui->navigateButton, SIGNAL( clicked( bool ) ), this, SLOT( getLocalFile() ) );
+}
+
+LoadXSPFDialog::~LoadXSPFDialog()
+{
+}
+
+void
+LoadXSPFDialog::getLocalFile()
+{
+    QString url = QFileDialog::getOpenFileName( this, tr( "Load XSPF File" ), QDir::homePath(), tr( "XSPF Files (*.xspf)" ) );
+    m_ui->lineEdit->setText( url );
+}
+
+QString
+LoadXSPFDialog::xspfUrl() const
+{
+    return m_ui->lineEdit->text();
+}
+
+bool
+LoadXSPFDialog::autoUpdate() const
+{
+    return m_ui->autoUpdate->isChecked();
+}
--- a/src/LoadXSPFDialog.h
+++ b/src/LoadXSPFDialog.h
@@ -0,0 +1,43 @@
+/* === 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 LOADXSPFDIALOG_H
+#define LOADXSPFDIALOG_H
+
+#include <QDialog>
+
+class Ui_LoadXSPF;
+
+class LoadXSPFDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit LoadXSPFDialog( QWidget* parent = 0, Qt::WindowFlags f = 0 );
+    virtual ~LoadXSPFDialog();
+
+    QString xspfUrl() const;
+    bool autoUpdate() const;
+
+public slots:
+    void getLocalFile();
+
+private:
+    Ui_LoadXSPF* m_ui;
+};
+
+#endif // LOADXSPFDIALOG_H
--- a/src/LoadXSPFDialog.ui
+++ b/src/LoadXSPFDialog.ui
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LoadXSPF</class>
+ <widget class="QDialog" name="LoadXSPF">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>444</width>
+    <height>121</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Load XSPF</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Playlist Url</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit">
+       <property name="placeholderText">
+        <string>Enter URL...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="navigateButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QCheckBox" name="autoUpdate">
+     <property name="text">
+      <string>Automatically update</string>
+     </property>
+    </widget>
+   </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>LoadXSPF</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>LoadXSPF</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>
--- a/src/PipelineStatusView.cpp
+++ b/src/PipelineStatusView.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 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
@@ -16,7 +17,7 @@
 *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
 */

-#include "PipelineStatusView.h"
+#include "JobStatusView.h"

 #include <QHeaderView>
 #include <QVBoxLayout>
@@ -28,7 +29,7 @@
 using namespace Tomahawk;


-PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
+JobStatusView::JobStatusView( AnimatedSplitter* parent )
    : AnimatedWidget( parent )
    , m_parent( parent )
 {
@@ -76,7 +77,7 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )


 void
-PipelineStatusView::onPipelineUpdate( const query_ptr& query )
+JobStatusView::onPipelineUpdate( const query_ptr& query )
 {
    QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );

@@ -100,7 +101,7 @@ PipelineStatusView::onPipelineUpdate( const query_ptr& query )


 QSize
-PipelineStatusView::sizeHint() const
+JobStatusView::sizeHint() const
 {
    unsigned int y = 0;
    y += m_tree->header()->height();
--- a/src/PipelineStatusView.h
+++ b/src/PipelineStatusView.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 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
@@ -16,23 +17,24 @@
 *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef PIPELINESTATUSVIEW_H
-#define PIPELINESTATUSVIEW_H
+#ifndef JOBSTATUSVIEW_H
+#define JOBSTATUSVIEW_H

 #include <QTreeWidget>

 #include "typedefs.h"
-#include "utils/animatedsplitter.h"
+#include "widgets/animatedsplitter.h"
+#include "query.h"

 class StreamConnection;

-class PipelineStatusView : public AnimatedWidget
+class JobStatusView : public AnimatedWidget
 {
 Q_OBJECT

 public:
-    explicit PipelineStatusView( AnimatedSplitter* parent );
-    virtual ~PipelineStatusView()
+    explicit JobStatusView( AnimatedSplitter* parent );
+    virtual ~JobStatusView()
    {
    }

@@ -42,8 +44,8 @@ private slots:
    void onPipelineUpdate( const Tomahawk::query_ptr& query = Tomahawk::query_ptr() );

 private:
-    QTreeWidget* m_tree;
+    QTreeView* m_tree;
    AnimatedSplitter* m_parent;
 };

-#endif // TRANSFERVIEW_H
+#endif // JOBSTATUSVIEW_H
--- a/src/audiocontrols.cpp
+++ b/src/audiocontrols.cpp
@@ -19,33 +19,30 @@
 #include "audiocontrols.h"
 #include "ui_audiocontrols.h"

-#include <QNetworkReply>
-#include <QDropEvent>
-#include <QMouseEvent>
+#include <QtNetwork/QNetworkReply>
+#include <QtGui/QDropEvent>
+#include <QtGui/QMouseEvent>

 #include "audio/audioengine.h"
-#include "viewmanager.h"
 #include "playlist/playlistview.h"
 #include "database/database.h"
-#include "database/databasecommand_socialaction.h"
-
-#include "album.h"
-
-#include "utils/imagebutton.h"
+#include "widgets/imagebutton.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
-#include <globalactionmanager.h>
+#include "album.h"
+#include "dropjob.h"
+#include "globalactionmanager.h"
+#include "viewmanager.h"

 using namespace Tomahawk;

-static QString s_acInfoIdentifier = QString( "AUDIOCONTROLS" );
-

 AudioControls::AudioControls( QWidget* parent )
    : QWidget( parent )
    , ui( new Ui::AudioControls )
    , m_repeatMode( PlaylistInterface::NoRepeat )
    , m_shuffled( false )
+    , m_lastSliderCheck( 0 )
 {
    ui->setupUi( this );
    setAcceptDrops( true );
@@ -87,59 +84,26 @@ AudioControls::AudioControls( QWidget* parent )
    ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
    ui->loveButton->setCheckable( true );

+#ifdef Q_WS_MAC
+    ui->ownerLabel->setForegroundRole( QPalette::Text );
+#else
    ui->ownerLabel->setForegroundRole( QPalette::Dark );
+#endif
    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->setFixedHeight( 20 );
    ui->seekSlider->setEnabled( true );
-    ui->seekSlider->setStyleSheet( "QSlider::groove::horizontal {"
-                                   "margin: 5px; border-width: 3px;"
-                                   "border-image: url(" RESPATH "images/seek-slider-bkg.png) 3 3 3 3 stretch stretch;"
-                                   "}"
-
-                                   "QSlider::sub-page:horizontal {"
-                                   "margin: 5px; border-width: 3px;"
-                                   "border-image: url(" RESPATH "images/seek-slider-level.png) 3 3 3 3 stretch stretch;"
-                                   "}"
-
-                                   "QSlider::handle::horizontal {"
-                                   "margin-bottom: -7px; margin-top: -7px;"
-                                   "margin-left: -4px; margin-right: -4px;"
-                                   "height: 17px; width: 16px;"
-                                   "background-image: url(" RESPATH "images/seek-and-volume-knob-rest.png);"
-                                   "background-repeat: no-repeat;"
-                                   "}" );
-
-    ui->volumeSlider->setFixedHeight( 20 );
    ui->volumeSlider->setRange( 0, 100 );
    ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
-    ui->volumeSlider->setStyleSheet( "QSlider::groove::horizontal {"
-                                     "margin: 5px; border-width: 3px;"
-                                     "border-image: url(" RESPATH "images/volume-slider-bkg.png) 3 3 3 3 stretch stretch;"
-                                     "}"

-                                     "QSlider::sub-page:horizontal {"
-                                     "margin: 5px; border-width: 3px;"
-                                     "border-image: url(" RESPATH "images/seek-slider-level.png) 3 3 3 3 stretch stretch;"
-                                     "}"
+    m_phononTickCheckTimer.setSingleShot( true );

-                                     "QSlider::handle::horizontal {"
-                                     "margin-bottom: -7px; margin-top: -7px;"
-                                     "margin-left: -4px; margin-right: -4px;"
-                                     "height: 17px; width: 16px;"
-                                     "background-image: url(" RESPATH "images/seek-and-volume-knob-rest.png);"
-                                     "background-repeat: no-repeat;"
-                                     "}" );
+    m_sliderTimeLine.setCurveShape( QTimeLine::LinearCurve );
+    ui->seekSlider->setTimeLine( &m_sliderTimeLine );

-/*    m_playAction  = new QAction( this );
-    m_pauseAction = new QAction( this );
-    m_prevAction  = new QAction( this );
-    m_nextAction  = new QAction( this );
+    m_defaultCover = QPixmap( RESPATH "images/no-album-no-case.png" ).scaled( ui->coverImage->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );

-    connect( m_playAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( play() ) );
-    connect( m_pauseAction, SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( pause() ) );
-    connect( m_prevAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( previous() ) );
-    connect( m_nextAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( next() ) ); */
+    connect( &m_phononTickCheckTimer, SIGNAL( timeout() ), SLOT( phononTickCheckTimeout() ) );
+    connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );

    connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
    connect( ui->volumeSlider,     SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( setVolume( int ) ) );
@@ -150,8 +114,8 @@ AudioControls::AudioControls( QWidget* parent )
    connect( ui->volumeLowButton,  SIGNAL( clicked() ), AudioEngine::instance(), SLOT( lowerVolume() ) );
    connect( ui->volumeHighButton, SIGNAL( clicked() ), AudioEngine::instance(), SLOT( raiseVolume() ) );

-    connect( ui->playPauseButton,  SIGNAL( clicked() ), this, SIGNAL( playPressed() ) );
-    connect( ui->pauseButton,  SIGNAL( clicked() ), this,     SIGNAL( pausePressed() ) );
+    connect( ui->playPauseButton,  SIGNAL( clicked() ), SIGNAL( playPressed() ) );
+    connect( ui->pauseButton,      SIGNAL( clicked() ), SIGNAL( pausePressed() ) );

    connect( ui->repeatButton,     SIGNAL( clicked() ), SLOT( onRepeatClicked() ) );
    connect( ui->shuffleButton,    SIGNAL( clicked() ), SLOT( onShuffleClicked() ) );
@@ -167,19 +131,10 @@ AudioControls::AudioControls( QWidget* parent )
    connect( AudioEngine::instance(), SIGNAL( paused() ), SLOT( onPlaybackPaused() ) );
    connect( AudioEngine::instance(), SIGNAL( resumed() ), SLOT( onPlaybackResumed() ) );
    connect( AudioEngine::instance(), SIGNAL( stopped() ), SLOT( onPlaybackStopped() ) );
+    connect( AudioEngine::instance(), SIGNAL( seeked( qint64 ) ), SLOT( onPlaybackSeeked( qint64 ) ) );
    connect( AudioEngine::instance(), SIGNAL( timerMilliSeconds( qint64 ) ), SLOT( onPlaybackTimer( qint64 ) ) );
    connect( AudioEngine::instance(), SIGNAL( volumeChanged( int ) ), SLOT( onVolumeChanged( int ) ) );

-    m_defaultCover = QPixmap( RESPATH "images/no-album-art-placeholder.png" )
-                     .scaled( ui->coverImage->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(),
-        SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
-        SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-
-    connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
-
-
    ui->buttonAreaLayout->setSpacing( 0 );
    ui->stackedLayout->setSpacing( 0 );
    ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 );
@@ -214,6 +169,13 @@ AudioControls::changeEvent( QEvent* e )
 }


+void
+AudioControls::phononTickCheckTimeout()
+{
+    onPlaybackTimer( m_lastSliderCheck );
+}
+
+
 void
 AudioControls::onVolumeChanged( int volume )
 {
@@ -226,116 +188,116 @@ AudioControls::onVolumeChanged( int volume )
 void
 AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 {
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
-
-    onPlaybackLoading( result );
-
-    Tomahawk::InfoSystem::InfoCriteriaHash trackInfo;
-    trackInfo["artist"] = result->artist()->name();
-    trackInfo["album"] = result->album()->name();
-
-    Tomahawk::InfoSystem::InfoRequestData requestData;
-    requestData.caller = s_acInfoIdentifier;
-    requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
-    requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo );
-    requestData.customData = QVariantMap();
-
-    Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
-}
-
-
-void
-AudioControls::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
-{
-    if ( requestData.caller != s_acInfoIdentifier || requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
-    {
+    if ( result.isNull() )
        return;
-    }

-    if ( m_currentTrack.isNull() )
-    {
-        tLog() << "Current track is null when trying to apply fetched cover art";
-        return;
-    }
+    if ( m_currentTrack.isNull() || ( !m_currentTrack.isNull() && m_currentTrack.data()->id() != result.data()->id() ) )
+        onPlaybackLoading( result );

-    if ( !output.canConvert< QVariantMap >() )
-    {
-        tDebug( LOGINFO ) << "Cannot convert fetched art from a QByteArray";
-        return;
-    }
+    qint64 duration = AudioEngine::instance()->currentTrackTotalTime();

-    QVariantMap returnedData = output.value< QVariantMap >();
-    const QByteArray ba = returnedData["imgbytes"].toByteArray();
-    if ( ba.length() )
-    {
-        QPixmap pm;
-        pm.loadFromData( ba );
+    if ( duration == -1 )
+        duration = result.data()->duration() * 1000;

-        if ( pm.isNull() )
-            ui->coverImage->setPixmap( m_defaultCover );
-        else
-            ui->coverImage->setPixmap( pm.scaled( ui->coverImage->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
-    }
-}
+    ui->seekSlider->setRange( 0, duration );
+    ui->seekSlider->setValue( 0 );

+    m_phononTickCheckTimer.stop();

-void
-AudioControls::infoSystemFinished( QString target )
-{
-    Q_UNUSED( target );
+    m_sliderTimeLine.stop();
+    m_sliderTimeLine.setDuration( duration );
+    m_sliderTimeLine.setFrameRange( 0, duration );
+    m_sliderTimeLine.setCurrentTime( 0 );
+    m_seekMsecs = -1;
+
+    ui->seekSlider->setVisible( true );
+
+    m_noTimeChange = false;
+    m_lastSliderCheck = 0;
 }


 void
 AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 {
-    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+    if ( !m_currentTrack.isNull() )
+    {
+        disconnect( m_currentTrack->album().data(), SIGNAL( updated() ), this, SLOT( onAlbumCoverUpdated() ) );
+        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( socialActionsLoaded() ), SLOT( onSocialActionsLoaded() ) );

    ui->artistTrackLabel->setResult( result );
    ui->albumLabel->setResult( result );
    ui->ownerLabel->setText( result->friendlySource() );
-    ui->coverImage->setPixmap( m_defaultCover );

+    const QString duration = TomahawkUtils::timeToString( result.data()->duration() );
+    ui->timeLabel->setFixedWidth( ui->timeLabel->fontMetrics().width( QString( duration.length(), QChar( '0' ) ) ) );
    ui->timeLabel->setText( TomahawkUtils::timeToString( 0 ) );
-    ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( result->duration() ) );
-
-    ui->seekSlider->setRange( 0, m_currentTrack->duration() * 1000 );
-    ui->seekSlider->setValue( 0 );
-    ui->seekSlider->setVisible( true );
-
-/*    m_playAction->setEnabled( false );
-    m_pauseAction->setEnabled( true ); */
+    ui->timeLeftLabel->setFixedWidth( ui->timeLeftLabel->fontMetrics().width( QString( duration.length() + 1, QChar( '0' ) ) ) );
+    ui->timeLeftLabel->setText( "-" + duration );

    ui->stackedLayout->setCurrentWidget( ui->pauseButton );

    ui->loveButton->setEnabled( true );
    ui->loveButton->setVisible( true );

-    result->loadSocialActions();
-
-    connect( result.data(), SIGNAL( socialActionsLoaded() ), this, SLOT( socialActionsLoaded() ) );
+    setAlbumCover();
+    setSocialActions();
 }

-void
-AudioControls::socialActionsLoaded()
-{
-    Result* r = qobject_cast< Result* >( sender() );
-    Q_ASSERT( r );

-    if ( m_currentTrack.data() == r )
+void
+AudioControls::onAlbumCoverUpdated()
+{
+    Album* album = qobject_cast< Album* >( sender() );
+    if ( !album || album != m_currentTrack->album().data() )
+        return;
+
+    setAlbumCover();
+}
+
+
+void
+AudioControls::setAlbumCover()
+{
+    if ( !m_currentTrack->album()->cover().isNull() )
    {
-        if ( m_currentTrack->loved() )
-        {
-            ui->loveButton->setPixmap( RESPATH "images/loved.png" );
-            ui->loveButton->setChecked( true );
-        }
-        else
-        {
-            ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
-            ui->loveButton->setChecked( false );
-        }
+        QPixmap cover;
+        cover.loadFromData( m_currentTrack->album()->cover() );
+        ui->coverImage->setPixmap( cover.scaled( ui->coverImage->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
+    }
+    else
+        ui->coverImage->setPixmap( m_defaultCover );
+}
+
+
+void
+AudioControls::onSocialActionsLoaded()
+{
+    Query* query = qobject_cast< Query* >( sender() );
+    if ( !query || query != m_currentTrack->toQuery().data() )
+        return;
+
+    setSocialActions();
+}
+
+
+void
+AudioControls::setSocialActions()
+{
+    if ( m_currentTrack->toQuery()->loved() )
+    {
+        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
+        ui->loveButton->setChecked( true );
+    }
+    else
+    {
+        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+        ui->loveButton->setChecked( false );
    }
 }

@@ -343,26 +305,37 @@ AudioControls::socialActionsLoaded()
 void
 AudioControls::onPlaybackPaused()
 {
-/*    m_pauseAction->setEnabled( false );
-    m_playAction->setEnabled( true ); */
-
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
+    m_sliderTimeLine.setPaused( true );
 }

+
 void
 AudioControls::onPlaybackResumed()
 {
-/*    m_playAction->setEnabled( false );
-    m_pauseAction->setEnabled( true ); */
-
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
    ui->loveButton->setVisible( true );
+    m_sliderTimeLine.resume();
+}
+
+
+void
+AudioControls::onPlaybackSeeked( qint64 msec )
+{
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << " setting current timer to " << msec;
+    m_sliderTimeLine.setPaused( true );
+    m_sliderTimeLine.setCurrentTime( msec );
+    m_lastSliderCheck = msec;
+    m_seekMsecs = msec;
 }


 void
 AudioControls::onPlaybackStopped()
 {
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
    m_currentTrack.clear();

    ui->artistTrackLabel->setText( "" );
@@ -372,28 +345,72 @@ AudioControls::onPlaybackStopped()
    ui->timeLeftLabel->setText( "" );
    ui->coverImage->setPixmap( QPixmap() );
    ui->seekSlider->setVisible( false );
+    m_sliderTimeLine.stop();
+    m_sliderTimeLine.setCurrentTime( 0 );

    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
    ui->loveButton->setEnabled( false );
    ui->loveButton->setVisible( false );
-
-/*    m_pauseAction->setEnabled( false );
-    m_playAction->setEnabled( true ); */
 }


 void
 AudioControls::onPlaybackTimer( qint64 msElapsed )
 {
-    if ( m_currentTrack.isNull() )
+    //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;
+    m_lastSliderCheck = msElapsed;
+
+    if ( m_currentTrack.isNull() )
+    {
+        m_sliderTimeLine.stop();
+        return;
+    }

    ui->seekSlider->blockSignals( true );

+    if ( sender() != &m_phononTickCheckTimer )
+        m_phononTickCheckTimer.start( 1000 );
+
    const int seconds = msElapsed / 1000;
    ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
    ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
-    ui->seekSlider->setValue( msElapsed );
+
+    if ( m_noTimeChange )
+    {
+        if ( m_sliderTimeLine.currentTime() != msElapsed )
+        {
+            m_sliderTimeLine.setPaused( true );
+            m_noTimeChange = false;
+            m_sliderTimeLine.setCurrentTime( msElapsed );
+            m_seekMsecs = -1;
+            m_sliderTimeLine.resume();
+        }
+    }
+    else if ( m_sliderTimeLine.currentTime() >= msElapsed || m_seekMsecs != -1 )
+    {
+        m_sliderTimeLine.setPaused( true );
+
+        m_noTimeChange = false;
+        if ( m_sliderTimeLine.currentTime() == msElapsed )
+            m_noTimeChange = true;
+
+        m_sliderTimeLine.setCurrentTime( msElapsed );
+        m_seekMsecs = -1;
+        if ( AudioEngine::instance()->state() != AudioEngine::Paused && sender() != &m_phononTickCheckTimer )
+            m_sliderTimeLine.resume();
+    }
+    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();
+    }

    ui->seekSlider->blockSignals( false );
 }
@@ -521,7 +538,7 @@ AudioControls::onTrackClicked()
 void
 AudioControls::dragEnterEvent( QDragEnterEvent* e )
 {
-    if ( GlobalActionManager::instance()->acceptsMimeData( e->mimeData() ) )
+    if ( DropJob::acceptsMimeData( e->mimeData() ) )
        e->acceptProposedAction();
 }

@@ -538,10 +555,12 @@ void
 AudioControls::dropEvent( QDropEvent* e )
 {
    tDebug() << "AudioControls got drop:" << e->mimeData()->formats();
-    if ( GlobalActionManager::instance()->acceptsMimeData( e->mimeData() ) )
+    if ( DropJob::acceptsMimeData( e->mimeData() ) )
    {
-        connect( GlobalActionManager::instance(), SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( droppedTracks( QList<Tomahawk::query_ptr> ) ) );
-        GlobalActionManager::instance()->tracksFromMimeData( e->mimeData() );
+        DropJob *dj = new DropJob();
+        dj->setDropAction( DropJob::Append );
+        connect( dj, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( droppedTracks( QList<Tomahawk::query_ptr> ) ) );
+        dj->tracksFromMimeData( e->mimeData() );

        e->accept();
    }
@@ -551,12 +570,10 @@ AudioControls::dropEvent( QDropEvent* e )
 void
 AudioControls::droppedTracks( QList< query_ptr > tracks )
 {
-    disconnect( GlobalActionManager::instance(), SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( droppedTracks( QList<Tomahawk::query_ptr> ) ) );
-
    if ( !tracks.isEmpty() )
    {
-        // queue and play the first if nothign is playing
-        GlobalActionManager::instance()->handleOpenTrack( tracks.first() );
+        // 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++ )
@@ -570,30 +587,17 @@ AudioControls::droppedTracks( QList< query_ptr > tracks )
 void
 AudioControls::onLoveButtonClicked( bool checked )
 {
-    Tomahawk::InfoSystem::InfoCriteriaHash trackInfo;
-    trackInfo["title"] = m_currentTrack->track();
-    trackInfo["artist"] = m_currentTrack->artist()->name();
-    trackInfo["album"] = m_currentTrack->album()->name();
-
    if ( checked )
    {
-        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-            s_acInfoIdentifier, Tomahawk::InfoSystem::InfoLove,
-            QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );
-
-        DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction( m_currentTrack, QString( "Love" ), QString( "true") );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
+
+        m_currentTrack->toQuery()->setLoved( true );
    }
    else
    {
-        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
-            s_acInfoIdentifier, Tomahawk::InfoSystem::InfoUnLove,
-            QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );
-
-        DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction( m_currentTrack, QString( "Love" ), QString( "false" ) );
-        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>(cmd) );
        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+
+        m_currentTrack->toQuery()->setLoved( false );
    }
 }

--- a/src/audiocontrols.h
+++ b/src/audiocontrols.h
@@ -19,15 +19,18 @@
 #ifndef AUDIOCONTROLS_H
 #define AUDIOCONTROLS_H

-#include <QWidget>
+#include <QtGui/QWidget>
+#include <QtCore/QTimer>
+#include <QtCore/QTimeLine>

 #include "result.h"
 #include "playlistinterface.h"
-#include "infosystem/infosystem.h"
+#include "query.h"

 class QDropEvent;
 class QDragEnterEvent;
 class QDragMoveEvent;
+
 namespace Ui
 {
    class AudioControls;
@@ -48,7 +51,7 @@ signals:
 public slots:
    void onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
    void onShuffleModeChanged( bool enabled );
-
+    
 protected:
    void changeEvent( QEvent* e );
    void dragEnterEvent ( QDragEnterEvent* );
@@ -56,10 +59,13 @@ protected:
    void dropEvent ( QDropEvent* );

 private slots:
+    void phononTickCheckTimeout();
+    
    void onPlaybackStarted( const Tomahawk::result_ptr& result );
    void onPlaybackLoading( const Tomahawk::result_ptr& result );
    void onPlaybackPaused();
    void onPlaybackResumed();
+    void onPlaybackSeeked( qint64 msec );
    void onPlaybackStopped();

    void onPlaybackTimer( qint64 msElapsed );
@@ -73,25 +79,29 @@ private slots:
    void onTrackClicked();
    void onLoveButtonClicked( bool );

-    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
-    void infoSystemFinished( QString target );
+    void onAlbumCoverUpdated();

    void droppedTracks( QList<Tomahawk::query_ptr> );

-    void socialActionsLoaded();
-private:
-    Ui::AudioControls *ui;
+    void onSocialActionsLoaded();

-    QAction* m_playAction;
-    QAction* m_pauseAction;
-    QAction* m_prevAction;
-    QAction* m_nextAction;
+private:
+    void setAlbumCover();
+    void setSocialActions();
+
+    Ui::AudioControls *ui;

    QPixmap m_defaultCover;

    Tomahawk::result_ptr m_currentTrack;
    Tomahawk::PlaylistInterface::RepeatMode m_repeatMode;
    bool m_shuffled;
+
+    QTimer m_phononTickCheckTimer;
+    QTimeLine m_sliderTimeLine;
+    qint64 m_seekMsecs;
+    qint64 m_lastSliderCheck;
+    bool m_noTimeChange;
 };

 #endif // AUDIOCONTROLS_H
--- a/src/audiocontrols.ui
+++ b/src/audiocontrols.ui
@@ -28,9 +28,6 @@
    <height>80</height>
   </size>
  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
  <layout class="QHBoxLayout" name="horizontalLayout_4">
   <property name="topMargin">
    <number>0</number>
@@ -164,9 +161,6 @@
          <height>58</height>
         </size>
        </property>
-        <property name="text">
-         <string>TextLabel</string>
-        </property>
        <property name="alignment">
         <set>Qt::AlignCenter</set>
        </property>
@@ -261,21 +255,56 @@
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_2">
            <item>
-             <widget class="ImageButton" name="loveButton">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="cursor">
-               <cursorShape>PointingHandCursor</cursorShape>
+             <widget class="QLabel" name="ownerLabel">
+              <property name="font">
+               <font>
+                <pointsize>7</pointsize>
+               </font>
              </property>
              <property name="text">
-               <string>love</string>
+               <string>Owner</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTop</set>
+              </property>
+              <property name="margin">
+               <number>0</number>
              </property>
             </widget>
            </item>
+            <item>
+             <layout class="QHBoxLayout" name="socialLayout">
+              <item>
+               <spacer name="socialSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>20</width>
+                  <height>1</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="ImageButton" name="loveButton">
+                <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>love</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
            <item>
             <spacer name="verticalSpacer_2">
              <property name="orientation">
@@ -284,31 +313,13 @@
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-                <height>13</height>
+                <height>1</height>
               </size>
              </property>
             </spacer>
            </item>
           </layout>    
          </item>
-          <item>
-           <widget class="QLabel" name="ownerLabel">
-            <property name="font">
-             <font>
-              <pointsize>7</pointsize>
-             </font>
-            </property>
-            <property name="text">
-             <string>Owner</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-            </property>
-            <property name="margin">
-             <number>0</number>
-            </property>
-           </widget>
-          </item>
         </layout>
        </item>
        <item>
@@ -334,10 +345,13 @@
            <property name="text">
             <string>Time</string>
            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeft|Qt::AlignVCenter</set>
+            </property>
           </widget>
          </item>
          <item>
-           <widget class="QSlider" name="seekSlider">
+           <widget class="SeekSlider" name="seekSlider">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -360,6 +374,9 @@
            <property name="text">
             <string>Time Left</string>
            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignVCenter</set>
+            </property>
           </widget>
          </item>
         </layout>
@@ -489,7 +506,7 @@
          </widget>
         </item>
         <item>
-          <widget class="QSlider" name="volumeSlider">
+          <widget class="SeekSlider" name="volumeSlider">
           <property name="minimumSize">
            <size>
             <width>0</width>
@@ -529,15 +546,20 @@
  </layout>
 </widget>
 <customwidgets>
+  <customwidget>
+   <class>SeekSlider</class>
+   <extends>QSlider</extends>
+   <header location="global">widgets/SeekSlider.h</header>
+  </customwidget>
  <customwidget>
   <class>ImageButton</class>
   <extends>QPushButton</extends>
-   <header>utils/imagebutton.h</header>
+   <header>widgets/imagebutton.h</header>
  </customwidget>
  <customwidget>
   <class>QueryLabel</class>
   <extends>QLabel</extends>
-   <header>utils/querylabel.h</header>
+   <header>widgets/querylabel.h</header>
  </customwidget>
 </customwidgets>
 <resources/>
--- a/src/breakpad/BreakPad.cpp
+++ b/src/breakpad/BreakPad.cpp
@@ -0,0 +1,179 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@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 "BreakPad.h"
+
+#include "config.h"
+#include "utils/logger.h"
+
+#include <QCoreApplication>
+#include <QString>
+#include <QFileInfo>
+#include <string.h>
+
+#define CRASH_REPORTER_BINARY "tomahawk_crash_reporter"
+
+bool s_active = true;
+
+#ifndef WIN32
+#include <unistd.h>
+
+
+static bool
+LaunchUploader( const char* dump_dir, const char* minidump_id, void* that, bool succeeded )
+{
+    // DON'T USE THE HEAP!!!
+    // So that indeed means, no QStrings, no qDebug(), no QAnything, seriously!
+
+    if ( !succeeded )
+        return false;
+
+    const char* crashReporter = static_cast<BreakPad*>(that)->crashReporter();
+    if ( !s_active || strlen( crashReporter ) == 0 )
+        return false;
+
+    pid_t pid = fork();
+    if ( pid == -1 ) // fork failed
+        return false;
+    if ( pid == 0 )
+    {
+        // we are the fork
+        execl( crashReporter,
+               crashReporter,
+               dump_dir,
+               minidump_id,
+               minidump_id,
+               (char*) 0 );
+
+        // execl replaces this process, so no more code will be executed
+        // unless it failed. If it failed, then we should return false.
+        printf( "Error: Can't launch CrashReporter!\n" );
+        return false;
+    }
+
+    // we called fork()
+    return true;
+}
+
+
+BreakPad::BreakPad( const QString& path, bool active )
+#ifdef Q_OS_LINUX
+    : google_breakpad::ExceptionHandler( path.toStdString(), 0, LaunchUploader, this, true )
+#else
+    : google_breakpad::ExceptionHandler( path.toStdString(), 0, LaunchUploader, this, true, 0 )
+#endif
+{
+    s_active = active;
+
+    QString reporter;
+    QString localReporter = QString( "%1/%2" ).arg( qApp->applicationDirPath() ).arg( CRASH_REPORTER_BINARY );
+    QString globalReporter = QString( "%1/%2" ).arg( CMAKE_INSTALL_FULL_LIBEXECDIR ).arg( CRASH_REPORTER_BINARY );
+
+    if ( QFileInfo( localReporter ).exists() )
+        reporter = localReporter;
+    else if ( QFileInfo( globalReporter ).exists() )
+        reporter = globalReporter;
+    else
+        tLog() << "Could not find \"" CRASH_REPORTER_BINARY "\" in \"" CMAKE_INSTALL_FULL_LIBEXECDIR "\" or application path";
+
+    char* creporter;
+    std::string sreporter = reporter.toStdString();
+    creporter = new char[ sreporter.size() + 1 ];
+    strcpy( creporter, sreporter.c_str() );
+
+    m_crashReporter = creporter;
+}
+
+
+#else
+
+
+static bool
+LaunchUploader( const wchar_t* dump_dir, const wchar_t* minidump_id, void* that, EXCEPTION_POINTERS *exinfo, MDRawAssertionInfo *assertion, bool succeeded )
+{
+    if ( !succeeded )
+        return false;
+
+    // DON'T USE THE HEAP!!!
+    // So that indeed means, no QStrings, no qDebug(), no QAnything, seriously!
+
+// broken in mingw, hardcode it for now
+
+    //     const char* productName = static_cast<BreakPad*>(that)->productName();s
+    // convert productName to widechars, which sadly means the product name must be Latin1
+
+    wchar_t product_name[ 256 ] = L"tomahawk";;
+
+//     char* out = (char*)product_name;
+//     const char* in = productName - 1;
+//     do {
+//         *out++ = *++in; //latin1 chars fit in first byte of each wchar
+//         *out++ = '\0';  //every second byte is NULL
+//     }
+//     while (*in);
+
+    wchar_t command[MAX_PATH * 3 + 6];
+    wcscpy( command, CRASH_REPORTER_BINARY L" \"" );
+    wcscat( command, dump_dir );
+    wcscat( command, L"\" \"" );
+    wcscat( command, minidump_id );
+    wcscat( command, L"\" \"" );
+    wcscat( command, product_name );
+    wcscat( command, L"\"" );
+
+    STARTUPINFO si;
+    PROCESS_INFORMATION pi;
+
+    ZeroMemory( &si, sizeof( si ) );
+    si.cb = sizeof(si);
+    si.dwFlags = STARTF_USESHOWWINDOW;
+    si.wShowWindow = SW_SHOWNORMAL;
+    ZeroMemory( &pi, sizeof(pi) );
+
+    if ( CreateProcess( NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ) )
+    {
+        CloseHandle( pi.hProcess );
+        CloseHandle( pi.hThread );
+        TerminateProcess( GetCurrentProcess(), 1 );
+    }
+
+    return false;
+}
+
+
+BreakPad::BreakPad( const QString& path, bool active )
+    : google_breakpad::ExceptionHandler( path.toStdWString(), 0, LaunchUploader, this, true )
+{
+    s_active = active;
+}
+
+#endif // WIN32
+
+
+void
+BreakPad::setActive( bool enabled )
+{
+    s_active = enabled;
+}
+
+
+bool
+BreakPad::isActive()
+{
+    return s_active;
+}
--- a/Show More
+++ b/Show More