Stop crashing when changing shown collection in qml

.gitignore

@@ -17,4 +17,3 @@ clang/
 win/
 gcc/
 tags
-.DS_Store

.gitmodules

@@ -0,0 +1,6 @@
+[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

CMakeLists.txt

@@ -15,18 +15,17 @@ SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 4 )
-SET( TOMAHAWK_VERSION_PATCH 1 )
+SET( TOMAHAWK_VERSION_MINOR 2 )
+SET( TOMAHAWK_VERSION_PATCH 99 )
 
 #SET( TOMAHAWK_VERSION_RC 0 )
 
-# enforce proper symbol exporting on all platforms
-add_definitions( "-fvisibility=hidden" )
 
 # build options
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
+option(BUILD_GUI_QML"Build Tomahawk with QML Support" OFF)
+
 
 # generate version string
 
@@ -51,15 +50,13 @@ 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 )
 
@@ -74,15 +71,20 @@ IF( NOT BUILD_GUI )
     MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
 ELSE()
     MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
-    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" )
+    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
 ENDIF()
+IF( BUILD_GUI_QML )
+    MESSAGE( STATUS "Building Tomahawk QML version ***" )
+    LIST(APPEND NEEDED_QT4_COMPONENTS "QtDeclarative" )
+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 the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
+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")
 
 macro_optional_find_package(Phonon 4.5.0)
 macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
@@ -90,8 +92,8 @@ if(PHONON_FOUND)
     message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
-macro_optional_find_package(LibEchonest 1.1.10)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.10 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(LibEchonest 1.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(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -110,50 +112,40 @@ macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
 
-macro_optional_find_package(LibAttica)
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
-
-macro_optional_find_package(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")
-
-
-IF( NOT QuaZip_FOUND )
-    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-    SET( QuaZip_LIBRARY quazip )
-    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
-    SET( QuaZip_FOUND true )
-    macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically. Building internal copy" "http://quazip.sourceforge.net/" FALSE "" "")
-
-    # copy headers to build/quazip so we can use proper includes inside the code
-    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-ENDIF()
-
 # required
 #While we distribute our own liblastfm2, don't need to look for it
 #macro_optional_find_package(LibLastFm 0.3.3)
 #macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
 set(LIBLASTFM_FOUND true)
 
-#### 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")
 
-# 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
+# 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")
 
 ### libportfwd
 SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
@@ -162,8 +154,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)
@@ -213,9 +205,3 @@ ADD_SUBDIRECTORY( src/libtomahawk )
 SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-IF( BUILD_GUI )
-    IF( NOT DISABLE_CRASHREPORTER )
-        ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
-    ENDIF()
-ENDIF()

CMakeModules/FindCLucene.cmake

@@ -2,7 +2,6 @@
 # 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
@@ -13,16 +12,7 @@
 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()
@@ -108,11 +98,8 @@ 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}")
@@ -124,8 +111,7 @@ ELSE(CLucene_FOUND)
 ENDIF(CLucene_FOUND)
 
 MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIRS
-  CLUCENE_INCLUDE_DIR
-  CLUCENE_LIBRARY_DIR
+  CLUCENE_INCLUDE_DIR 
+  CLUCENE_LIBRARY_DIR 
   CLUCENE_LIBRARIES
   )

CMakeModules/FindCLuceneUnstable.cmake

@@ -1,37 +0,0 @@
-# - 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)
-

CMakeModules/FindLibAttica.cmake

@@ -1,63 +0,0 @@
-# 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)

CMakeModules/FindPhonon.cmake

@@ -19,19 +19,53 @@ 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)
 
-# 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})
+if(PHONON_FOUND)
+   # Already found, nothing more to do except figuring out the version
    _phonon_find_version()
-endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+else(PHONON_FOUND)
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FIND_QUIETLY TRUE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR 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)
 
-mark_as_advanced(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)

CMakeModules/FindQuaZip.cmake

@@ -1,11 +0,0 @@
-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()

CMakeModules/FindTaglib.cmake

@@ -56,7 +56,7 @@ ELSE()
 	  include(FindLibraryWithDebug)
 	  include(FindPackageHandleStandardArgs)
 
-	  find_path(TAGLIB_INCLUDES
+	  find_path(TAGLIB_CFLAGS
 		NAMES
 		tag.h
 		PATH_SUFFIXES taglib

CMakeModules/GNUInstallDirs.cmake

@@ -1,182 +0,0 @@
-# - 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()

CMakeModules/NSIS.template.in

@@ -28,8 +28,8 @@
 
 ; We use official release plugins
 ; mingw32-vlc from obs misses a lot and has even broken ones probably
-!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\" ; SIC! ^
-!define VLC_BIN "${VLC_PATH}"
+!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^
+!define VLC_BIN "${VLC_PATH}\bin"
 !define VLC_PLUGIN_PATH "${VLC_BIN}\plugins"
 
 !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
@@ -273,9 +273,6 @@ 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"
@@ -286,9 +283,6 @@ 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"
@@ -305,10 +299,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${QT_DLL_PATH}\QtGui4.dll"
    File "${QT_DLL_PATH}\QtNetwork4.dll"
    File "${QT_DLL_PATH}\QtSql4.dll"
-   File "${QT_DLL_PATH}\QtScript4.dll"
-   File "${QT_DLL_PATH}\QtUiTools4.dll"
-   File "${QT_DLL_PATH}\QtWebKit4.dll"
    File "${QT_DLL_PATH}\QtXml4.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.dll"
 
    ;SQLite driver
    SetOutPath "$INSTDIR\sqldrivers"
@@ -329,17 +321,31 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\libstdc++-6.dll"
 
    ;Phonon stuff
-   File "${MING_BIN}\libphonon.dll"
+
+   ;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"
    SetOutPath "$INSTDIR"
 
    ;VLC
+   ;SetOutPath "$INSTDIR\phonon_backend"
    File "${VLC_BIN}\libvlc.dll"
    File "${VLC_BIN}\libvlccore.dll"
    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"
@@ -350,7 +356,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
 
    File "${MING_BIN}\libechonest.dll"
    File "${MING_BIN}\libQTweetLib.dll"
-   File "${MING_BIN}\libquazip.dll"
 
    ; Jabber
    File "${MING_BIN}\libjreen.dll"
@@ -365,7 +370,6 @@ 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"
@@ -455,8 +459,7 @@ 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 Protocol" ""
+   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
    WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
    WriteRegStr HKCR "tomahawk\shell" "" "open"
    WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'

ChangeLog

@@ -1,164 +1,10 @@
-Version 0.4.1:
-    * Fixed various crashes.
-    * Fixed issues with auto-updating XSPF playlists.
-    * Double-clicking a playlist starts playing it.
-    * Resolvers can now return disc number and album position for results.
-    * Fixed sorting playlists by track number.
-    * Fixed issues with changing proxy.
-    * Fixed Twitter authentication issues.
-    * Fixed Grooveshark support on Windows.
-
-Version 0.4.0:
-    * Added visual notification for database indexing job.
-    * Fixed icons not appearing in resolvers list.
-    * Fixed various UI glitches and stray error messages in stations.
-    * Fixed bug where album page would resolve bottom-to-top.
-    * Fixed bug where Footnotes would not update when changing selected album in Album View.
-    * Fixed dragging albums and artists from charts, album, and artist views.
-    * Fixed bug where filter text would be one step behind filter value.
-    * Fixed bug where resolvers would enable themselves after auto-updating.
-    * Fixed occasional crash when dropping tracks onto New Station item.
-    * Added jump-to-current-track support for search results page. 
-    * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
-    * Fixed non-resolving tracks when dragging from album view.
-    * Fixed /Volumes directory not showing up on OS X.
-    * Fixed fetching album covers for albums with special characters.
-    * Show errors and continue gracefully when resolved audio is not available.
-    * Fixed various crashes on exit.
-    * Added basic command-line options for playback control.
-    * Bumped up web api timeouts to allow web clients to finish resolving.
-    * Added filename suggestion when exporting a playlist.
-    * Cleaned up highlighting of artist names in album view.
-    * Cleaned up alignment of playlist items.
-    * Fixed potential crash when searching.
-    * Added support for disc number.
-    * Added SoundCloudWall.com charts.
-    * Added ability to "lock on" to a user when listening along, to skip along.
-    * Fixed bug where loved tracks would be refreshed much too often.
-    * Fixed startup crash on OS X.
-    * Fixed some font size issues.
-    * Sped up Tomahawk startup by moving chart loading into a separate thread.
-    * Added support for parsing Grooveshark and Tinysong tracks and playlists.
-    * Reorganized sidebar to follow more logical item groupings.
-    * Added artist and album results to global searches.
-    * Fixed style and contrast issues when using GTK styles.
-    * Fixed paths to artwork when using MPRIS2 interface.
- 
-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.
+    * Moved the song queue below to the left, below 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:

README

@@ -27,25 +27,18 @@ 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.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/
-  QuaZip 0.4.3 - http://quazip.sourceforge.net/
-  Jreen 1.0.3 - https://github.com/euroelessar/jreen
-  QTweetLib 0.5.0 - https://github.com/minimoog/QTweetLib
+  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/
 
  Third party libraries that we ship with our source:
 
-  MiniUPnP 1.6 - http://miniupnp.free.fr/
-  liblastfm 0.4.0 - http://github.com/jonocole/liblastfm/
+  MiniUPnP http://miniupnp.free.fr/
+  liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
 
 Enjoy!

admin/CMakeLists.txt

@@ -1,3 +1,3 @@
 IF(WIN32)
     INSTALL(DIRECTORY win DESTINATION share/tomahawk/admin )
-ENDIF(WIN32)
+ENDIF(WIN32)

admin/copy_syms.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-DUMPID=`head -n1 $1 | cut -f4 -d' '`
-mkdir -p $2/$DUMPID
-cp $1 $2/$DUMPID/

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

admin/mac/macdeploy.py

@@ -207,7 +207,7 @@ TOMAHAWK_PLUGINS = [
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.7.4/plugins',
+    '/usr/local/Cellar/qt/4.7.3/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 = []
@@ -491,7 +491,7 @@ def FindVLCPlugin(name):
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../Frameworks/vlc/plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin), '.')
 
 for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
@@ -500,11 +500,6 @@ 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))

admin/unix/tomahawk.desktop

@@ -4,9 +4,8 @@ Version=1.0
 Name=Tomahawk
 GenericName=Music Player
 TryExec=tomahawk
-Exec=tomahawk %u
+Exec=tomahawk
 Comment=Tomahawk - Social Music Player
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -3,12 +3,9 @@ SET(MINGW_PREFIX  "i686-w64-mingw32")
 # this one is important
 SET(CMAKE_SYSTEM_NAME Windows)
 
-
 # specify the cross compiler
 SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
-SET(CMAKE_C_FLAGS "-fno-keep-inline-dllexport")
 SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
-SET(CMAKE_CXX_FLAGS ${CMAKE_C_FLAGS})
 SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
 
 # where is the target environment containing libraries
@@ -18,6 +15,13 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 
 
-# configure qt variables
-SET(QT_LIBRARY_DIR  /usr/${MINGW_PREFIX}/bin)
+
+# libs with broken find modules
+SET(TAGLIB_FOUND true)
+SET(TAGLIB_LIBRARIES  ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
+SET(TAGLIB_INCLUDES   ${CMAKE_FIND_ROOT_PATH}/include/taglib)
+
 SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
+SET(QT_QTUITOOLS_LIBRARY_RELEASE  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
+SET(QT_QTUITOOLS_LIBRARY_DEBUG  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)
+SET(QT_QTUITOOLS_LIBRARY  ${QT_QTUITOOLS_LIBRARY_RELEASE})

admin/win/update-vlc.sh

@@ -1,52 +1,42 @@
 #!/bin/bash
+echo "Remove old vlc dir..."
 
-if [ "$1" = "-c" ] ; then
-echo "Continuing last download.."
-rm -rvf vlc/
-else
-echo "Update archive..."
-fi
+mkdir -p vlc/
+cd vlc/
 
-rm -rvf vlc/
+#rm -vf vlc-*.7z
+#rm -rf vlc/
 
-
-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_phonon-vlc_20111128.7z
-wget -c http://download.tomahawk-player.org/test/pvlc.tar.bz2
+echo "Download specified binary..."
+#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
 
 echo "Extract binary..."
-# 7z x phonon*.7z
-# mv -v vlc-*/ vlc/
-# unzip tomahawk-vlc-0.1.zip
-tar xvjf pvlc.tar.bz2
+7z x phonon-vlc-last.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* \
-#     libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
-#     *qt4* *skins2* libaccess_bd_plugin.dll \
-#     libaudiobargraph_* libball_plugin.dll \
-#     libdirac_plugin.dll \
-#     libgnutls_plugin.dll \
-#     libcaca_plugin.dll \
-#     libfreetype_plugin.dll \
-#     libaccess_output_shout_plugin.dll \
-#     libremoteosd_plugin.dll \
-#     libsdl_image_plugin.dll \
-#     libvout_sdl_plugin.dll \
-#     libpng_plugin.dll \
-#     libgoom_plugin.dll \
-#     libatmo_plugin.dll \
-#     libmux_ts_plugin.dll \
-#     libkate_plugin.dll \
-#     libtaglib_plugin.dll
+echo "Strip unneeded plugins from vlc/plugins..."
+cd prefix/bin/plugins
+rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
+    libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
+    *qt4* *skins2* libaccess_bd_plugin.dll \
+    libaudiobargraph_* libball_plugin.dll \
+    libdirac_plugin.dll \
+    libgnutls_plugin.dll \
+    libcaca_plugin.dll \
+    libfreetype_plugin.dll \
+    libaccess_output_shout_plugin.dll \
+    libremoteosd_plugin.dll \
+    libsdl_image_plugin.dll \
+    libvout_sdl_plugin.dll \
+    libpng_plugin.dll \
+    libgoom_plugin.dll \
+    libatmo_plugin.dll \
+    libmux_ts_plugin.dll \
+    libkate_plugin.dll \
+    libtaglib_plugin.dll
 
 
 # this is for vlc-1.2

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()
         {
@@ -184,21 +184,6 @@ 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)

data/sql/dbmigrate-26_to_27.sql

@@ -1,10 +0,0 @@
--- 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';
-

data/sql/dbmigrate-27_to_28.sql

@@ -1,7 +0,0 @@
--- 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';

lang/tomahawk_i18n.qrc

@@ -1,9 +1,5 @@
 <!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>

resources.qrc

@@ -4,6 +4,7 @@
         <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>
@@ -12,7 +13,6 @@
         <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,7 +72,6 @@
         <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>
@@ -92,13 +91,9 @@
         <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>
@@ -113,7 +108,6 @@
         <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>
@@ -121,20 +115,5 @@
         <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/images/grooveshark.png</file>
-        <file>data/sql/dbmigrate-27_to_28.sql</file>
-        <file>data/images/process-stop.png</file>
     </qresource>
 </RCC>

src/CMakeLists.linux.txt

@@ -1,10 +1,15 @@
+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 ${CMAKE_INSTALL_DATADIR}/icons/hicolor/${_res}/apps )
+ INSTALL( FILES ${_file} RENAME tomahawk.png DESTINATION share/icons/hicolor/${_res}/apps )
 ENDFOREACH( _file )
 
-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}/data/icons/tomahawk-icon.svg RENAME tomahawk.svg  DESTINATION share/icons/hicolor/scalable )
 
-INSTALL( FILES ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+INSTALL( FILES ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.desktop DESTINATION share/applications )

src/CMakeLists.osx.txt

@@ -1,11 +1,10 @@
-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
@@ -27,15 +26,12 @@ 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 10)
-    SET(LION 1)
-  elseif (DARWIN_VERSION GREATER 9)
+  if (DARWIN_VERSION GREATER 9)
     SET(SNOW_LEOPARD 1)
   elseif (DARWIN_VERSION GREATER 8)
     SET(LEOPARD 1)
-  endif (DARWIN_VERSION GREATER 10)
+  endif (DARWIN_VERSION GREATER 9)
 
 # Use two different sparkle update tracks for debug and release
 # We have to change the URL in the Info.plist file :-/
@@ -58,7 +54,4 @@ if (APPLE)
   FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem
     DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources")
 
-  FILE(COPY /usr/bin/SetFile DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS")
-  FILE(COPY /usr/bin/GetFileInfo DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS")
-
 endif (APPLE)

src/CMakeLists.txt

@@ -13,8 +13,6 @@ SET( QT_USE_QTNETWORK TRUE )
 SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
-add_definitions( -DQT_SHAREDPOINTER_TRACK_POINTERS )
-
 INCLUDE( ${QT_USE_FILE} )
 INCLUDE( AddAppIconMacro )
 
@@ -39,10 +37,12 @@ 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
 )
@@ -60,16 +60,14 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      sourcetree/sourcedelegate.cpp
      sourcetree/animationhelper.cpp
      sourcetree/items/sourcetreeitem.cpp
-     sourcetree/items/sourceitem.cpp
+     sourcetree/items/collectionitem.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
@@ -80,7 +78,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      settingslistdelegate.cpp
      resolversmodel.cpp
      tomahawkwindow.cpp
-     LoadXSPFDialog.cpp
+     tomahawkdesktopwindow.cpp
 )
 
 SET( tomahawkHeaders ${tomahawkHeaders}
@@ -88,9 +86,11 @@ SET( tomahawkHeaders ${tomahawkHeaders}
 
      web/api_v1.h
 
+     resolvers/scriptresolver.h
+     resolvers/qtscriptresolver.h
+
      musicscanner.h
      scanmanager.h
-     ubuntuunityhack.h
      shortcuthandler.h
 )
 
@@ -100,12 +100,6 @@ 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
@@ -114,14 +108,14 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      sourcetree/sourcedelegate.h
      sourcetree/animationhelper.h
      sourcetree/items/sourcetreeitem.h
-     sourcetree/items/sourceitem.h
+     sourcetree/items/collectionitem.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
@@ -133,19 +127,16 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      resolversmodel.h
      delegateconfigwrapper.h
      tomahawkwindow.h
-     LoadXSPFDialog.h
+     tomahawkdesktopwindow.h
 )
 
 SET( tomahawkUI ${tomahawkUI}
-     tomahawkwindow.ui
+     tomahawkdesktopwindow.ui
      diagnosticsdialog.ui
      stackedsettingsdialog.ui
      proxydialog.ui
 
      audiocontrols.ui
-
-     GetNewStuffDialog.ui
-     LoadXSPFDialog.ui
 )
 
 INCLUDE_DIRECTORIES(
@@ -166,7 +157,6 @@ 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}
@@ -178,10 +168,10 @@ INCLUDE_DIRECTORIES(
 SET( OS_SPECIFIC_LINK_LIBRARIES "" )
 
 IF( WIN32 )
-  INCLUDE( "CMakeLists.win32.cmake" )
+  INCLUDE( "CMakeLists.win32.txt" )
 ENDIF( WIN32 )
 IF( UNIX )
-  INCLUDE( "CMakeLists.unix.cmake" )
+  INCLUDE( "CMakeLists.unix.txt" )
 ENDIF( UNIX )
 
 IF( APPLE )
@@ -206,7 +196,10 @@ IF(QCA2_FOUND)
     INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} )
 ENDIF(QCA2_FOUND)
 
-INCLUDE(GNUInstallDirs)
+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} )
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 
@@ -214,17 +207,13 @@ include( ${CMAKE_SOURCE_DIR}/lang/translations.cmake )
 
 SET( final_src ${final_src} ${tomahawkMoc} ${tomahawkSources} ${tomahawkHeaders} ${trans_outfile})
 
-IF( BUILD_GUI )
-    LIST(APPEND tomahawkHeaders ${tomahawkHeadersGui})
-    LIST(APPEND tomahawkSources ${tomahawkSourcesGui})
+IF( "${gui}" STREQUAL "no" )
+ELSE()
     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 )
@@ -246,12 +235,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
+SET( tomahawkLinkLibraries
     ${LINK_LIBRARIES}
     ${TOMAHAWK_LIBRARIES}
     ${PHONON_LIBS}
@@ -264,6 +253,13 @@ TARGET_LINK_LIBRARIES( tomahawk
     ${TAGLIB_LIBRARIES}
 )
 
+TARGET_LINK_LIBRARIES( tomahawk ${tomahawkLinkLibraries} )
+
+IF( BUILD_GUI_QML )
+  # sic! add_subdirectory would make it harder to reuse ${final_src}
+  INCLUDE( active/CMakeLists.txt )
+ENDIF()
+
 IF( APPLE )
   IF(HAVE_SPARKLE)
     MESSAGE("Sparkle Found, installing framekwork in bundle")
@@ -272,12 +268,12 @@ IF( APPLE )
   ENDIF(HAVE_SPARKLE)
 ENDIF( APPLE )
 
-INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+INSTALL( TARGETS tomahawk BUNDLE DESTINATION . RUNTIME DESTINATION bin )
 
-IF( UNIX AND NOT APPLE AND KDE4_INSTALLED AND LEGACY_KDE_INTEGRATION ) #install protocol file
+IF( UNIX AND NOT APPLE AND KDE4_INSTALLED ) #install protocol file
   FILE( READ ${CMAKE_SOURCE_DIR}/admin/unix/tomahawk.protocol protocol )
   STRING( REPLACE "/path/to/binary" # match this
-              "${CMAKE_INSTALL_FULL_BINDIR}/tomahawk" # this is linux (kde) so pretty safe I think
+              "${CMAKE_INSTALL_PREFIX}/bin/tomahawk" # this is linux (kde) so pretty safe I think
               edited_protocol # save in this variable
               "${protocol}" # from the contents of this var
           )
@@ -285,7 +281,7 @@ IF( UNIX AND NOT APPLE AND KDE4_INSTALLED AND LEGACY_KDE_INTEGRATION ) #install
   IF( ${SERVICES_INSTALL_DIR} )
     SET( PROTOCOL_INSTALL_DIR ${SERVICES_INSTALL_DIR} )
   ELSE()
-    SET( PROTOCOL_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/kde4/services" )
+    SET( PROTOCOL_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/kde4/services" )
   ENDIF()
   INSTALL( FILES ${CMAKE_BINARY_DIR}/tomahawk.protocol DESTINATION ${PROTOCOL_INSTALL_DIR} )
 ENDIF()

src/CMakeLists.unix.txt

@@ -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.cmake" )
+    INCLUDE( "CMakeLists.osx.txt" )
 ENDIF( APPLE )
 
 IF( UNIX AND NOT APPLE )
-    INCLUDE( "CMakeLists.linux.cmake" )
+    INCLUDE( "CMakeLists.linux.txt" )
 ENDIF( UNIX AND NOT APPLE )

src/CMakeLists.win32.txt

@@ -3,7 +3,6 @@ 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 )
 

src/GetNewStuffDelegate.cpp

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

src/GetNewStuffDelegate.h

@@ -1,50 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GETNEWSTUFFDELEGATE_H
-#define GETNEWSTUFFDELEGATE_H
-
-#include <QStyledItemDelegate>
-
-
-class
-GetNewStuffDelegate : public QStyledItemDelegate
-{
-    Q_OBJECT
-public:
-    explicit GetNewStuffDelegate( QObject* parent = 0 );
-    virtual void paint( QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-    virtual QSize sizeHint( const QStyleOptionViewItem& option, const QModelIndex& index ) const;
-
-signals:
-    void update( const QModelIndex& idx );
-
-protected:
-    virtual bool editorEvent( QEvent* event, QAbstractItemModel* model, const QStyleOptionViewItem& option, const QModelIndex& index );
-
-private:
-    QPixmap m_defaultCover, m_onHoverStar, m_ratingStarPositive, m_ratingStarNegative;
-
-    int m_widestTextWidth;
-    int m_hoveringOver;
-    QPersistentModelIndex m_hoveringItem;
-    mutable QHash< QPair<int, int>, QRect > m_cachedButtonRects;
-    mutable QHash< QPair<int, int>, QRect > m_cachedStarRects;
-};
-
-#endif // GETNEWSTUFFDELEGATE_H

src/GetNewStuffDialog.cpp

@@ -1,54 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "GetNewStuffDialog.h"
-
-#include "ui_GetNewStuffDialog.h"
-#include "GetNewStuffDelegate.h"
-#include "GetNewStuffModel.h"
-
-GetNewStuffDialog::GetNewStuffDialog( QWidget* parent, Qt::WindowFlags f )
-    : QDialog( parent, f )
-    , ui( new Ui::GetNewStuffDialog )
-    , m_model( new GetNewStuffModel( this ) )
-{
-    ui->setupUi( this );
-
-    ui->listView->setModel( m_model );
-    GetNewStuffDelegate* del = new GetNewStuffDelegate( ui->listView );
-    connect( del, SIGNAL( update( QModelIndex ) ), ui->listView, SLOT( update( QModelIndex ) ) );
-    ui->listView->setItemDelegate( del );
-    ui->listView->setVerticalScrollMode( QAbstractItemView::ScrollPerPixel );
-
-    ui->listView->setMouseTracking( true );
-
-    setMinimumSize( 560, 350 );
-
-#ifdef Q_WS_MAC
-    setMaximumSize( 560, 350 );
-    setSizeGripEnabled( false );
-
-    ui->listView->setAttribute( Qt::WA_MacShowFocusRect, false );
-#endif
-}
-
-
-GetNewStuffDialog::~GetNewStuffDialog()
-{
-    delete ui;
-}

src/GetNewStuffDialog.h

@@ -1,41 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#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

src/GetNewStuffDialog.ui

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

src/GetNewStuffModel.cpp

@@ -1,156 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "GetNewStuffModel.h"
-
-#include "utils/tomahawkutils.h"
-#include "utils/logger.h"
-
-#include <QPixmap>
-#include <QUrl>
-#include "AtticaManager.h"
-
-GetNewStuffModel::GetNewStuffModel( QObject* parent )
-    : QAbstractListModel ( parent )
-{
-
-    if ( AtticaManager::instance()->resolversLoaded() )
-        m_contentList = AtticaManager::instance()->resolvers();
-
-    connect( AtticaManager::instance(), SIGNAL( resolversReloaded( Attica::Content::List ) ), this, SLOT( resolversReloaded( Attica::Content::List ) ) );
-    connect( AtticaManager::instance(), SIGNAL( resolverStateChanged( QString ) ), this, SLOT( resolverStateChanged( QString ) ) );
-
-}
-
-GetNewStuffModel::~GetNewStuffModel()
-{
-}
-
-void
-GetNewStuffModel::resolversReloaded( const Attica::Content::List& resolvers )
-{
-    beginResetModel();
-    m_contentList = resolvers;
-    endResetModel();
-}
-
-void
-GetNewStuffModel::resolverStateChanged( const QString& resolverId )
-{
-    for ( int i = 0; i < m_contentList.count(); i++ )
-    {
-        const Attica::Content resolver = m_contentList[ i ];
-        if ( resolver.id() == resolverId )
-        {
-            QModelIndex idx = index( i, 0, QModelIndex() );
-            emit dataChanged( idx, idx );
-        }
-    }
-}
-
-
-QVariant
-GetNewStuffModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() || !hasIndex( index.row(), index.column(), index.parent() ) )
-        return QVariant();
-
-    Attica::Content resolver = m_contentList[ index.row() ];
-    switch ( role )
-    {
-        case Qt::DisplayRole:
-            return resolver.name();
-        case Qt::DecorationRole:
-            return QVariant::fromValue< QPixmap >( AtticaManager::instance()->iconForResolver( resolver ) );
-        case DownloadUrlRole:
-            // TODO
-            return QUrl();
-        case RatingRole:
-            return resolver.rating() / 20; // rating is out of 100
-        case DownloadCounterRole:
-            return resolver.downloads();
-        case VersionRole:
-            return resolver.version();
-        case DescriptionRole:
-            return resolver.description();
-        case TypeRole:
-            return ResolverType;
-        case AuthorRole:
-            return resolver.author();
-        case StateRole:
-            return (int)AtticaManager::instance()->resolverState( resolver );
-        case UserHasRatedRole:
-            return AtticaManager::instance()->userHasRated( resolver );
-    }
-    return QVariant();
-}
-
-int
-GetNewStuffModel::rowCount( const QModelIndex& parent ) const
-{
-    Q_UNUSED( parent );
-    return m_contentList.count();
-}
-
-bool
-GetNewStuffModel::setData( const QModelIndex &index, const QVariant &value, int role )
-{
-    Q_UNUSED( value );
-    if ( !hasIndex( index.row(), index.column(), index.parent() ) )
-        return false;
-
-
-    Attica::Content resolver = m_contentList[ index.row() ];
-    AtticaManager::ResolverState state = AtticaManager::instance()->resolverState( resolver );
-    if ( role == Qt::EditRole )
-    {
-        switch( state )
-        {
-            case AtticaManager::Uninstalled:
-                // install
-                AtticaManager::instance()->installResolver( resolver );
-                break;
-            case AtticaManager::Installing:
-            case AtticaManager::Upgrading:
-                // Do nothing, busy
-                break;
-            case AtticaManager::Installed:
-                // Uninstall
-                AtticaManager::instance()->uninstallResolver( resolver );
-                break;
-            case AtticaManager::NeedsUpgrade:
-                AtticaManager::instance()->upgradeResolver( resolver );
-                break;
-            default:
-                //FIXME -- this handles e.g. Failed
-                break;
-        };
-    } else if ( role == RatingRole )
-    {
-        // For now only allow rating if a resolver is installed!
-        if ( state != AtticaManager::Installed && state != AtticaManager::NeedsUpgrade )
-            return false;
-        if ( AtticaManager::instance()->userHasRated( resolver ) )
-            return false;
-        m_contentList[ index.row() ].setRating( value.toInt() * 20 );
-        AtticaManager::instance()->uploadRating( m_contentList[ index.row() ] );
-    }
-    emit dataChanged( index, index );
-
-    return true;
-}

src/GetNewStuffModel.h

@@ -1,64 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GETNEWSTUFFMODEL_H
-#define GETNEWSTUFFMODEL_H
-
-#include <QModelIndex>
-
-#include <attica/content.h>
-#include <QPixmap>
-
-class GetNewStuffModel: public QAbstractListModel
-{
-    Q_OBJECT
-public:
-    enum NewStuffRoles {
-        // DisplayRole is title
-        // DecorationRole is qicon for item
-        DownloadUrlRole = Qt::UserRole + 1,
-        RatingRole = Qt::UserRole + 2,
-        DownloadCounterRole = Qt::UserRole + 3,
-        VersionRole = Qt::UserRole + 4,
-        DescriptionRole = Qt::UserRole + 5,
-        TypeRole = Qt::UserRole + 6, // Category in attica-speak. What sort of item this is (resolver, etc).
-        AuthorRole = Qt::UserRole + 7,
-        StateRole = Qt::UserRole + 8,
-        UserHasRatedRole = Qt::UserRole + 9
-    };
-
-    enum Types {
-        ResolverType = 0,
-    };
-
-    explicit GetNewStuffModel( QObject* parent = 0 );
-    virtual ~GetNewStuffModel();
-
-    virtual QVariant data( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-    virtual int rowCount( const QModelIndex& parent = QModelIndex() ) const;
-    virtual bool setData( const QModelIndex &index, const QVariant &value, int role );
-
-private slots:
-    void resolversReloaded( const Attica::Content::List& );
-    void resolverStateChanged( const QString& resolverId );
-
-private:
-    Attica::Content::List m_contentList;
-};
-
-#endif // GETNEWSTUFFMODEL_H

src/LoadXSPFDialog.cpp

@@ -1,61 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "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();
-}

src/LoadXSPFDialog.h

@@ -1,43 +0,0 @@
-/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- *
- *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
- *
- *   Tomahawk is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   Tomahawk is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef 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

src/LoadXSPFDialog.ui

@@ -1,102 +0,0 @@
-<?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>

src/PipelineStatusView.cpp

@@ -1,7 +1,6 @@
 /* === 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
@@ -17,7 +16,7 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "JobStatusView.h"
+#include "PipelineStatusView.h"
 
 #include <QHeaderView>
 #include <QVBoxLayout>
@@ -29,7 +28,7 @@
 using namespace Tomahawk;
 
 
-JobStatusView::JobStatusView( AnimatedSplitter* parent )
+PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
     : AnimatedWidget( parent )
     , m_parent( parent )
 {
@@ -77,7 +76,7 @@ JobStatusView::JobStatusView( AnimatedSplitter* parent )
 
 
 void
-JobStatusView::onPipelineUpdate( const query_ptr& query )
+PipelineStatusView::onPipelineUpdate( const query_ptr& query )
 {
     QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );
 
@@ -101,7 +100,7 @@ JobStatusView::onPipelineUpdate( const query_ptr& query )
 
 
 QSize
-JobStatusView::sizeHint() const
+PipelineStatusView::sizeHint() const
 {
     unsigned int y = 0;
     y += m_tree->header()->height();

src/PipelineStatusView.h

@@ -1,7 +1,6 @@
 /* === 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
@@ -17,24 +16,23 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef JOBSTATUSVIEW_H
-#define JOBSTATUSVIEW_H
+#ifndef PIPELINESTATUSVIEW_H
+#define PIPELINESTATUSVIEW_H
 
 #include <QTreeWidget>
 
 #include "typedefs.h"
 #include "widgets/animatedsplitter.h"
-#include "query.h"
 
 class StreamConnection;
 
-class JobStatusView : public AnimatedWidget
+class PipelineStatusView : public AnimatedWidget
 {
 Q_OBJECT
 
 public:
-    explicit JobStatusView( AnimatedSplitter* parent );
-    virtual ~JobStatusView()
+    explicit PipelineStatusView( AnimatedSplitter* parent );
+    virtual ~PipelineStatusView()
     {
     }
 
@@ -44,8 +42,8 @@ private slots:
     void onPipelineUpdate( const Tomahawk::query_ptr& query = Tomahawk::query_ptr() );
 
 private:
-    QTreeView* m_tree;
+    QTreeWidget* m_tree;
     AnimatedSplitter* m_parent;
 };
 
-#endif // JOBSTATUSVIEW_H
+#endif // TRANSFERVIEW_H

src/active/CMakeLists.txt

@@ -0,0 +1,30 @@
+
+
+SET( touchmahawkSources ${final_src} )
+#LIST( REMOVE_ITEM touchmahawkSources "main.cpp"  )
+
+SET( touchmahawkHeaders
+    active/tomahawktouchwindow.h
+)
+
+SET( touchmahawkSources
+    ${touchmahawkSources}
+    active/tomahawktouchwindow.cpp
+
+#   active/main.cpp
+)
+
+
+qt4_wrap_cpp( touchmahawkMoc ${touchmahawkHeaders} )
+
+SET( touchmahawkFinalSources ${touchmahawkMoc} ${touchmahawkSources} )
+SET( touchmahawkLinkLibraries
+  kdeclarative
+  ${tomahawkLinkLibraries}
+) #${QT_QTDECLARATIVE_LIBRARY}
+
+ADD_EXECUTABLE( active-tomahawk ${touchmahawkFinalSources} )
+TARGET_LINK_LIBRARIES( active-tomahawk ${touchmahawkLinkLibraries} )
+SET_TARGET_PROPERTIES( active-tomahawk PROPERTIES COMPILE_FLAGS -DTOUCHMAHAWK )
+INSTALL( TARGETS active-tomahawk DESTINATION bin )
+

src/active/tomahawktouchwindow.cpp

@@ -0,0 +1,134 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <domme@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 "active/tomahawktouchwindow.h"
+
+#include "utils/logger.h"
+#include "audio/audioengine.h"
+#include "globalactionmanager.h"
+#include "sourcesmodel.h"
+#include "items/sourcetreeitem.h"
+#include "items/collectionitem.h"
+#include "viewmanager.h"
+
+
+#include "libtomahawk/playlist/treeproxymodel.h"
+
+#include <QFileSystemWatcher>
+#include <QtDeclarative>
+
+#define QMLGUI "/home/domme/dev/sources/tomahawk-qml"
+
+TomahawkTouchWindow::TomahawkTouchWindow()
+    : m_view(0)
+    , m_currentPlaylistTreeModel(0)
+{
+    QFileSystemWatcher* watcher = new QFileSystemWatcher;
+    watcher->addPath( QMLGUI );
+
+    connect( watcher, SIGNAL( directoryChanged( QString ) ), SLOT( loadQml() ));
+    loadQml();
+
+    setCentralWidget( m_view );
+    setWindowTitle("Touch-ma-hawk");
+}
+
+
+TomahawkTouchWindow::~TomahawkTouchWindow()
+{
+
+}
+
+
+void TomahawkTouchWindow::play(const QModelIndex& index )
+{
+    TreeModelItem* item = m_currentPlaylistTreeModel->sourceModel()->itemFromIndex( m_currentPlaylistTreeModel->mapToSource( index ) );
+    if ( item )
+    {
+        m_currentPlaylistTreeModel->sourceModel()->setCurrentItem( item->index );
+        AudioEngine::instance()->playItem( m_currentPlaylistTreeModel, item->result() );
+    }
+}
+
+
+void TomahawkTouchWindow::activateItem(const QModelIndex& index)
+{
+    tLog() << Q_FUNC_INFO << index;
+    SourceTreeItem* item = qobject_cast< SourceTreeItem* >( s_sourcesModel->data( index, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() );
+    item->activate();
+
+    CollectionItem* collectionItem = qobject_cast< CollectionItem* >( item );
+    if( collectionItem )
+    {
+        tLog() << "Activate collectionItem!";
+        Tomahawk::collection_ptr collection = collectionItem->source()->collection();
+
+        TreeModel* model = ViewManager::instance()->treeModelForCollection( collection );
+        TreeProxyModel* proxyModel = m_modelProxyModels.value( model );
+        if( !proxyModel )
+        {
+            proxyModel = new TreeProxyModel();
+            //m_currentPlaylistTreeModel->setDynamicSortFilter( true );
+            proxyModel->setSourceTreeModel( model );
+            proxyModel->sort(TreeModel::Name, Qt::AscendingOrder );
+            //m_currentPlaylistTreeModel->setShowModes( false );
+            //m_currentPlaylistTreeModel->setSortRole(  );
+        }
+
+        m_currentPlaylistTreeModel = proxyModel;
+        emit currentTreeModelChanged();
+        //m_view->rootContext()->setContextProperty( "currentPlaylistTreeModel", m_currentPlaylistTreeModel );
+    }
+}
+
+
+
+void
+TomahawkTouchWindow::loadQml()
+{
+    tLog() << Q_FUNC_INFO;
+    qmlRegisterType<AudioEngine>("org.tomahawkplayer.qmlcomponents", 1, 0, "AudioEngine");
+    qmlRegisterType<TreeProxyModel>("org.tomahawkplayer.qmlcomponents", 1, 0, "TreeProxyModel");
+
+    if( !m_view )
+    {
+        tLog()<< Q_FUNC_INFO << "create qml view";
+        m_view = new QDeclarativeView;
+        m_view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+        m_view->show();
+    }
+
+    tLog()<< Q_FUNC_INFO << "clear component cache";
+    m_view->engine()->clearComponentCache();
+
+    tLog()<< Q_FUNC_INFO << "set context property";
+    QDeclarativeContext* context = m_view->rootContext();
+
+    tLog()<< Q_FUNC_INFO << "make objects accessible from qml";
+    context->setContextProperty( "touchWindow", this );
+    context->setContextProperty( "audioEngine", AudioEngine::instance() );
+    context->setContextProperty( "globalActionManager", GlobalActionManager::instance() );
+    context->setContextProperty( "sourcesModel", s_sourcesModel );
+
+    // don't start in an undefined state
+    m_currentPlaylistTreeModel = 0;
+    //context->setContextProperty( "currentPlaylistTreeModel", m_currentPlaylistTreeModel );
+
+    tLog()<< Q_FUNC_INFO << "set source";
+    m_view->setSource( QUrl::fromLocalFile( QMLGUI "/main.qml" ) );
+}

src/active/tomahawktouchwindow.h

@@ -0,0 +1,62 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2011, Dominik Schmidt <domme@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/>.
+ */
+
+#ifndef TOMAHAWKTOUCHWINDOW_H
+#define TOMAHAWKTOUCHWINDOW_H
+
+#include "tomahawkwindow.h"
+
+#include <QtDeclarative>
+
+class TomahawkTouchWindow;
+class QFileSystemWatcher;
+class TreeModel;
+class TreeProxyModel;
+
+class TomahawkTouchWindow : public TomahawkWindow
+{
+    Q_OBJECT
+    Q_PROPERTY( TreeProxyModel* currentTreeModel READ currentTreeModel NOTIFY currentTreeModelChanged )
+
+public:
+    TomahawkTouchWindow();
+     ~TomahawkTouchWindow();
+
+
+    Q_INVOKABLE void play( const QModelIndex& index );
+    Q_INVOKABLE void activateItem( const QModelIndex& index );
+
+signals:
+    void currentTreeModelChanged();
+
+private slots:
+    void loadQml();
+
+private:
+    TreeProxyModel* currentTreeModel() { return m_currentPlaylistTreeModel; }
+
+
+    QDeclarativeView* m_view;
+    QFileSystemWatcher* m_watcher;
+
+    TreeProxyModel* m_currentPlaylistTreeModel;
+    QHash< TreeModel*, TreeProxyModel* > m_modelProxyModels;
+};
+
+#endif // TOMAHAWKTOUCHWINDOW_H
+

src/audiocontrols.cpp

@@ -19,13 +19,14 @@
 #include "audiocontrols.h"
 #include "ui_audiocontrols.h"
 
-#include <QtNetwork/QNetworkReply>
-#include <QtGui/QDropEvent>
-#include <QtGui/QMouseEvent>
+#include <QNetworkReply>
+#include <QDropEvent>
+#include <QMouseEvent>
 
 #include "audio/audioengine.h"
 #include "playlist/playlistview.h"
 #include "database/database.h"
+#include "database/databasecommand_socialaction.h"
 #include "widgets/imagebutton.h"
 #include "utils/tomahawkutils.h"
 #include "utils/logger.h"
@@ -36,13 +37,14 @@
 
 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 );
@@ -84,23 +86,16 @@ 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->setEnabled( true );
     ui->volumeSlider->setRange( 0, 100 );
     ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
 
-    m_phononTickCheckTimer.setSingleShot( true );
-
     m_sliderTimeLine.setCurveShape( QTimeLine::LinearCurve );
     ui->seekSlider->setTimeLine( &m_sliderTimeLine );
 
-    connect( &m_phononTickCheckTimer, SIGNAL( timeout() ), SLOT( phononTickCheckTimeout() ) );
     connect( &m_sliderTimeLine,    SIGNAL( frameChanged( int ) ), ui->seekSlider, SLOT( setValue( int ) ) );
 
     connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
@@ -112,8 +107,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() ), SIGNAL( playPressed() ) );
-    connect( ui->pauseButton,      SIGNAL( clicked() ), SIGNAL( pausePressed() ) );
+    connect( ui->playPauseButton,  SIGNAL( clicked() ), this, SIGNAL( playPressed() ) );
+    connect( ui->pauseButton,  SIGNAL( clicked() ), this,     SIGNAL( pausePressed() ) );
 
     connect( ui->repeatButton,     SIGNAL( clicked() ), SLOT( onRepeatClicked() ) );
     connect( ui->shuffleButton,    SIGNAL( clicked() ), SLOT( onShuffleClicked() ) );
@@ -133,6 +128,15 @@ AudioControls::AudioControls( QWidget* parent )
     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 );
@@ -167,13 +171,6 @@ AudioControls::changeEvent( QEvent* e )
 }
 
 
-void
-AudioControls::phononTickCheckTimeout()
-{
-    onPlaybackTimer( m_lastSliderCheck );
-}
-
-
 void
 AudioControls::onVolumeChanged( int volume )
 {
@@ -186,6 +183,8 @@ AudioControls::onVolumeChanged( int volume )
 void
 AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 {
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
+
     if ( result.isNull() )
         return;
 
@@ -200,8 +199,6 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
     ui->seekSlider->setRange( 0, duration );
     ui->seekSlider->setValue( 0 );
 
-    m_phononTickCheckTimer.stop();
-
     m_sliderTimeLine.stop();
     m_sliderTimeLine.setDuration( duration );
     m_sliderTimeLine.setFrameRange( 0, duration );
@@ -210,99 +207,105 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 
     ui->seekSlider->setVisible( true );
 
-    m_noTimeChange = false;
-    m_lastSliderCheck = 0;
+    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 )
+    {
+        return;
+    }
+
+    if ( m_currentTrack.isNull() )
+    {
+        tLog() << "Current track is null when trying to apply fetched cover art";
+        return;
+    }
+
+    if ( !output.canConvert< QVariantMap >() )
+    {
+        tDebug( LOGINFO ) << "Cannot convert fetched art from a QByteArray";
+        return;
+    }
+
+    QVariantMap returnedData = output.value< QVariantMap >();
+    const QByteArray ba = returnedData["imgbytes"].toByteArray();
+    if ( ba.length() )
+    {
+        QPixmap pm;
+        pm.loadFromData( ba );
+
+        if ( pm.isNull() )
+            ui->coverImage->setPixmap( m_defaultCover );
+        else
+            ui->coverImage->setPixmap( pm.scaled( ui->coverImage->size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation ) );
+    }
+}
+
+
+void
+AudioControls::infoSystemFinished( QString target )
+{
+    Q_UNUSED( target );
 }
 
 
 void
 AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 {
-    if ( !m_currentTrack.isNull() )
-    {
-        disconnect( m_currentTrack->album().data(), SIGNAL( updated() ), this, SLOT( onAlbumCoverUpdated() ) );
-        disconnect( m_currentTrack->toQuery().data(), SIGNAL( socialActionsLoaded() ), this, SLOT( onSocialActionsLoaded() ) );
-    }
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     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->setFixedWidth( ui->timeLeftLabel->fontMetrics().width( QString( duration.length() + 1, QChar( '0' ) ) ) );
-    ui->timeLeftLabel->setText( "-" + duration );
-    m_lastTextSecondShown = 0;
+    ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( result.data()->duration() ) );
 
     ui->stackedLayout->setCurrentWidget( ui->pauseButton );
 
     ui->loveButton->setEnabled( true );
     ui->loveButton->setVisible( true );
 
-    setAlbumCover();
-    setSocialActions();
+    result->loadSocialActions();
+
+    connect( result.data(), SIGNAL( socialActionsLoaded() ), this, SLOT( socialActionsLoaded() ) );
 }
 
-
 void
-AudioControls::onAlbumCoverUpdated()
+AudioControls::socialActionsLoaded()
 {
-    Album* album = qobject_cast< Album* >( sender() );
-    if ( !album || album != m_currentTrack->album().data() )
-        return;
+    Result* r = qobject_cast< Result* >( sender() );
+    Q_ASSERT( r );
 
-    setAlbumCover();
-}
-
-
-void
-AudioControls::setAlbumCover()
-{
-    if ( !m_currentTrack->album()->cover( ui->coverImage->size() ).isNull() )
+    if ( m_currentTrack.data() == r )
     {
-        QPixmap cover;
-        cover = m_currentTrack->album()->cover( ui->coverImage->size() );
-        ui->coverImage->setPixmap( cover );
-    }
-    else
-        ui->coverImage->setPixmap( TomahawkUtils::defaultPixmap( TomahawkUtils::DefaultAlbumCover, TomahawkUtils::ScaledCover, ui->coverImage->size() ) );
-}
-
-
-void
-AudioControls::onSocialActionsLoaded()
-{
-    Query* query = qobject_cast< Query* >( sender() );
-    if ( !query || !m_currentTrack || query != m_currentTrack->toQuery().data() )
-        return;
-
-    query_ptr currentQuery = m_currentTrack->toQuery();
-    if ( query->artist() == currentQuery->artist() &&
-         query->track() == currentQuery->track() &&
-         query->album() == currentQuery->album() )
-    {
-        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 );
+        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 );
+        }
     }
 }
 
@@ -315,7 +318,6 @@ AudioControls::onPlaybackPaused()
     m_sliderTimeLine.setPaused( true );
 }
 
-
 void
 AudioControls::onPlaybackResumed()
 {
@@ -332,7 +334,6 @@ 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;
 }
 
@@ -362,58 +363,28 @@ AudioControls::onPlaybackStopped()
 void
 AudioControls::onPlaybackTimer( qint64 msElapsed )
 {
-    const int seconds = msElapsed / 1000;
-    if ( seconds != m_lastTextSecondShown && !m_currentTrack.isNull() )
-    {
-        ui->timeLabel->setText( TomahawkUtils::timeToString( seconds ) );
-        ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( m_currentTrack->duration() - seconds ) );
-        m_lastTextSecondShown = seconds;
-    }
-    
-    //tDebug( LOGEXTRA ) << Q_FUNC_INFO << "msElapsed =" << msElapsed << "and timer current time =" << m_sliderTimeLine.currentTime() << "and m_seekMsecs =" << m_seekMsecs;
-    if ( msElapsed > 0 && msElapsed != m_lastSliderCheck && m_seekMsecs == -1 && msElapsed - 500 < m_lastSliderCheck )
-        return;
-    m_lastSliderCheck = msElapsed;
-
+    //tDebug( LOGEXTRA ) << Q_FUNC_INFO << " msElapsed = " << msElapsed << " and timer current time = " << m_sliderTimeLine.currentTime() << " and m_seekMsecs = " << m_seekMsecs;
     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 ) );
 
-    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 )
+    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 )
+        if ( AudioEngine::instance()->state() != AudioEngine::Paused )
             m_sliderTimeLine.resume();
     }
-    else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning && AudioEngine::instance()->state() == AudioEngine::Playing )
+    else if ( m_sliderTimeLine.duration() > msElapsed && m_sliderTimeLine.state() == QTimeLine::NotRunning )
     {
         ui->seekSlider->setEnabled( AudioEngine::instance()->canSeek() );
-        m_sliderTimeLine.start();
+        m_sliderTimeLine.resume();
     }
     else if ( m_sliderTimeLine.state() == QTimeLine::Paused && AudioEngine::instance()->state() != AudioEngine::Paused )
     {
@@ -567,7 +538,6 @@ AudioControls::dropEvent( QDropEvent* e )
     if ( DropJob::acceptsMimeData( 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() );
 
@@ -581,8 +551,8 @@ AudioControls::droppedTracks( QList< query_ptr > tracks )
 {
     if ( !tracks.isEmpty() )
     {
-        // queue and play the first no matter what
-        GlobalActionManager::instance()->handlePlayTrack( tracks.first() );
+        // queue and play the first if nothign is playing
+        GlobalActionManager::instance()->handleOpenTrack( tracks.first() );
 
         // just queue the rest
         for ( int i = 1; i < tracks.size(); i++ )
@@ -596,17 +566,30 @@ 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 )
     {
-        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
+        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
+            s_acInfoIdentifier, Tomahawk::InfoSystem::InfoLove,
+            QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );
 
-        m_currentTrack->toQuery()->setLoved( true );
+        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" );
     }
     else
     {
-        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+        Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
+            s_acInfoIdentifier, Tomahawk::InfoSystem::InfoUnLove,
+            QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo ) );
 
-        m_currentTrack->toQuery()->setLoved( false );
+        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" );
     }
 }
 

src/audiocontrols.h

@@ -19,18 +19,16 @@
 #ifndef AUDIOCONTROLS_H
 #define AUDIOCONTROLS_H
 
-#include <QtGui/QWidget>
-#include <QtCore/QTimer>
-#include <QtCore/QTimeLine>
+#include <QWidget>
+#include <QTimeLine>
 
 #include "result.h"
 #include "playlistinterface.h"
-#include "query.h"
+#include "infosystem/infosystem.h"
 
 class QDropEvent;
 class QDragEnterEvent;
 class QDragMoveEvent;
-
 namespace Ui
 {
     class AudioControls;
@@ -51,7 +49,7 @@ signals:
 public slots:
     void onRepeatModeChanged( Tomahawk::PlaylistInterface::RepeatMode mode );
     void onShuffleModeChanged( bool enabled );
-    
+
 protected:
     void changeEvent( QEvent* e );
     void dragEnterEvent ( QDragEnterEvent* );
@@ -59,8 +57,6 @@ protected:
     void dropEvent ( QDropEvent* );
 
 private slots:
-    void phononTickCheckTimeout();
-    
     void onPlaybackStarted( const Tomahawk::result_ptr& result );
     void onPlaybackLoading( const Tomahawk::result_ptr& result );
     void onPlaybackPaused();
@@ -79,28 +75,24 @@ private slots:
     void onTrackClicked();
     void onLoveButtonClicked( bool );
 
-    void onAlbumCoverUpdated();
+    void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
+    void infoSystemFinished( QString target );
 
     void droppedTracks( QList<Tomahawk::query_ptr> );
 
-    void onSocialActionsLoaded();
+    void socialActionsLoaded();
 
 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;
-    qint64 m_lastTextSecondShown;
 };
 
 #endif // AUDIOCONTROLS_H

src/audiocontrols.ui

@@ -28,6 +28,9 @@
     <height>80</height>
    </size>
   </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
   <layout class="QHBoxLayout" name="horizontalLayout_4">
    <property name="topMargin">
     <number>0</number>
@@ -161,6 +164,9 @@
           <height>58</height>
          </size>
         </property>
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
         <property name="alignment">
          <set>Qt::AlignCenter</set>
         </property>
@@ -255,56 +261,21 @@
           <item>
            <layout class="QVBoxLayout" name="verticalLayout_2">
             <item>
-             <widget class="QLabel" name="ownerLabel">
-              <property name="font">
-               <font>
-                <pointsize>7</pointsize>
-               </font>
+             <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>Owner</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTop</set>
-              </property>
-              <property name="margin">
-               <number>0</number>
+               <string>love</string>
               </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">
@@ -313,13 +284,31 @@
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
-                <height>1</height>
+                <height>13</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>
@@ -345,9 +334,6 @@
             <property name="text">
              <string>Time</string>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignLeft|Qt::AlignVCenter</set>
-            </property>
            </widget>
           </item>
           <item>
@@ -374,9 +360,6 @@
             <property name="text">
              <string>Time Left</string>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignVCenter</set>
-            </property>
            </widget>
           </item>
          </layout>

src/breakpad/BreakPad.cpp

@@ -1,179 +0,0 @@
-/* === 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;
-}

src/breakpad/BreakPad.h

@@ -1,50 +0,0 @@
-/* === 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 <QString>
-
-#ifdef __APPLE__
-#   include "client/mac/handler/exception_handler.h"
-#elif defined WIN32
-#   include "client/windows/handler/exception_handler.h"
-#elif defined __linux__
-#   include "client/linux/handler/exception_handler.h"
-#endif
-
-class BreakPad : public google_breakpad::ExceptionHandler
-{
-    const char* m_productName; // yes! It MUST be const char[]
-    const char* m_crashReporter; // again, const char[]
-
-public:
-    BreakPad( const QString& dump_write_dirpath, bool active );
-
-    ~BreakPad()
-    {}
-
-    static void setActive( bool enabled );
-    static bool isActive();
-
-    void setProductName( const char* s ) { m_productName = s; };
-    const char* productName() const { return m_productName; }
-
-    void setCrashReporter( const char* s ) { m_crashReporter = s; };
-    const char* crashReporter() const { return m_crashReporter; }
-};
-
-#undef char