Add needed info types

an API key and docs

.gitignore

@@ -1,17 +1,15 @@
-src/accounts/tomahawk
-*-build/*
+qtcreator-build/*
 build/*
 .directory
 *.a
 *.o
 ._*
 *.user
-*.swp
-*.swo
 Makefile*
 moc_*
 *~
 /tomahawk
+thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
 *.kdev4
 *.kate-swp
@@ -20,5 +18,3 @@ win/
 gcc/
 tags
 .DS_Store
-*.autosave
-Doxyfile

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "thirdparty/libcrashreporter-qt"]
-	path = thirdparty/libcrashreporter-qt
-	url = https://github.com/dschmidt/libcrashreporter-qt

.tx/config

@@ -1,5 +1,5 @@
 [main]
-host = https://www.transifex.com
+host = https://www.transifex.net
 
 [tomahawk.tomahawk-master]
 file_filter = lang/tomahawk_<lang>.ts

AUTHORS

@@ -4,19 +4,13 @@ Tomahawk is primarily authored by:
 
 Contributors include:
 
-* Leo Franchi <lfranchi@tomahawk-player.org>
-* Dominik Schmidt <domme@tomahawk-player.org>
-* Jeff Mitchell <jeff@tomahawk-player.org>
-* J Herskowitz <j@tomahawk-player.org>
+* Leo Franchi <lfranchi@kde.org>
+* Dominik Schmidt <dev@dominik-schmidt.de>
+* Jeff Mitchell <mitchell@kde.org>
+* J Herskowitz <jherskow@gmail.com>
 * Alejandro Wainzinger <aikawarazuni@gmail.com>
-* Hugo Lindström <hugo@tomahawk-player.org>
-* Teo Mrnjavac <teo@kde.org>
-* Michael Zanetti <dreadhead@follefuder.org>
-* Christopher Reichert <christopher@tomahawk-player.org>
-* Uwe L. Korn <uwelk@xhochy.com>
-* Patrick von Reth <vonreth@kde.org>
 
 Thanks to:
 
 * Harald Sitter <sitter@kde.org>
-* Syd Lawrence <syd@tomahawk-player.org>
+* Steve Robertson

CMakeLists.txt

@@ -3,16 +3,6 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
 SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 CMAKE_POLICY(SET CMP0017 NEW)
 
-IF ( CMAKE_VERSION VERSION_EQUAL 2.8.12 OR CMAKE_VERSION VERSION_GREATER 2.8.12 )
-CMAKE_POLICY(SET CMP0022 NEW)
-
-# TODO:
-# Update to NEW and fix things up when we can depend on 2.8.12
-CMAKE_POLICY(SET CMP0023 OLD)
-ENDIF()
-
-INCLUDE(CMakeDependentOption)
-
 ###
 ### Tomahawk application info
 ###
@@ -20,119 +10,60 @@ SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
 SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
-IF(APPLE)
-    SET( TOMAHAWK_TARGET_NAME "Tomahawk" )
-ELSE()
-    SET( TOMAHAWK_TARGET_NAME "tomahawk" )
-ENDIF()
-
-IF( WIN32 )
-    SET( TOMAHAWK_SYSTEM "Windows" )
-ELSEIF( APPLE )
-    SET( TOMAHAWK_SYSTEM "OS X" )
-ELSEIF( UNIX )
-    SET( TOMAHAWK_SYSTEM "Linux")
-ELSE()
-    SET( TOMAHAWK_SYSTEM "Uknown Platform, please let the Tomahawk team know, this actually happened" )
-ENDIF()
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 8 )
-SET( TOMAHAWK_VERSION_PATCH 99 )
-SET( TOMAHAWK_VERSION_RC 0 )
+SET( TOMAHAWK_VERSION_MINOR 5 )
+SET( TOMAHAWK_VERSION_PATCH 0 )
 
-SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs da de en el es es_419 fi fr hi_IN hu gl id it ja lt nl pl pt_BR pt_PT ro ru sq sv th tr uk vi zh_CN zh_TW )
-
-# add_definitions is only in the scope of this directory and all directories
-# below it. Tomahawk Libraries and plugins that are built with Tomahawk are
-# not included in out-of-source build so we need to re-add_definitions there.
-macro(tomahawk_add_definitions DEFINITION)
-    add_definitions( ${DEFINITION} )
-    set( TOMAHAWK_DEFINITIONS "${TOMAHAWK_DEFINITIONS} ${DEFINITION}")
-endmacro()
-
-macro(tomahawk_add_cxx_flags FLAGS)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAGS}")
-    set( TOMAHAWK_CXX_FLAGS "${TOMAHAWK_CXX_FLAGS} ${FLAGS}")
-endmacro()
-
-macro(tomahawk_add_c_flags FLAGS)
-    set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAGS}")
-    set( TOMAHAWK_C_FLAGS "${TOMAHAWK_C_FLAGS} ${FLAGS}")
-endmacro()
+#SET( TOMAHAWK_VERSION_RC 0 )
 
 # enforce proper symbol exporting on all platforms
-tomahawk_add_definitions( "-fvisibility=hidden" )
-# enforce using constBegin, constEnd for const-iterators
-tomahawk_add_definitions( "-DQT_STRICT_ITERATORS" )
+add_definitions( "-fvisibility=hidden" )
 
 # build options
-option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-if(BUILD_RELEASE)
-    set(BUILD_NO_RELEASE OFF)
-else()
-    set(BUILD_NO_RELEASE ON)
-endif()
-
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
-option(BUILD_TESTS "Build Tomahawk with unit tests" ${BUILD_NO_RELEASE})
-option(BUILD_TOOLS "Build Tomahawk helper tools" ${BUILD_NO_RELEASE})
-option(BUILD_HATCHET "Build the Hatchet plugin" ON)
-option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 instead of Qt5" OFF)
-
-if(UNIX AND NOT APPLE)
-	set(CRASHREPORTER_ENABLED_BY_DEFAULT OFF)
-else()
-	set(CRASHREPORTER_ENABLED_BY_DEFAULT ON)
-endif()
-option(WITH_CRASHREPORTER "Build with CrashReporter" ${CRASHREPORTER_ENABLED_BY_DEFAULT})
+option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+option(WITH_BREAKPAD "Build with breakpad integration" ON)
+option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
 option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
 option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-option(WITH_KDE4 "Build with support for KDE specific stuff" ON)
 
-# build options for development purposes
-option(SANITIZE_ADDRESS "Enable Address Sanitizer for memory error detection" OFF)
-option(TOMAHAWK_FINEGRAINED_MESSAGES "Enable even more verbose logging (will hurt performance significantly" OFF)
-
-CMAKE_DEPENDENT_OPTION(WITH_UPOWER "Build with support for UPower events" ON
-       "UNIX;NOT APPLE" OFF)
-CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON
-       "UNIX;NOT APPLE" OFF)
-
-IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt")
-    message(STATUS "Build of crashreporter disabled.")
+IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" )
+    message(STATUS "Build of breakpad library disabled on this platform.")
+    SET(WITH_BREAKPAD OFF)
     SET(WITH_CRASHREPORTER OFF)
 ENDIF()
 
+# add definitions based on build options
+IF(WITH_BREAKPAD)
+    message(STATUS "Build with support for breakpad.")
+ENDIF()
+
 # generate version string
 
 # base string used in release and unstable builds
-SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH}")
-SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION_TMP}" )
+SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
 IF( TOMAHAWK_VERSION_RC )
-  SET( TOMAHAWK_VERSION_TMP "${TOMAHAWK_VERSION_TMP}rc${TOMAHAWK_VERSION_RC}")
+  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
 ENDIF()
 
 # additional info for non-release builds
-IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
+IF( NOT BUILD_RELEASE )
     INCLUDE( CMakeDateStamp )
     SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
-    IF( TOMAHAWK_VERSION_DATE GREATER 0 )
-        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}.${TOMAHAWK_VERSION_DATE} )
+    IF( TOMAHAWK_VERSION_DATE GREATER 0)
+        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
     ENDIF()
 
     INCLUDE( CMakeVersionSource )
     IF( CMAKE_VERSION_SOURCE )
-        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}-${CMAKE_VERSION_SOURCE} )
+        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
     ENDIF()
 ENDIF()
 
-# write Tomahawk version to cache
-SET(TOMAHAWK_VERSION "${TOMAHAWK_VERSION_TMP}" CACHE STRING "Tomahawk Version")
-
 
 # set paths
-SET( THIRDPARTY_DIR "${CMAKE_SOURCE_DIR}/thirdparty" )
+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}" )
@@ -143,276 +74,67 @@ INCLUDE( GNUInstallDirs )
 # installer creation
 INCLUDE( TomahawkCPack.cmake )
 
-# deps
+#deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )
-
-if( NOT BUILD_WITH_QT4 )
-    find_package(Qt5Core QUIET)
-    if( Qt5Core_DIR )
-        # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
-        find_package(Qt5Concurrent REQUIRED)
-        find_package(Qt5Svg REQUIRED)
-        find_package(Qt5UiTools REQUIRED)
-        find_package(Qt5WebKitWidgets REQUIRED)
-        find_package(Qt5Widgets REQUIRED)
-        find_package(Qt5Xml REQUIRED)
-        find_package(Qt5X11Extras NO_MODULE)
-
-        if(Qt5X11Extras_FOUND)
-            set(HAVE_X11 TRUE)
-        else()
-            set(HAVE_X11 FALSE)
-        endif()
-
-        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
-
-        if( UNIX AND NOT APPLE )
-            # We need this to find the paths to qdbusxml2cpp and co
-            find_package(Qt5DBus REQUIRED)
-        endif()
-
-	if(APPLE)
-            find_package(Qt5MacExtras REQUIRED)
-	endif()
-
-        if(WIN32)
-            find_package(Qt5WinExtras REQUIRED)
-        endif()
-
-        macro(qt_wrap_ui)
-            qt5_wrap_ui(${ARGN})
-        endmacro()
-
-        macro(qt_add_resources)
-            qt5_add_resources(${ARGN})
-        endmacro()
-
-        find_package(Qt5LinguistTools REQUIRED)
-        macro(qt_add_translation)
-            qt5_add_translation(${ARGN})
-        endmacro()
-
-	if( UNIX AND NOT APPLE )
-            macro(qt_add_dbus_interface)
-                qt5_add_dbus_interface(${ARGN})
-            endmacro()
-
-            macro(qt_add_dbus_adaptor)
-                qt5_add_dbus_adaptor(${ARGN})
-            endmacro()
-	endif()
-
-        macro(setup_qt)
-        endmacro()
-
-        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-        #FIXME: CrashReporter depends on deprecated QHttp
-        set(WITH_KDE4 OFF)
-    endif()
-endif()
-if( NOT Qt5Core_DIR )
-    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-    if( BUILD_GUI )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
-    endif()
-    if( BUILD_TESTS )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
-    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-project.org" 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(qt5_use_modules)
-    endmacro()
-
-    macro(qt_wrap_ui)
-        qt4_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt4_add_resources(${ARGN})
-    endmacro()
-
-    macro(qt_add_translation)
-        qt4_add_translation(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_interface)
-      qt4_add_dbus_interface(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_adaptor)
-        qt4_add_dbus_adaptor(${ARGN})
-    endmacro()
-
-    macro(setup_qt)
-        if( NOT BUILD_GUI )
-            set(QT_DONT_USE_QTGUI TRUE)
-        endif()
-        if( UNIX AND NOT APPLE )
-            set(QT_USE_QTDBUS TRUE)
-        endif()
-        set(QT_USE_QTSQL TRUE)
-        set(QT_USE_QTNETWORK TRUE)
-        set(QT_USE_QTXML TRUE)
-        set(QT_USE_QTWEBKIT TRUE)
-
-        include( ${QT_USE_FILE} )
-    endmacro()
-
-    # Qt5 C++11 Macros not defined within Qt4
-    # TODO: Add C++11 support
-    tomahawk_add_definitions( "-DQ_DECL_FINAL=" )
-    tomahawk_add_definitions( "-DQ_DECL_OVERRIDE=" )
-endif()
-
-if( Qt5Core_DIR )
-    set( TOMAHAWK_QT5_TMP TRUE)
-else( Qt5Core_DIR )
-    set( TOMAHAWK_QT5_TMP FALSE )
-endif( Qt5Core_DIR )
-set( TOMAHAWK_QT5 ${TOMAHAWK_QT5_TMP} CACHE BOOL "Build Tomahawk with Qt5")
-
-
-if( BUILD_GUI AND UNIX AND NOT APPLE )
-    macro_optional_find_package( X11 )
-    macro_log_feature(X11_FOUND "X11" "The Xorg libraries" "http://www.x.org/wiki/" TRUE "" "Xorg libraries are used by libqnetwm to bring windows to front reliably")
-endif()
-
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag( "-std=c++11" CXX11_FOUND )
-check_cxx_compiler_flag( "-std=c++0x" CXX0X_FOUND )
-check_cxx_compiler_flag( "-stdlib=libc++" LIBCPP_FOUND )
-if(CXX11_FOUND)
-    tomahawk_add_cxx_flags( "-std=c++11" )
-elseif(CXX0X_FOUND)
-    tomahawk_add_cxx_flags( "-std=c++0x" )
-else()
-    message(STATUS "${CMAKE_CXX_COMPILER} does not support C++11, please use a
-    different compiler")
-endif()
-if(LIBCPP_FOUND AND APPLE)
-    tomahawk_add_cxx_flags( "-stdlib=libc++" )
-endif()
-
-
-macro_optional_find_package(Echonest 2.2.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem")
-
-find_package(Boost REQUIRED COMPONENTS filesystem system)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
-
-macro_optional_find_package(Lucene++ 3.0.0)
-macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
-
-if( NOT TOMAHAWK_QT5 )
-    macro_optional_find_package(QJSON 0.8.1)
-    macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+# Check if we need qtgui:
+SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
+IF( NOT BUILD_GUI )
+    ADD_DEFINITIONS( -DENABLE_HEADLESS )
+    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" )
 ENDIF()
 
-macro_optional_find_package(Taglib 1.8.0)
+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_optional_find_package(Phonon 4.5.0)
+macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
+if(PHONON_FOUND)
+    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+endif()
+
+macro_optional_find_package(LibEchonest 1.2.1)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.2.1 is needed for dynamic playlists and the infosystem")
+
+macro_optional_find_package(CLucene 0.9.23)
+macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
+
+macro_optional_find_package(QJSON)
+macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+
+macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 
-macro_optional_find_package(Sparsehash)
-macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
-    "An extremely memory-efficient hash_map implementation."
-    "https://code.google.com/p/sparsehash/" TRUE ""
-    "Sparsehash is needed for reading metadata of mediastreams and fast
-    forward/backward seeking in HTTP streams")
+macro_optional_find_package(Boost)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
 
-macro_optional_find_package(GnuTLS)
-macro_log_feature(GNUTLS_FOUND "GnuTLS"
-    "GnuTLS is a secure communications library implementing the SSL, TLS and DTLS protocols and technologies around them."
-    "http://gnutls.org/" TRUE ""
-    "GnuTLS is needed for serving the Playdar/HTTP API via TLS")
+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 "" "")
 
-if( TOMAHAWK_QT5 )
-  macro_optional_find_package(Qca-qt5)
-  if(Qca-qt5_DIR)
-      set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
-      set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
-  endif()
-else()
-  macro_optional_find_package(QCA2)
-endif()
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
-
-if( TOMAHAWK_QT5 )
-    macro_optional_find_package(KF5Attica 1.0.0)
-    set(LIBATTICA_FOUND ${KF5Attica_FOUND})
-else()
-    macro_optional_find_package(LibAttica 0.4.0)
-endif()
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "http://download.kde.org/stable/attica/" TRUE "" "")
+macro_optional_find_package(LibAttica 0.4.0)
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
 
 macro_optional_find_package(QuaZip)
-macro_log_feature(QUAZIP_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
+macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
 
 macro_optional_find_package(Jreen 1.0.5)
 macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
-if( PC_JREEN_VERSION STREQUAL "1.1.0" )
-    message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
-endif()
+
+macro_optional_find_package(QTweetLib)
+macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin.\n")
 
 macro_optional_find_package(LibLastFm 1.0.0)
-macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-
-if( NOT APPLE )
-if( TOMAHAWK_QT5 )
-    macro_optional_find_package(Qt5Keychain 0.1.0)
-else()
-    macro_optional_find_package(QtKeychain 0.1.0)
-endif()
-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
-endif()
-
-if( UNIX AND NOT APPLE )
-    macro_optional_find_package(TelepathyQt 0.9.3)
-    if ( TOMAHAWK_QT5 )
-        macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
-    else ( TOMAHAWK_QT5)
-        macro_log_feature(TelepathyQt4_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
-    endif()
-endif()
-
-# we need pthreads too
-macro_optional_find_package(Threads)
-macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
-
-### QtSparkle
-if( WIN32 )
-    macro_optional_find_package(QtSparkle)
-    macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
-endif( WIN32 )
-
-if( WIN32 OR APPLE )
-if( TOMAHAWK_QT5 )
-    macro_optional_find_package(LibsnoreQt5 QUIET)
-else()
-    macro_optional_find_package(Libsnore QUIET)
-endif()
-    macro_log_feature(LIBSNORE_FOUND "Libsnore" "Library for notifications" "https://github.com/TheOneRing/Snorenotify" FALSE "" "")
-endif()
-
-find_package(LIBVLC REQUIRED 2.1.0)
-macro_log_feature(LIBVLC_FOUND "LibVLC" "Provides audio output" "https://www.videolan.org/vlc/"  TRUE "" "")
-
-set(QXTWEB_FOUND TRUE)
-set(QXTWEB_LIBRARIES qxtweb-standalone)
-set(QXTWEB_INCLUDE_DIRS ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/web ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/network ${THIRDPARTY_DIR}/qxt/qxtweb-standalone/core ${CMAKE_CURRENT_BINARY_DIR})
-
-### libportfwd
-set(LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include)
-set(LIBPORTFWD_LIBRARY tomahawk_portfwd)
-set(LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY})
-add_subdirectory(${THIRDPARTY_DIR}/libportfwd)
+macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/eartle/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
 
 #### submodules start
 # automatically init submodules here, don't delete this code we may add submodules again
@@ -428,14 +150,24 @@ add_subdirectory(${THIRDPARTY_DIR}/libportfwd)
 
 #### submodules end
 
+### libportfwd
+SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
+SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
+SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
+ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
-if (WITH_KDE4)
-    macro_optional_find_package(KDE4)
-    macro_optional_find_package(KDE4Installed)
-endif(WITH_KDE4)
-macro_log_feature(KDE4_FOUND "KDE4" "Provides support for configuring Telepathy Accounts from inside Tomahawk" "https://www.kde.org" FALSE "" "")
+# we need pthreads too
+#macro_optional_find_package(Threads)
+#macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
 
-IF( KDE4_FOUND )
+macro_optional_find_package(KDE4)
+macro_optional_find_package(KDE4Installed)
+
+# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
+# for future kde integration
+
+# macro_optional_find_package(KDE4)
+IF(KDE4_FOUND)
     IF( CMAKE_C_FLAGS )
         # KDE4 adds and removes some compiler flags that we don't like
         # (only for gcc not for clang e.g.)
@@ -446,6 +178,10 @@ ELSE()
     SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
 ENDIF()
 
+IF( WIN32 )
+  find_library(QTSPARKLE_LIBRARIES qtsparkle)
+ENDIF( WIN32 )
+
 #show dep log
 macro_display_feature_log()
 
@@ -457,78 +193,18 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-# KDE4 defines an uninstall target for us automatically (and at least with Qt4 Phonon does as well no matter if kdelibs was found)
-# IF( NOT KDE4_FOUND )
-#     ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-# ENDIF()
+# KDE4 defines an uninstall target for us automatically
+IF( NOT KDE4_FOUND )
+    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ENDIF()
 
-IF( ( NOT APPLE ) AND ( NOT SANITIZE_ADDRESS ))
+IF( NOT APPLE )
     # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
-    #
-    # On using Address Sanitizer, we cannot link to the ASAN lib, so
-    # --no-undefined would break the build.
-    SET( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
-    SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-undefined" )
-ENDIF()
-
-IF ( SANITIZE_ADDRESS )
-    SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
-    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}   -fsanitize=address -fno-omit-frame-pointer")
-ENDIF()
-
-# Early configure these files as we need them later on
-configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @ONLY)
-file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-
-SET( TOMAHAWK_LIBRARIES tomahawklib )
-SET( TOMAHAWK_WIDGETS_LIBRARIES tomahawk-widgets )
-SET( TOMAHAWK_PLAYDARAPI_LIBRARIES tomahawk-playdarapi )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
+ENDIF( NOT APPLE )
 
 ADD_SUBDIRECTORY( thirdparty )
+ADD_SUBDIRECTORY( src/libtomahawk )
+SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-IF(BUILD_TESTS)
-  enable_testing()
-  ADD_SUBDIRECTORY( src/tests )
-ENDIF()
-
-# Add all targets to the build-tree export set
-set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH  "Installation directory for CMake files")
-set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
-export(TARGETS tomahawklib
-  FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
-
-# Export the package for use from the build-tree
-# (this registers the build-tree with a global CMake-registry)
-export(PACKAGE Tomahawk)
-
-# Create a TomahawkBuildTreeSettings.cmake file for the use from the build tree
-configure_file(TomahawkBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/TomahawkBuildTreeSettings.cmake" @ONLY)
-
-# Create the TomahawkConfig.cmake and TomahawkConfigVersion files
-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-
-configure_file(TomahawkConfig.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake" @ONLY)
-configure_file(TomahawkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake" @ONLY)
-
-# Install the cmake files
-install(
-    FILES
-        "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkUse.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkAddPlugin.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkAddLibrary.cmake"
-    DESTINATION
-        "${CMAKE_INSTALL_CMAKEDIR}"
-)
-
-# Install the export set for use with the install-tree
-install(
-    EXPORT
-        TomahawkLibraryDepends
-    DESTINATION
-        "${CMAKE_INSTALL_CMAKEDIR}"
-)

CMakeModules/AddAppIconMacro.cmake

@@ -12,8 +12,8 @@ SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
 
 # adds application icon to target source list 
 # for detailed documentation see the top of FindKDE4Internal.cmake
-macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
-    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${outfilename})
+macro (KDE4_ADD_APP_ICON appsources pattern)
+    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
 
     if (WIN32)
         if(NOT WINCE)
@@ -69,7 +69,7 @@ macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
             message(STATUS "Unable to find the png2ico or windres utilities - application will not have an application icon!")
         endif(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
     endif(WIN32)
-    if (APPLE)
+    if (Q_WS_MAC)
         # first convert image to a tiff using the Mac OS X "sips" utility,
         # then use tiff2icns to convert to an icon
         find_program(SIPS_EXECUTABLE NAMES sips)
@@ -86,9 +86,9 @@ macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
             if (_icon)
                 
                 # first, get the basename of our app icon
-                add_custom_command(OUTPUT ${_outfilename}.icns ${_outfilename}.tiff
-                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${_outfilename}.tiff
-                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${_outfilename}.tiff ${_outfilename}.icns
+                add_custom_command(OUTPUT ${_outfilename}.icns ${outfilename}.tiff
+                                   COMMAND ${SIPS_EXECUTABLE} -s format tiff ${_icon} --out ${outfilename}.tiff
+                                   COMMAND ${TIFF2ICNS_EXECUTABLE} ${outfilename}.tiff ${_outfilename}.icns
                                    DEPENDS ${_icon}
                                    )
 
@@ -110,5 +110,5 @@ macro (TOMAHAWK_ADD_APP_ICON appsources outfilename pattern)
         else(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
             message(STATUS "Unable to find the sips and tiff2icns utilities - application will not have an application icon!")
         endif(SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
-    endif(APPLE)
-endmacro (TOMAHAWK_ADD_APP_ICON)
+    endif(Q_WS_MAC)
+endmacro (KDE4_ADD_APP_ICON)

CMakeModules/AddTomahawkPlugin.cmake

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

CMakeModules/COPYING-CMAKE-SCRIPTS

@@ -1,22 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

CMakeModules/FindCLucene.cmake

@@ -0,0 +1,131 @@
+#
+# 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
+# CLUCENE_VERSION      = The CLucene version string
+# CLucene_FOUND        = set to 1 if clucene is found
+#
+
+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()
+  SET(CLUCENE_MIN_VERSION "0.9.23")
+ENDIF(CLucene_FIND_VERSION)
+
+IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+  INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
+ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
+
+SET(TRIAL_LIBRARY_PATHS
+  $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
+  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
+  /usr/local/lib${LIB_SUFFIX}
+  /usr/lib${LIB_SUFFIX}
+  /sw/lib${LIB_SUFFIX}
+  /usr/pkg/lib${LIB_SUFFIX}
+  /usr/lib64
+  )
+SET(TRIAL_INCLUDE_PATHS
+  $ENV{CLUCENE_HOME}/include
+  ${CMAKE_INSTALL_PREFIX}/include
+  /usr/local/include
+  /usr/include
+  /sw/include
+  /usr/pkg/include
+  )
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_CORE_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES clucene-core
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (CLUCENE_CORE_LIBRARY)
+  MESSAGE(STATUS "Found CLucene core library: ${CLUCENE_CORE_LIBRARY}")
+ENDIF (CLUCENE_CORE_LIBRARY)
+FIND_LIBRARY_WITH_DEBUG(CLUCENE_SHARED_LIBRARY
+  WIN32_DEBUG_POSTFIX d
+  NAMES clucene-shared
+  PATHS ${TRIAL_LIBRARY_PATHS})
+IF (CLUCENE_SHARED_LIBRARY)
+  MESSAGE(STATUS "Found CLucene shared library: ${CLUCENE_SHARED_LIBRARY}")
+ENDIF (CLUCENE_SHARED_LIBRARY)
+
+IF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+  SET(CLUCENE_LIBRARIES ${CLUCENE_CORE_LIBRARY} ${CLUCENE_SHARED_LIBRARY})
+ENDIF(CLUCENE_CORE_LIBRARY AND CLUCENE_SHARED_LIBRARY)
+
+FIND_PATH(CLUCENE_INCLUDE_DIR
+  NAMES CLucene.h
+  PATHS ${TRIAL_INCLUDE_PATHS})
+
+IF (CLUCENE_INCLUDE_DIR)
+  MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}")
+ENDIF (CLUCENE_INCLUDE_DIR)
+
+IF(WIN32)
+  SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR})
+ENDIF(WIN32)
+
+SET(CLUCENE_GOOD_VERSION TRUE)
+
+FIND_PATH(CLUCENE_LIBRARY_DIR
+	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake CLucene/CLuceneConfig.cmake
+       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+IF (CLUCENE_LIBRARY_DIR)
+  MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
+  # include CLuceneConfig/CLuceneConfig.cmake
+  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake)
+  # include CLucene/CLuceneConfig.cmake
+  IF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+        INCLUDE(${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+  ENDIF(EXISTS ${CLUCENE_LIBRARY_DIR}/CLucene/CLuceneConfig.cmake)
+  IF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+    MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}")
+    SET(CLUCENE_GOOD_VERSION FALSE)
+  ENDIF (CLUCENE_VERSION STRLESS "${CLUCENE_MIN_VERSION}")
+  IF (CLUCENE_VERSION STREQUAL "0.9.17")
+    MESSAGE(ERROR "CLucene version 0.9.17 is not supported.")
+    SET(CLUCENE_GOOD_VERSION FALSE)
+  ENDIF (CLUCENE_VERSION STREQUAL "0.9.17")
+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}")
+  ENDIF(NOT CLucene_FIND_QUIETLY)
+ELSE(CLucene_FOUND)
+  IF(CLucene_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find CLucene.")
+  ENDIF(CLucene_FIND_REQUIRED)
+ENDIF(CLucene_FOUND)
+
+MARK_AS_ADVANCED(
+  CLUCENE_INCLUDE_DIRS
+  CLUCENE_INCLUDE_DIR
+  CLUCENE_LIBRARY_DIR
+  CLUCENE_LIBRARIES
+  )

CMakeModules/FindCLuceneUnstable.cmake

@@ -0,0 +1,37 @@
+# - Try to find clucene-unstable
+#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
+#
+#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
+#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
+#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
+
+# Include dir
+find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
+  NAMES CLucene.h
+  PATH_SUFFIXES clucene-unstable
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+# Finally the library itself
+find_library(CLUCENE_UNSTABLE_SHARED_LIB
+  NAMES clucene-unstable-shared
+  PATHS ${KDE4_LIB_DIR}
+)
+
+find_library(CLUCENE_UNSTABLE_CORE_LIB
+  NAMES clucene-unstable-core
+  PATHS ${KDE4_LIB_DIR}
+)
+
+
+SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
+SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+
+
+MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+

CMakeModules/FindEchonest.cmake

@@ -1,41 +0,0 @@
-# - Find libechonest
-# Find the libechonest includes and the libechonest libraries
-# This module defines
-# ECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h
-# ECHONEST_LIBRARIES, the path to libechonest
-# ECHONEST_FOUND, whether libechonest was found
-
-FIND_PACKAGE(PkgConfig QUIET)
-
-if( TOMAHAWK_QT5 )
-    set(LIBECHONEST_SUFFIX "5")
-endif()
-
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest${LIBECHONEST_SUFFIX})
-
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest${LIBECHONEST_SUFFIX}/Track.h
-    HINTS
-        ${PC_ECHONEST_INCLUDEDIR}
-        ${PC_ECHONEST_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest${LIBECHONEST_SUFFIX}
-    HINTS
-        ${PC_ECHONEST_LIBDIR}
-        ${PC_ECHONEST_LIBRARY_DIRS}
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
-)
-
-IF(ECHONEST_LIBRARIES AND ECHONEST_INCLUDE_DIR AND NOT PC_ECHONEST_VERSION)
-    MESSAGE(WARNING "You don't have pkg-config and so the libechonest version check does not work!")
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Echonest
-                                  REQUIRED_VARS ECHONEST_LIBRARIES ECHONEST_INCLUDE_DIR
-                                  VERSION_VAR PC_ECHONEST_VERSION)
-
-MARK_AS_ADVANCED(ECHONEST_INCLUDE_DIR ECHONEST_LIBRARIES)

CMakeModules/FindJreen.cmake

@@ -6,13 +6,7 @@
 # LIBJREEN_FOUND, whether libjreen was found
 
 FIND_PACKAGE(PkgConfig QUIET)
-if( TOMAHAWK_QT5 )
-    set(JREEN_LIB_SUFFIX "-qt5")
-    set(JREEN_INCLUDE_SUFFIX ${JREEN_LIB_SUFFIX})
-else()
-    set(JREEN_INCLUDE_SUFFIX "-qt4")
-endif()
-PKG_CHECK_MODULES(PC_JREEN QUIET libjreen${JREEN_LIB_SUFFIX})
+PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
 
 FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
     HINTS
@@ -20,12 +14,9 @@ FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
         ${PC_JREEN_INCLUDE_DIRS}
         ${CMAKE_INSTALL_INCLUDEDIR}
         ${KDE4_INCLUDE_DIR}
-    PATH_SUFFIXES
-        jreen${JREEN_INCLUDE_SUFFIX}
-    
 )
 
-FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen${JREEN_LIB_SUFFIX}
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
     HINTS
         ${PC_JREEN_LIBDIR}
         ${PC_JREEN_LIBRARY_DIRS}

CMakeModules/FindLIBVLC.cmake

@@ -1,39 +0,0 @@
-find_package(PkgConfig QUIET)
-pkg_check_modules(PC_LIBVLC QUIET libvlc)
-set(LIBVLC_DEFINITIONS ${PC_LIBVLC_CFLAGS_OTHER})
-
-find_path(LIBVLC_INCLUDE_DIR vlc/vlc.h
-    HINTS
-        ${PC_LIBVLC_INCLUDEDIR}
-        ${PC_LIBVLC_INCLUDE_DIRS}
-)
-
-find_library(LIBVLC_LIBRARY NAMES vlc libvlc
-    HINTS
-        ${PC_LIBVLC_LIBDIR}
-        ${PC_LIBVLC_LIBRARY_DIRS}
-)
-
-find_library(LIBVLCCORE_LIBRARY NAMES vlccore libvlccore
-    HINTS
-        ${PC_LIBVLC_LIBDIR}
-        ${PC_LIBVLC_LIBRARY_DIRS}
-)
-
-set(LIBVLC_VERSION ${PC_LIBVLC_VERSION})
-
-include(CheckCXXSourceCompiles)
-check_cxx_source_compiles("
-#include <vlc/libvlc.h>
-#include <vlc/libvlc_media.h>
-int main(int argc, char *argv[]) {
-    libvlc_meta_t meta = libvlc_meta_AlbumArtist;
-}"
-HAVE_VLC_ALBUMARTIST)
-
-find_package_handle_standard_args(LibVLC
-    REQUIRED_VARS LIBVLC_LIBRARY LIBVLCCORE_LIBRARY LIBVLC_INCLUDE_DIR
-    VERSION_VAR LIBVLC_VERSION
-)
-
- 

CMakeModules/FindLibEchonest.cmake

@@ -0,0 +1,42 @@
+# - Find libechonest
+# Find the libechonest includes and the libechonest libraries
+# This module defines
+# LIBECHONEST_INCLUDE_DIR, root echonest include dir. Include echonest includes with echonest/foo.h
+# LIBECHONEST_LIBRARY, the path to libechonest
+# LIBECHONEST_FOUND, whether libechonest was found
+
+
+find_path(LIBECHONEST_INCLUDE_DIR NAMES echonest_export.h
+   HINTS
+   ~/usr/include
+   /opt/local/include
+   /usr/include
+   /usr/local/include
+   /opt/kde4/include
+   ${KDE4_INCLUDE_DIR}
+   PATH_SUFFIXES echonest
+)
+
+find_library( LIBECHONEST_LIBRARY NAMES echonest
+    PATHS
+    ~/usr/lib
+   /opt/local/lib
+   /usr/lib
+   /usr/lib64
+   /usr/local/lib
+   /opt/kde4/lib
+   ${KDE4_LIB_DIR}
+)
+
+
+if(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
+   set(LIBECHONEST_FOUND TRUE)
+   message(STATUS "Found libechonest: ${LIBECHONEST_INCLUDE_DIR}, ${LIBECHONEST_LIBRARY}")
+else(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
+   set(LIBECHONEST_FOUND FALSE)   
+   if (LIBECHONEST_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find required package libechonest")
+   endif(LIBECHONEST_FIND_REQUIRED)
+endif(LIBECHONEST_INCLUDE_DIR AND LIBECHONEST_LIBRARY)
+
+mark_as_advanced(LIBECHONEST_INCLUDE_DIR LIBECHONEST_LIBRARY)

CMakeModules/FindLibLastFm.cmake

@@ -7,20 +7,21 @@
 # (c) Dominik Schmidt <dev@dominik-schmidt.de>
 #
 
-if( TOMAHAWK_QT5 )
-    set(LASTFM_LIB_SUFFIX "5")
+# Dependencies
+if(NOT QT4_FOUND)
+    find_package(Qt4 REQUIRED)
 endif()
 
 # Include dir
 find_path(LIBLASTFM_INCLUDE_DIR
   # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
-  NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h
+  NAMES lastfm/Track.h
   PATHS ${KDE4_INCLUDE_DIR}
 )
 
 # Finally the library itself
 find_library(LIBLASTFM_LIBRARY
-  NAMES lastfm${LASTFM_LIB_SUFFIX}
+  NAMES lastfm
   PATHS ${KDE4_LIB_DIR}
 )
 

CMakeModules/FindLucene++.cmake

@@ -1,103 +0,0 @@
-#
-# This module looks for lucene++ support
-# It will define the following values
-#
-# LUCENEPP_INCLUDE_DIRS = LUCENEPP_INCLUDE_DIR + LUCENEPP_LIBRARY_DIR
-# LUCENEPP_INCLUDE_DIR  = where lucene++/Lucene.h can be found
-# LUCENEPP_LIBRARY_DIR  = where liblucene++.so can be found
-# LUCENEPP_LIBRARIES    = the libraries to link against lucene++
-# LUCENEPP_VERSION      = The lucene++ version string
-# LUCENEPP_FOUND        = set to 1 if lucene++ is found
-#
-
-INCLUDE(CheckSymbolExists)
-INCLUDE(FindLibraryWithDebug)
-
-IF(LUCENEPP_FIND_VERSION)
-  SET(LUCENEPP_MIN_VERSION ${LUCENEPP_FIND_VERSION})
-ELSEIF()
-  SET(LUCENEPP_MIN_VERSION "3.0.0")
-ENDIF(LUCENEPP_FIND_VERSION)
-
-SET(TRIAL_LIBRARY_PATHS
-  $ENV{LUCENEPP_HOME}/lib${LIB_SUFFIX}
-  ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
-  ${CMAKE_INSTALL_PREFIX}/lib
-  /usr/local/lib${LIB_SUFFIX}
-  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  /usr/lib${LIB_SUFFIX}
-  /sw/lib${LIB_SUFFIX}
-  /usr/pkg/lib${LIB_SUFFIX}
-  /usr/lib64
-  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  )
-SET(TRIAL_INCLUDE_PATHS
-  $ENV{LUCENEPP_HOME}/include
-  ${CMAKE_INSTALL_PREFIX}/include
-  /usr/local/include
-  /usr/include
-  /sw/include
-  /usr/pkg/include
-  )
-FIND_LIBRARY_WITH_DEBUG(LUCENEPP_CORE_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES lucene++
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (LUCENEPP_CORE_LIBRARY)
-  MESSAGE(STATUS "Found Lucene++ core library: ${LUCENEPP_CORE_LIBRARY}")
-ENDIF (LUCENEPP_CORE_LIBRARY)
-FIND_LIBRARY_WITH_DEBUG(LUCENEPP_SHARED_LIBRARY
-  WIN32_DEBUG_POSTFIX d
-  NAMES lucene++-contrib
-  PATHS ${TRIAL_LIBRARY_PATHS})
-IF (LUCENEPP_SHARED_LIBRARY)
-  MESSAGE(STATUS "Found Lucene++ contrib library: ${LUCENEPP_SHARED_LIBRARY}")
-ENDIF (LUCENEPP_SHARED_LIBRARY)
-
-IF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
-  SET(LUCENEPP_LIBRARIES ${LUCENEPP_CORE_LIBRARY} ${LUCENEPP_SHARED_LIBRARY} ${Boost_SYSTEM_LIBRARY})
-ENDIF(LUCENEPP_CORE_LIBRARY AND LUCENEPP_SHARED_LIBRARY)
-
-FIND_PATH(LUCENEPP_INCLUDE_DIR
-  NAMES lucene++/Lucene.h
-  PATHS ${TRIAL_INCLUDE_PATHS})
-
-IF (LUCENEPP_INCLUDE_DIR)
-  MESSAGE(STATUS "Found Lucene++ include dir: ${LUCENEPP_INCLUDE_DIR}")
-ENDIF (LUCENEPP_INCLUDE_DIR)
-
-SET(LUCENEPP_GOOD_VERSION TRUE)
-
-FIND_PATH(LUCENEPP_LIBRARY_DIR
-	NAMES liblucene++.dylib liblucene++.so liblucene++.dll.a lucene++
-       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
-IF (LUCENEPP_LIBRARY_DIR)
-  MESSAGE(STATUS "Found Lucene++ library dir: ${LUCENEPP_LIBRARY_DIR}")
-
-  IF (LUCENEPP_VERSION STRLESS "${LUCENEPP_MIN_VERSION}")
-    MESSAGE(ERROR " Lucene++ version ${LUCENEPP_VERSION} is less than the required minimum ${LUCENEPP_MIN_VERSION}")
-    SET(LUCENEPP_GOOD_VERSION FALSE)
-  ENDIF (LUCENEPP_VERSION STRLESS "${LUCENEPP_MIN_VERSION}")
-ENDIF (LUCENEPP_LIBRARY_DIR)
-
-IF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
-  SET(LUCENEPP_FOUND TRUE)
-  SET(LUCENEPP_INCLUDE_DIRS ${LUCENEPP_LIBRARY_DIR} ${LUCENEPP_INCLUDE_DIR})
-ENDIF(LUCENEPP_INCLUDE_DIR AND LUCENEPP_LIBRARIES AND LUCENEPP_LIBRARY_DIR AND LUCENEPP_GOOD_VERSION)
-
-IF(LUCENEPP_FOUND)
-  IF(NOT LUCENEPP_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Lucene++: ${LUCENEPP_LIBRARIES} version ${LUCENEPP_VERSION}")
-  ENDIF(NOT LUCENEPP_FIND_QUIETLY)
-ELSE(LUCENEPP_FOUND)
-  IF(LUCENEPP_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Lucene++.")
-  ENDIF(LUCENEPP_FIND_REQUIRED)
-ENDIF(LUCENEPP_FOUND)
-
-MARK_AS_ADVANCED(
-  LUCENEPP_INCLUDE_DIRS
-  LUCENEPP_INCLUDE_DIR
-  LUCENEPP_LIBRARY_DIR
-  LUCENEPP_LIBRARIES
-  )

CMakeModules/FindPhonon.cmake

@@ -0,0 +1,37 @@
+# Find libphonon
+# Once done this will define
+#
+#  PHONON_FOUND    - system has Phonon Library
+#  PHONON_INCLUDES - the Phonon include directory
+#  PHONON_LIBS     - link these to use Phonon
+#  PHONON_VERSION  - the version of the Phonon Library
+
+# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro(_phonon_find_version)
+   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
+   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   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}")
+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})
+   _phonon_find_version()
+endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)
+
+mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)

CMakeModules/FindQJSON.cmake

@@ -6,24 +6,45 @@
 #  QJSON_INCLUDE_DIR - the include path of the qjson library
 #
 
-find_library (QJSON_LIBRARIES
+if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+
+  # Already in cache
+  set (QJSON_FOUND TRUE)
+
+else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
+
+  if (NOT WIN32)
+    # use pkg-config to get the values of QJSON_INCLUDE_DIRS
+    # and QJSON_LIBRARY_DIRS to add as hints to the find commands.
+    include (FindPkgConfig)
+    pkg_check_modules (QJSON REQUIRED QJson>=0.5)
+  endif (NOT WIN32)
+
+  find_library (QJSON_LIBRARIES
     NAMES
     qjson
     PATHS
     ${QJSON_LIBRARY_DIRS}
     ${LIB_INSTALL_DIR}
     ${KDE4_LIB_DIR}
-)
+  )
 
-find_path (QJSON_INCLUDE_DIR
+  find_path (QJSON_INCLUDE_DIR
     NAMES
-    qjson/parser.h
+    parser.h
+    PATH_SUFFIXES
+    qjson
     PATHS
     ${QJSON_INCLUDE_DIRS}
     ${INCLUDE_INSTALL_DIR}
     ${KDE4_INCLUDE_DIR}
-)
+  )
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
+  include(FindPackageHandleStandardArgs)
+  find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
 
+  if ( UNIX AND NOT APPLE )
+    set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
+  endif ()
+
+endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)

CMakeModules/FindQTweetLib.cmake

@@ -0,0 +1,31 @@
+# - Try to find QTweetLib
+#
+#  QTWEETLIB_FOUND - system has QTweetLib
+#  QTWEETLIB_INCLUDE_DIRS - the QTweetLib include directories
+#  QTWEETLIB_LIBRARIES - link these to use QTweetLib
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
+
+# Dependencies
+find_package(Qt4 REQUIRED)
+
+# Include dir
+find_path(QTWEETLIB_INCLUDE_DIR
+  NAMES QTweetLib/qtweetlib_global.h
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+# Finally the library itself
+find_library(QTWEETLIB_LIBRARY
+  NAMES QTweetLib
+  PATHS ${KDE4_LIB_DIR}
+)
+
+SET( QTWEETLIB_LIBRARIES  ${QTWEETLIB_LIBRARY} ${QJSON_LIBRARIES} )
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QTweetLib DEFAULT_MSG QTWEETLIB_LIBRARY QTWEETLIB_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(QTWEETLIB_LIBRARIES QTWEETLIB_INCLUDE_DIR)
+

CMakeModules/FindQtSparkle.cmake

@@ -1,30 +0,0 @@
-# - Find qtsparkle
-# Find the qtsparkle includes and the qtsparkle libraries
-# This module defines
-# QTSPARKLE_INCLUDE_DIR, root qtsparkle include dir. Include qtsparkle includes with qtsparkle/foo.h
-# QTSPARKLE_LIBRARY, the path to qtsparkle
-# QTSPARKLE_FOUND, whether qtsparkle was found
-
-if( TOMAHAWK_QT5 )
-    set(QTSPARKLE_SUFFIX "-qt5")
-else()
-    set(QTSPARKLE_SUFFIX "")
-endif()
-
-FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle${QTSPARKLE_SUFFIX}/Updater
-    HINTS
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle${QTSPARKLE_SUFFIX}
-    HINTS
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QtSparkle
-                                  REQUIRED_VARS QTSPARKLE_LIBRARIES QTSPARKLE_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(QTSPARKLE_INCLUDE_DIR QTSPARKLE_LIBRARIES)

CMakeModules/FindQuaZip.cmake

@@ -1,43 +1,11 @@
-# QUAZIP_FOUND               - QuaZip library was found
-# QUAZIP_INCLUDE_DIR         - Path to QuaZip include dir
-# QUAZIP_INCLUDE_DIRS        - Path to QuaZip and zlib include dir (combined from QUAZIP_INCLUDE_DIR + ZLIB_INCLUDE_DIR)
-# QUAZIP_LIBRARIES           - List of QuaZip libraries
-# QUAZIP_ZLIB_INCLUDE_DIR    - The include dir of zlib headers
-
-
-IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
-	# in cache already
-	SET(QUAZIP_FOUND TRUE)
-ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
-    IF (Qt5Core_FOUND)
-        set(QUAZIP_LIB_VERSION_SUFFIX 5)
-    ENDIF()
-	IF (WIN32)
-		FIND_PATH(QUAZIP_LIBRARY_DIR
-			WIN32_DEBUG_POSTFIX d
-            NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll
-			HINTS "C:/Programme/" "C:/Program Files"
-			PATH_SUFFIXES QuaZip/lib
-		)
-        FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip${QUAZIP_LIB_VERSION_SUFFIX}.dll HINTS ${QUAZIP_LIBRARY_DIR})
-		FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip${QUAZIP_LIB_VERSION_SUFFIX})
-		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h)
-	ELSE(WIN32)
-		FIND_PACKAGE(PkgConfig)
-#     pkg_check_modules(PC_QCA2 QUIET qca2)
-		pkg_check_modules(PC_QUAZIP quazip)
-		FIND_LIBRARY(QUAZIP_LIBRARIES
-			WIN32_DEBUG_POSTFIX d
-            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-			HINTS /usr/lib /usr/lib64
-		)
-		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
-			HINTS /usr/include /usr/local/include
-			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-		)
-		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
-	ENDIF (WIN32)
-	INCLUDE(FindPackageHandleStandardArgs)
-	SET(QUAZIP_INCLUDE_DIRS ${QUAZIP_INCLUDE_DIR} ${QUAZIP_ZLIB_INCLUDE_DIR})
-	find_package_handle_standard_args(QUAZIP DEFAULT_MSG  QUAZIP_LIBRARIES QUAZIP_INCLUDE_DIR QUAZIP_ZLIB_INCLUDE_DIR QUAZIP_INCLUDE_DIRS)
-ENDIF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+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/FindSparsehash.cmake

@@ -1,25 +0,0 @@
-# - Find google-sparsehash
-# Find the google-sparsehash includes
-# This module defines
-# SPARSEHASH_INCLUDE_DIR, root jreen include dir.
-# SPARSEHASH_FOUND, whether libjreen was found
-
-FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_SPARSEHASH QUIET libsparsehash)
-
-FIND_PATH(SPARSEHASH_INCLUDE_DIR NAMES google/sparsetable
-    HINTS
-        ${PC_SPARSEHASH_INCLUDEDIR}
-        ${PC_SPARSEHASH_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-IF(SPARSEHASH_INCLUDE_DIR AND NOT PC_SPARSEHASH_VERSION)
-    MESSAGE(WARNING "You don't have pkg-config and so the google-sparsehash version check does not work!")
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sparsehash
-    REQUIRED_VARS SPARSEHASH_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(SPARSEHASH_INCLUDE_DIR)

CMakeModules/FindTelepathyQt.cmake

@@ -1,27 +0,0 @@
-# Copyright (c) 2013, Teo Mrnjavac <teo@kde.org>
-
-include(FindPackageHandleStandardArgs)
-
-if( NOT BUILD_WITH_QT4 )
-    find_package(TelepathyQt5 NO_MODULE)
-    set(TelepathyQt_FOUND ${TelepathyQt5_FOUND})
-    set(TELEPATHY_QT_VERSION ${TELEPATHY_QT5_VERSION})
-    set(TELEPATHY_QT_INSTALL_DIR ${TELEPATHY_QT5_INSTALL_DIR})
-    set(TELEPATHY_QT_INCLUDE_DIR ${TELEPATHY_QT5_INCLUDE_DIR})
-    set(TELEPATHY_QT_LIB_DIR ${TELEPATHY_QT5_LIB_DIR})
-    set(TELEPATHY_QT_SHARE_DIR ${TELEPATHY_QT5_SHARE_DIR})
-    set(TELEPATHY_QT_LIBRARIES ${TELEPATHY_QT5_LIBRARIES})
-else()
-    find_package(TelepathyQt4 NO_MODULE)
-    set(TelepathyQt_FOUND ${TelepathyQt4_FOUND})
-    set(TELEPATHY_QT_VERSION ${TELEPATHY_QT4_VERSION})
-    set(TELEPATHY_QT_INSTALL_DIR ${TELEPATHY_QT4_INSTALL_DIR})
-    set(TELEPATHY_QT_INCLUDE_DIR ${TELEPATHY_QT4_INCLUDE_DIR})
-    set(TELEPATHY_QT_LIB_DIR ${TELEPATHY_QT4_LIB_DIR})
-    set(TELEPATHY_QT_SHARE_DIR ${TELEPATHY_QT4_SHARE_DIR})
-    set(TELEPATHY_QT_LIBRARIES ${TELEPATHY_QT4_LIBRARIES})
-endif()
-
-set(TELEPATHY_QT_FOUND ${TelepathyQt_FOUND})
-
-find_package_handle_standard_args(TelepathyQt DEFAULT_MSG  TELEPATHY_QT_INSTALL_DIR )

CMakeModules/NSIS.template.in

@@ -23,9 +23,8 @@
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
 !define QT_DLL_PATH "${MING_BIN}"
-!define SQLITE_DLL_PATH "${MING_LIB}/qt5/plugins/sqldrivers"
-!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt5/plugins/imageformats"
-
+!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
 
 ; We use official release plugins
 ; mingw32-vlc from obs misses a lot and has even broken ones probably
@@ -35,9 +34,6 @@
 
 !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
 
-;define app id needed for Windows 8 notifications
-!define AppUserModelId org.tomahawk-player.Tomahawk
-
 ;-----------------------------------------------------------------------------
 ; Installer version
 ;-----------------------------------------------------------------------------
@@ -278,11 +274,11 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         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\libtomahawk.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk-widgets.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk-playdarapi.dll"
-
+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
         ; plugins
         File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
    !endif
@@ -291,11 +287,11 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         File "${BUILD_PATH}\tomahawk.exe"
 
         File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
+        File "${BUILD_PATH}\libtomahawk_breakpad.dll"
 
-        File "${BUILD_PATH}\libtomahawk.dll"
-        File "${BUILD_PATH}\libtomahawk-widgets.dll"
-        File "${BUILD_PATH}\libtomahawk-playdarapi.dll"
-
+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
         ; plugins
         File "${BUILD_PATH}\libtomahawk_*_*.dll"
    !endif
@@ -305,61 +301,39 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
 
    ;QT stuff:
-    File "${QT_DLL_PATH}\Qt5Network.dll"
-    File "${QT_DLL_PATH}\Qt5Qml.dll"
-    File "${QT_DLL_PATH}\Qt5Sql.dll"
-    File "${QT_DLL_PATH}\Qt5Xml.dll"
-    File "${QT_DLL_PATH}\Qt5Core.dll"
-    File "${QT_DLL_PATH}\Qt5OpenGL.dll"
-    File "${QT_DLL_PATH}\Qt5Quick.dll"
-    File "${QT_DLL_PATH}\Qt5Svg.dll"
-    File "${QT_DLL_PATH}\Qt5Widgets.dll"
-    File "${QT_DLL_PATH}\Qt5Gui.dll"
-    File "${QT_DLL_PATH}\Qt5PrintSupport.dll"
-    File "${QT_DLL_PATH}\Qt5Sensors.dll"
-    File "${QT_DLL_PATH}\Qt5WebKit.dll"
-    File "${QT_DLL_PATH}\Qt5WinExtras.dll"
-    File "${QT_DLL_PATH}\Qt5WebKit.dll"
-    File "${QT_DLL_PATH}\Qt5WebKitWidgets.dll"
-    File "${QT_DLL_PATH}\Qt5Multimedia.dll"
-    File "${QT_DLL_PATH}\Qt5MultimediaWidgets.dll"
-
-
-    ;Qt deps
-    File "${QT_DLL_PATH}\libpcre16-0.dll"
-    File "${QT_DLL_PATH}\libxml2-2.dll"
-    File "${QT_DLL_PATH}\libxslt-1.dll"
-    File "${QT_DLL_PATH}\libEGL.dll"
-    File "${QT_DLL_PATH}\libGLESv2.dll"
-    File "${QT_DLL_PATH}\libwebp-4.dll"
-
-   ;Boost fnord
-    File "${QT_DLL_PATH}\icuuc53.dll"
-    File "${QT_DLL_PATH}\icudata53.dll"
-    File "${QT_DLL_PATH}\icui18n53.dll"
+   File "${QT_DLL_PATH}\QtCore4.dll"
+   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"
 
    ;SQLite driver
    SetOutPath "$INSTDIR\sqldrivers"
-   File "${SQLITE_DLL_PATH}\qsqlite.dll"
-   SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libsqlite3-0.dll"
-
-   ;Qt platform plugins
-    SetOutPath "$INSTDIR\platforms"
-    File "${MING_LIB}/qt5/plugins/platforms/qwindows.dll"
+   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
    SetOutPath "$INSTDIR"
 
    ;Image plugins
    SetOutPath "$INSTDIR\imageformats"
-   File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
    SetOutPath "$INSTDIR"
 
    ;Cygwin/c++ stuff
+   ;File "${MING_BIN}\cygmad-0.dll"
+   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
+   ;File "${MING_BIN}\mingwm10.dll"
    File "${MING_BIN}\libgcc_s_sjlj-1.dll"
    File "${MING_BIN}\libstdc++-6.dll"
 
+   ;Phonon stuff
+   File "${MING_BIN}\libphonon.dll"
+   SetOutPath "$INSTDIR\phonon_backend"
+   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
+   SetOutPath "$INSTDIR"
+
    ;VLC
    File "${VLC_BIN}\libvlc.dll"
    File "${VLC_BIN}\libvlccore.dll"
@@ -368,60 +342,31 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    SetOutPath "$INSTDIR"
 
    ; Other
+   File "${MING_BIN}\libqjson.dll"
    File "${MING_BIN}\libtag.dll"
-   File "${MING_BIN}\libpng16-16.dll"
+   File "${MING_BIN}\libpng15-15.dll"
    File "${MING_BIN}\libjpeg-8.dll"
    File "${MING_BIN}\zlib1.dll"
 
-   File "${MING_BIN}\libechonest5.dll"
-   File "${MING_BIN}\liblastfm5.dll"
-   File "${MING_BIN}\libquazip5.dll"
-   File "${MING_BIN}\libqt5keychain.dll"
-
-   ; GnuTLS
-   File "${MING_BIN}\libgnutls-28.dll"
-   File "${MING_BIN}\libtasn1-6.dll"
-   File "${MING_BIN}\libgmp-10.dll"
-   File "${MING_BIN}\libhogweed-2-4.dll"
-   File "${MING_BIN}\libintl-8.dll"
-   File "${MING_BIN}\libnettle-4-6.dll"
-   File "${MING_BIN}\libp11-kit-0.dll"
-   File "${MING_BIN}\libffi-6.dll"
-
-   ; Snorenotify
-   File "${MING_BIN}\SnoreToast.exe"
-   File "${MING_BIN}\libsnore-qt5.dll"
-   File "${MING_LIB}\libsnore-qt5\libsnore_backend_growl.dll"
-   File "${MING_LIB}\libsnore-qt5\libsnore_backend_snarl.dll"
-   File "${MING_LIB}\libsnore-qt5\libsnore_backend_snore.dll"
-   File "${MING_LIB}\libsnore-qt5\libsnore_backend_snoretoast.dll"
-
-   ; Snoregrowl
-   File "${MING_BIN}\libsnoregrowl++.dll"
-   File "${MING_BIN}\libsnoregrowl.dll"
+   File "${MING_BIN}\libechonest.dll"
+   File "${MING_BIN}\liblastfm.dll"
+   File "${MING_BIN}\libQTweetLib.dll"
+   File "${MING_BIN}\libquazip.dll"
 
    ; Jabber
-   File "${MING_BIN}\libjreen-qt5.dll"
-   File "${MING_BIN}\libidn-11.dll"
-   File "${MING_BIN}\libgsasl-7.dll"
-   File "${MING_BIN}\libqca-qt5.dll"
+   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libqca.dll"
    SetOutPath "$INSTDIR\crypto"
-   File "${MING_LIB}\qca-qt5\crypto\libqca-ossl.dll"
+   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
    SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libssl-10.dll"
-   File "${MING_BIN}\libcrypto-10.dll"
+   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
 
-   ; LucenePlusPlus
-   File "${MING_BIN}\liblucene++.dll"
-   File "${MING_BIN}\libboost_system-mt.dll"
-   File "${MING_BIN}\libboost_filesystem-mt.dll"
-   File "${MING_BIN}\libboost_iostreams-mt.dll"
-   File "${MING_BIN}\libboost_regex-mt.dll"
-   File "${MING_BIN}\libboost_thread-mt.dll"
-   File "${MING_BIN}\libbz2-1.dll"
+   File "${MING_LIB}\libclucene-core.dll"
+   File "${MING_LIB}\libclucene-shared.dll"
 
-   File "${MING_BIN}\libqtsparkle-qt5.dll"
-   File "${MING_BIN}\libKF5Attica.dll"
+   File "${MING_BIN}\libqtsparkle.dll"
+   File "${MING_BIN}\libattica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"
@@ -437,7 +382,6 @@ SectionGroup "Shortcuts"
       CreateDirectory "$SMPROGRAMS\Tomahawk"
       CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
       CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-      WinShell::SetLnkAUMI "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "${AppUserModelId}"
       CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
       CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
       SetShellVarContext current
@@ -518,72 +462,6 @@ Section -post
    WriteRegStr HKCR "tomahawk\shell" "" "open"
    WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
 
-   ; Register file associations
-   WriteRegStr HKCR ".mp3" "" "MPEG Audio Layer 3"
-   WriteRegStr HKCR ".mp3\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".mp3\shell" "" "open"
-   WriteRegStr HKCR ".mp3\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".oga" "" "Ogg Audio File"
-   WriteRegStr HKCR ".oga\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".oga\shell" "" "open"
-   WriteRegStr HKCR ".oga\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".ogg" "" "Ogg Audio File"
-   WriteRegStr HKCR ".ogg\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".ogg\shell" "" "open"
-   WriteRegStr HKCR ".ogg\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".opus" "" "OPUS File"
-   WriteRegStr HKCR ".opus\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".opus\shell" "" "open"
-   WriteRegStr HKCR ".opus\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".mp4" "" "AAC File"
-   WriteRegStr HKCR ".mp4\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".mp4\shell" "" "open"
-   WriteRegStr HKCR ".mp4\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".aac" "" "AAC File"
-   WriteRegStr HKCR ".aac\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".aac\shell" "" "open"
-   WriteRegStr HKCR ".aac\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".m4a" "" "AAC File"
-   WriteRegStr HKCR ".m4a\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".m4a\shell" "" "open"
-   WriteRegStr HKCR ".m4a\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".mpc" "" "Musepack Audio File"
-   WriteRegStr HKCR ".mpc\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".mpc\shell" "" "open"
-   WriteRegStr HKCR ".mpc\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".wma" "" "Windows Media Audio"
-   WriteRegStr HKCR ".wma\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".wma\shell" "" "open"
-   WriteRegStr HKCR ".wma\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".aiff" "" "AIFF File"
-   WriteRegStr HKCR ".aiff\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".aiff\shell" "" "open"
-   WriteRegStr HKCR ".aiff\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".aif" "" "AIFF File"
-   WriteRegStr HKCR ".aif\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".aif\shell" "" "open"
-   WriteRegStr HKCR ".aif\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".wv" "" "WavePack Audio File"
-   WriteRegStr HKCR ".wv\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".wv\shell" "" "open"
-   WriteRegStr HKCR ".wv\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   WriteRegStr HKCR ".flac" "" "FLAC Audio File"
-   WriteRegStr HKCR ".flac\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR ".flac\shell" "" "open"
-   WriteRegStr HKCR ".flac\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
    SetDetailsPrint textonly
    DetailPrint "Finsihed."
 SectionEnd
@@ -643,15 +521,11 @@ Section Uninstall
    DeleteRegValue HKLM "Software\Tomahawk" ""
    DeleteRegKey HKLM "Software\Tomahawk"
 
-   ;DeleteRegKey HKCR "Software\Tomahawk"
-   ;DeleteRegKey HKCR "Software\TomahawkSpotify"
    DeleteRegKey HKCR "tomahawk"
 
    ;Start menu shortcuts.
    !ifdef OPTION_SECTION_SC_START_MENU
       SetShellVarContext all
-      WinShell::UninstAppUserModelId "${AppUserModelId}"
-      WinShell::UninstShortcut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk"
       RMDir /r "$SMPROGRAMS\Tomahawk"
       SetShellVarContext current
    !endif

ChangeLog

@@ -1,186 +1,6 @@
-Version 0.9.0:
-    * Resolved various playback issues by switching to a new audio engine.
-
-Version 0.8.4:
-    * Fixed drag & drop issues on sidebar.
-    * Fixed starting Tomahawk with a filename as parameter.
-    * Update column view when collection changes.
-    * (Linux) Don't crash on environments with invalid locales.
-
-Version 0.8.3:
-    * Performance improvements for collection browsing.
-    * Improved memory footprint.
-    * Show cloud collections above your friends in the sidebar.
-    * Keep looking for alternative sources even when we found a perfect match.
-    * Fixed crash in network code.
-    * Fixed repeat one/all icons.
-    * Be more lenient about accepting JSPF and M3U playlists.
-    * Improved support for compilation albums.
-    * (Windows) Fixed support for Windows XP.
-    * (OS X) Fixed settings dialog appearance on Yosemite.
-    * (OS X) Fixed SSL errors on Yosemite.
-
-Version 0.8.2:
-    * Show error message if saving tags failed.
-    * Fixed painting issue on search page.
-    * (OS X & Windows) Fixed crash during collection scan.
-
-Version 0.8.1:
-    * Disabled sorting for stations.
-    * Fixed drag & drop behavior in combination with certain resolvers.
-    * Fixed infinite scanning recursion.
-    * Prevented adding dupes to the collection when scanning.
-    * When playing an artist or album, don't give up when the first track
-      in list isn't playable.
-    * Fixed importing M3U playlists.
-    * Sort album grids by artist name.
-    * Fixed painting issue on 'More Albums' grid.
-    * Fixed crash when editing/saving track tags.
-
-Version 0.8.0:
-    * Redesigned - Shiny new interface. Simplified. New icons.
-    * Added Friend Feed.
-    * Now Playing notifications (OS X & Windows) - support for OS-level
-      notification systems (e.g. Notification Center) with fallback to its own
-      native notification system.
-    * Many actions now available in context menu - including Favorite and Send
-      to a Friend.
-    * Drag and drop support for iTunes, Deezer, Beats Music, Rdio, Spotify,
-      SoundCloud links (into Tomahawk) for playlists/tracks/artists/album urls.
-    * Support for clicking source icon for currently playing track in audio
-      controls to take user to associated page on source's site.
-    * Added Hatchet plug-in.
-    * Added Google Play Music and Beats Music support.
-    * Add links to Support site, Bug Reports and Translations to Help menu.
-    * Add "What's New" page to display on first launch (or until dismissed).
-      Also available from Help menu.
-    * Changed label from "Resolvers" and "Services" to more generic "Plug-Ins".
-    * Clarified some labels, help text and status messages.
-    * Changed icon color a bit.
-    * Added "Acoustic" and "Electric" songtypes to Stations options.
-    * Removed some stale Chart sources.
-    * Playback Queue now saves its state across sessions.
-    * Queue now moved to sidebar.
-    * Added "Inbox" feature, showing incoming song recommendations. Dropping
-      a track on a user in the sidebar sends a recommendation to them.
-    * You will now be asked whether you want to trust invalid SSL certificates.
-    * Improved connecting between Tomahawk peers and support multiple IPs
-      (including IPv6).
-    * Removed Top Loved from sidebar.
-    * Removed Spotify playlist syncing (will return in future versions).
-    * HTTP(S) streaming is now done by Tomahawk instead of the Phonon backend
-      (fixed HTTPS streaming on MacOS).
-    * Heavily reduced memory footprint during and after indexing the database.
-    * Retina display and DPI scaling fixes.
-    * New Collection views. Re-added support for tracklist view of Collection.
-    * Added Telepathy support.
-    * Plugin refactoring (and .AXE resolver binaries).
-    * Removed Twitter due to change in Twitter's API.
-    * Removed auto-playlists.
-    * Improved error messages.
-    * Added basic remote control API.
-    * Add support for Opus codec (requires TagLib 1.9).
-    * Support rtmp:// streams.
-    * Support custom headers in CustomUrlHandler.
-    * Fuzzy search indices for JS Resolvers.
-    * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers.
-
-Version 0.7.0:
-    * JavaScript Resolvers can now expose collections.
-    * Introduced bundle system for JavaScript Resolvers, called "axes".
-    * Fixed playback-loop caused by duplicate tracks in a playlist.
-    * Improved peer handling and removed connection support through Twitter.
-    * Taking an account offline now also disconnects associated peers.
-    * Improved spotify protocol handling.
-    * Added "Append to Playlist" context menu item.
-    * User-friendlier collection handling: added info-buttons for artists and
-      albums. Double-clicking an item expands it now.
-    * Charts only load on-demand now.
-    * Fixed Diagnostics information not correctly updating.
-    * Fixed issue with hidden sidebar and panels.
-    * Fixed issues with some color schemes.
-    * Fixed playing files with special characters in the filename.
-    * Improved stability.
-    * Added translations for Catalan, Czech, Galician, Greek, Italian and
-      Chinese.
-    * (Windows) Smoother and more responsive audio playback.
-    * (Linux) Fixed grid issues with GTK-styles.
-
-Version 0.6.1:
-    * Improved stability.
-    * Improved UPnP detection and port-forwarding.
-    * Fixed scrolling behaviour of grid-views.
-    * Lots of small design tweaks and fixes.
-
-Version 0.6.0:
-    * Improved icon theme with vector graphics.
-    * Higher resolution artist and album images.
-    * You can now click artists, albums and tracks mentioned in artists'
-      biographies.
-    * New AudioControl logic - only enable Prev/Skip buttons if available.
-    * Added more options to right-click/context menus.
-    * Resolver source icon in Audiocontrols now supports being a link-back URL
-      to original source.
-    * Make friends' currently playing song (in sidebar) clickable.
-    * Improve MusicBrainz plugin to use normalized artist names and avoid
-      duplicate tracks.
-    * Access Control queries now stay on the bottom of the job view, removing
-      the tendency to jump away from the mouse.
-    * Improved random mode, preventing songs from being played in too rapid
-      succession.
-    * You can now choose between various view modes for your playlists.
-    * Nicer layout for the Artist, Album & Track pages.
-    * Follow HTTP redirects when fetching Playlists.
-    * Main menu can now be hidden and instead be shown as a toolbar button.
-    * Connectivity controls in the toolbar.
-    * Cleaned up settings dialog.
-    * Ability to sync Spotify Starred Tracks with Tomahawk's Loved Tracks.
-    * Remove YouTube resolver from plug-in directory on request of YouTube.
-    * Fixed iTunes m3u playlist support.
-    * Support dropping of new Soundcloud user, track, set & likes URLs.
-    * Added HotNewHipHop as available chart.
-    * Added iTunes as available source for New Releases.
-    * Updates and additions to translations including: Japanese, Bulgarian, 
-      Finnish, Russian, Arabic, Chinese, Swedish, Czech and more.
-    * (Windows) Added thumb buttons to Windows 7's taskbar.
-    * (Linux) Allow disabling of playback notifications.
-
-Version 0.5.5:
-    * Changed the Spotify config dialog to indicate when the user
-      is logged in.
-    * Fixed bug where the wrong avatar could be shown for a user.
-    * Fixed shortcuts not working in the global search field on OS X.
-    * Fixed The Echo Nest stations.
-    * Code-signed executable on OS X for GateKeeper.
-    * Fixed logging in to Spotify when pressing return in the config dialog.
-    * Fixed queue not auto-collapsing when playing the last track.
-    * Fixed bug where album listings would fail to show up.
-    * Improved stability.
-    * Fixed bug where it was not possible to drop a mixture of resolved
-      and unresolved tracks onto a playlist.
-
-Version 0.5.4:
-    * Improved stability.
-    * Added support for Spotify album lookups.
-    * Fixed not always updating the database index after scanning.
-    * Fixed connection issue between Tomahawk peers.
-
-Version 0.5.3:
-    * Fixed broken artist names when importing Last.fm playback history.
-    * Fixed crash when filtering collections.
-
-Version 0.5.2:
-    * Fixed a crash when invalid results are coming back from a resolver or
-      are found in a playlist.
-
 Version 0.5.1:
-    * Fixed a few issues with automatic downloading and launching
-      of the Spotify account.
-    * Show an error message when not able to resolve a requested song.
-    * Fixed a few crash and freeze issues.
     * Better detection of local networks for the Local Network connector.
     * Don't prompt for access permission for your own accounts.
-    * (OS X) Fixed not being able to connect to Last.fm.
 
 Version 0.5.0:
     * SOCKS5 proxy support improvements for resolvers and more.
@@ -236,7 +56,7 @@ Version 0.4.0:
     * 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.
+    * Added jump-to-current-track support for search results page. 
     * Fixed non-resolving tracks when dragging from album view.
     * Fixed fetching album covers for albums with special characters.
     * Show errors and continue gracefully when resolved audio is not available.
@@ -261,7 +81,7 @@ Version 0.4.0:
     * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
     * Fixed /Volumes directory not showing up on OS X.
     * Fixed startup crash on OS X.
-
+ 
 Version 0.3.3:
     * Automatically load Super Collection tracks when no official release
       information is available.
@@ -273,7 +93,7 @@ Version 0.3.3:
     * Fixed dupe menu entry appearing on OS X.
     * Fixed invisible sidebar items on Linux.
 
-Version 0.3.2:
+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.
@@ -327,7 +147,7 @@ Version 0.3.0:
     * 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.
+    * 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

PACKAGING.md

@@ -1,78 +0,0 @@
-# Packaging Tomahawk
-
-General distribution agnostic packaging documentation for Linux.
-
-## Stay up to date!
-
-We will try to keep this document up to date, but we also let our packagers know if our dependencies get important updates - especially if they fix crashes or add new features - or if we add completely new ones. Last but not least, of course we want to let you know about new releases of Tomahawk!
-
-If you want to be notified too subscribe to our [Google Group](https://groups.google.com/forum/#!forum/tomahawk-packagers).
-
-## CMake build options
-
-CMake build options are prefixed with ```-D``` and get their value passed after an ```=```.
-You could for example specify the build type like this ```-DCMAKE_BUILD_TYPE=RelWithDebInfo```.
-This document contains only options relevant to packaging, to have a complete overview you should check our CMake scripts yourself. Looking at it the other way round, this also means that you should read everything in here really carefully.
-
-
-##### ```CMAKE_BUILD_TYPE```
-
-Make sure to specify the build type as ```Release``` or even better ```RelWithDebInfo``` if your distribution supports debug packages. If you do not do this, your users might see asserts (that look like crashes to them) which are only really useful to developers.
-
-##### ```CMAKE_INSTALL_LIBDIR``` (PATH)
-
-You can specify the path where Tomahawk install the libs. This is very helpful to support multilib on linux machines. 
-
-##### ```CMAKE_SKIP_RPATH``` (boolean) (default: OFF)
-
-Build without using rpath prevents from overriding of the normal library search path, possibly interfering with local policy and causing problems for multilib, among other issues.
-
-##### ```BUILD_RELEASE``` (boolean) (default: OFF)
-
-If you're not using our tarballs you can turn this on to suppress putting Git revision hashes into the version string. This also disables building tools and tests by default (although you can do that manually) it's more future-proof to simply pass ```-DBUILD_RELEASE=ON``` because we might make use of it in later releases.
-
-##### ```BUILD_TOOLS``` (boolean) (default: OFF, when BUILD_RELEASE=ON)
-
-Tomahawk provides some tools that help highlight where crashes (of course we only crash in theory!) come from. To make them really useful, we need debug symbols to be available. If your distribution supports/allows it, you could put them into the -debug package.
-
-##### ```BUILD_HATCHET``` (boolean) (default: ON)
-
-Build the account plugin for Hatchet (http://hatchet.is). Requires [websocketpp](https://github.com/zaphoyd/websocketpp).
-
-##### ```BUILD_WITH_QT4``` (boolean) (default: ON)
-
-This enforces CMake to link against Qt4 regardless of whether Qt5 was found or not. Currently Qt4 is still our main development target, so this is still recommended. If you feel adventurous or are preparing Qt5 repositories for your distribution, feel free to give ```-DBUILD_WITH_QT4=OFF``` a shot.
-
-##### ```WITH_CRASHREPORTER``` (boolean) (default: ON)
-
-The crash reporter is built by default if libcrashreporter-qt is available in ```thirdparty/libcrashreporter-qt/``` (for example via git submodule). Usually distributions don't allow packagers to upload debug symbols to the Tomahawk HQ so to give crash reports more meaning for us, that's why we have no standardised submit process in place yet. If you can do that in your distribution, please get in touch with us!
-
-##### ```WITH_KDE``` (boolean) (default: ON)
-
-The KDE Telepathy plugin to configure Telepathy accounts from our Telepathy plugin can be disabled, if for some reason KDE is available in your build environment but you don't need this plugin.
-
-##### ```WITH_UPOWER``` (boolean) (default on Linux: ON)
-
-Build with support for UPower events.
-
-##### ```WITH_GNOMESHORTCUTHANDLER``` (boolean) (default on Linux: ON)
-
-Build with shortcut handler for GNOME.
-
-#### Runtime dependencies
-
-##### QSql
-
-If your distribution splits the QSqlite plugin for QSql into a separate package, make it a requirement of Tomahawk -  otherwise it might fail to start.
-
-##### XMPP / jreen
-
-Either jreen or (at least) Tomahawk's package should require the qca-ossl plugin, otherwise there will be no GTalk/Jabber support.
-
-### Icon caches
-
-In openSUSE there are macros for updating icon caches in KDE and GNOME (```%desktop_database_post[un]``` ```%icon_theme_cache_post[un]```) after [un]installation, check if your distribution offers the same.
-
-### Firewall
-
-Tomahawk offers P2P functionality, if your distribution offers a default firewall, it's nice to support a default profile for the standard Tomahawk P2P-port (50210). (cf. [openSUSE integration](https://build.opensuse.org/package/view_file/KDE:Extra/tomahawk/tomahawk.SuSEfirewall2?expand=1))

README

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

README.md

@@ -1,143 +0,0 @@
-# WHAT TOMAHAWK IS
-
-Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along with them. Let the music play!
-
-![Tomahawk Screenshot](/data/screenshots/tomahawk-screenshot.png?raw=true)
-
-## HOW TOMAHAWK WORKS
-
-Tomahawk is basically a **player for music metadata**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist, Tomahawk will find the right source, for the right user at the right time.  This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible.
-
-## MUSIC SOURCES
-
-* Local music library (MP3, Ogg, FLAC and many other formats)
-* Networked music libraries (other connected computers)
-
-### Subscription Music Services
-
-* Spotify
-* Beats Music
-* Google Play Music (on-demand streaming and music locker)
-* Grooveshark 
-* Rdio (Android only)
-* Deezer (Android only)
-
-### Free Streaming/Music Promotion Platforms
-
-* Soundcloud
-* Bandcamp
-* Last.fm
-* Jamendo
-* Official.fm
-
-### Network/Cloud storage
-
-* Ampache
-* Owncloud
-* Subsonic
-* Beets
-
-Third party-developed resolvers have also been written for services like YouTube, Qobuz and others. We've also heard of digital music distributors writing their own for their internal CMSes to help them navigate and preview their content. That's cool.
-
-Packaged binary resolvers (.axes) are available: [here](http://teom.org/axes).
-
-Source code (and examples) can be found in our [Resolver repository](https://github.com/tomahawk-player/tomahawk-resolvers).
-
-## DOWNLOAD TOMAHAWK
-
-You can download one of our nightly or stable builds:
-
-| *BUILD* | MAC / OSX | WINDOWS | LINUX |
-|:-------:|:---------:|:-------:|:-----:|
-|**NIGHTLY** | [**latest**](http://download.tomahawk-player.org/nightly/mac/Tomahawk-latest.dmg) | [**latest**](http://download.tomahawk-player.org/nightly/windows/tomahawk-latest.exe) | [**latest**](https://launchpad.net/~tomahawk/+archive/ubuntu/nightly) (Ubuntu) |
-|**STABLE** | [**0.8.3**](http://download.tomahawk-player.org/Tomahawk-0.8.3.dmg) | [**0.8.3**](http://download.tomahawk-player.org/tomahawk-0.8.3.exe) | [**0.8.3**](http://www.tomahawk-player.org/#page-about) (various distros) |
-
-## BUILD TOMAHAWK
-
-... or you can compile it yourself:
-
-    $ mkdir build && cd build
-    $ cmake ..
-    $ make
-
-### Detailed Build Instructions
-
-| Linux: | [Arch](http://wiki.tomahawk-player.org/index.php/Building_ArchLinux_package) **-** [Debian](http://wiki.tomahawk-player.org/index.php/Building_on_Debian) **-** [Fedora](http://wiki.tomahawk-player.org/index.php/Building_on_Fedora) **-** [openSUSE](http://wiki.tomahawk-player.org/index.php/Building_on_openSUSE) **-** [Ubuntu](http://wiki.tomahawk-player.org/index.php/Building_on_Ubuntu) |
-|------:|:------|
-| **Windows**: | [**Windows**](http://wiki.tomahawk-player.org/index.php/Building_Windows_Binary) |
-| **Mac**: | [**OS X**](http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle) |
-
-### Dependencies
-
-Required dependencies:
-
-* [CMake 3](http://www.cmake.org/)
-* [Qt 5.4.0](http://qt-project.org/)
-* [VLC 2.1.0](https://videolan.org/vlc/)
-* [SQLite 3.6.22](http://www.sqlite.org/)
-* [TagLib 1.8](http://developer.kde.org/~wheeler/taglib.html)
-* [Boost 1.3](http://www.boost.org/)
-* [Lucene++ 3.0.6](https://github.com/luceneplusplus/LucenePlusPlus/)
-* [libechonest 2.3.1](http://projects.kde.org/projects/playground/libs/libechonest/)
-* [Attica 5.6.0](http://ftp.kde.org/stable/attica/)
-* [QuaZip 0.4.3](http://quazip.sourceforge.net/)
-* [liblastfm 1.0.9](https://github.com/lastfm/liblastfm/)
-* [QtKeychain 0.1](https://github.com/frankosterfeld/qtkeychain/)
-* [Sparsehash](https://code.google.com/p/sparsehash/)
-* [GnuTLS](http://gnutls.org/)
-
-The following dependencies are optional (but *recommended*):
-
-* [Jreen 1.1.1](http://qutim.org/jreen/)
-* [Snorenotify 0.5.2](https://github.com/Snorenotify/Snorenotify/)
-
-Third party libraries that we ship with our source:
-
-* [MiniUPnP 1.6](http://miniupnp.free.fr/)
-* [Qocoa](https://github.com/mikemcquaid/Qocoa/)
-* [libqnetwm](https://code.google.com/p/libqnetwm/)
-* [libqxt](http://libqxt.org/) (QxtWeb module)
-* [SPMediaKeyTap](https://github.com/nevyn/SPMediaKeyTap/)
-* [kdSingleApplicationGuard](http://www.kdab.com/)
-
-## SUPPORT TOMAHAWK
-
-* [Bug / Issue Tracker](https://bugs.tomahawk-player.org/secure/Dashboard.jspa)
-* [Translations](https://www.transifex.com/projects/p/tomahawk/)
-* [Donations](https://flattr.com/thing/169312/Tomahawk)
-
-## GET HELP
-
-* [Support & Feedback](https://tomahawk.uservoice.com)
-* Chat with us in IRC: **#tomahawk** on Freenode, and [Scrollback.io](https://scrollback.io/tomahawk)
-* [Twitter](https://twitter.com/tomahawk)
-* [Facebook](https://facebook.com/tomahawkplayer)
-* [Developer API Documentation](http://dev.tomahawk-player.org/api/classes.html)
-
-## SCREENSHOTS
-
-BROWSE FRIENDS' MUSIC & LISTEN ALONG
-
-![Browse](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998050088_listen-along.jpg)
-
-INBOX - RECEIVED & FORWARDING
-
-![Inbox](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997751044_inbox.jpg)
-
-CHARTS - BILLBOARD'S TASTEMAKER ALBUMS
-
-![Charts](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997901969_charts.jpg)
-
-FRIEND FEED
-
-![Feed](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410971283885_heroshot.png)
-
-DYNAMIC (AUTO-UPDATING) PLAYLIST
-
-![Xspf](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998362549_dynamic-playlist-1.jpg)
-
-PLUG-INS / RESOLVER SETTINGS
-
-![Settings](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998587408_prefs.jpg)
-
-##Enjoy!

TomahawkAddLibrary.cmake

@@ -1,115 +0,0 @@
-include( CMakeParseArguments )
-
-function(tomahawk_add_library)
-    # parse arguments (name needs to be saved before passing ARGN into the macro)
-    set(NAME ${ARGV0})
-    set(options NO_INSTALL NO_VERSION)
-    set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR)
-    set(multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS QT5_MODULES)
-    cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(LIBRARY_NAME ${NAME})
-
-
-#     message("*** Arguments for ${LIBRARY_NAME}")
-#     message("Sources: ${LIBRARY_SOURCES}")
-#     message("Link libraries: ${LIBRARY_LINK_LIBRARIES}")
-#     message("UI: ${LIBRARY_UI}")
-#     message("TARGET_TYPE: ${LIBRARY_TARGET_TYPE}")
-#     message("EXPORT_MACRO: ${LIBRARY_EXPORT_MACRO}")
-#     message("NO_INSTALL: ${LIBRARY_NO_INSTALL}")
-
-    set(target ${LIBRARY_NAME})
-
-    # qt stuff
-    include_directories(${CMAKE_CURRENT_LIST_DIR})
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-    if(LIBRARY_UI)
-        qt_wrap_ui(LIBRARY_UI_SOURCES ${LIBRARY_UI})
-        list(APPEND LIBRARY_SOURCES ${LIBRARY_UI_SOURCES})
-    endif()
-
-    # add resources from current dir
-    if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources.qrc")
-        qt_add_resources(LIBRARY_RC_SOURCES "resources.qrc")
-        list(APPEND LIBRARY_SOURCES ${LIBRARY_RC_SOURCES})
-        unset(LIBRARY_RC_SOURCES)
-    endif()
-
-    # add target
-    if(LIBRARY_TARGET_TYPE STREQUAL "STATIC")
-        add_library(${target} STATIC ${LIBRARY_SOURCES})
-    elseif(LIBRARY_TARGET_TYPE STREQUAL "MODULE")
-        add_library(${target} MODULE ${LIBRARY_SOURCES})
-    else() # default
-        add_library(${target} SHARED ${LIBRARY_SOURCES})
-    endif()
-
-    # HACK: add qt modules - every lib should define its own set of modules
-    qt5_use_modules(${target} Core Network Widgets Sql Xml ${LIBRARY_QT5_MODULES})
-
-    # definitions - can this be moved into set_target_properties below?
-    add_definitions(${QT_DEFINITIONS})
-    set_target_properties(${target} PROPERTIES AUTOMOC TRUE)
-
-    if(LIBRARY_EXPORT_MACRO)
-        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_EXPORT_MACRO})
-    endif()
-
-    if(LIBRARY_COMPILE_DEFINITIONS)
-        # Dear CMake, i hate you! Sincerely, domme
-        # At least in CMake 2.8.8, you CANNOT set more than one COMPILE_DEFINITIONS value
-        # only takes the first one if called multiple times or bails out with wrong number of arguments
-        # when passing in a list, thus i redefine the export macro here in hope it won't mess up other targets
-        # Dear domme,
-        # "The COMPILE_DEFINITIONS property may be set to a semicolon-separated list"
-        # Sincerely, CMake Documentation
-        add_definitions( "-D${LIBRARY_EXPORT_MACRO}" )
-
-        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_COMPILE_DEFINITIONS})
-    endif()
-
-    # add link targets
-    target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
-    if(LIBRARY_LINK_LIBRARIES)
-        target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES})
-    endif()
-    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
-        target_link_libraries(${target} LINK_PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES})
-    endif()
-
-    # add soversion
-    if(NOT LIBRARY_NO_VERSION)
-        set_target_properties(${target} PROPERTIES VERSION ${LIBRARY_VERSION})
-
-        if(NOT LIBRARY_SOVERSION)
-            set(LIBRARY_SOVERSION ${LIBRARY_VERSION})
-        endif()
-
-        set_target_properties(${target} PROPERTIES SOVERSION ${LIBRARY_SOVERSION})
-    endif()
-
-
-    if(NOT LIBRARY_INSTALL_BINDIR)
-        set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
-    endif()
-
-    # make installation optional, maybe useful for dummy plugins one day
-    if(NOT LIBRARY_NO_INSTALL)
-        include(GNUInstallDirs)
-        if(NOT LIBRARY_EXPORT)
-            install( TARGETS ${target}
-                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            )
-        else()
-            install( TARGETS ${target}
-                EXPORT ${LIBRARY_EXPORT}
-                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            )
-        endif()
-    endif()
-endfunction()

TomahawkAddPlugin.cmake

@@ -1,55 +0,0 @@
-include( CMakeParseArguments )
-include( ${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake )
-
-function(tomahawk_add_plugin)
-    # parse arguments (name needs to be saved before passing ARGN into the macro)
-    set(NAME ${ARGV0})
-    set(options NO_INSTALL SHARED_LIB)
-    set(oneValueArgs NAME TYPE EXPORT_MACRO)
-    set(multiValueArgs SOURCES UI LINK_LIBRARIES COMPILE_DEFINITIONS)
-    cmake_parse_arguments(PLUGIN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(PLUGIN_NAME ${NAME})
-
-#     message("*** Arguments for ${PLUGIN_NAME}")
-#     message("Sources: ${PLUGIN_SOURCES}")
-#     message("Link libraries: ${PLUGIN_LINK_LIBRARIES}")
-#     message("UI: ${PLUGIN_UI}")
-#     message("TYPE: ${PLUGIN_TYPE}")
-#     message("EXPORT_MACRO: ${PLUGIN_EXPORT_MACRO}")
-#     message("NO_INSTALL: ${PLUGIN_NO_INSTALL}")
-
-    # create target name once for convenience
-    set(target "tomahawk_${PLUGIN_TYPE}_${PLUGIN_NAME}")
-
-    # determine target type
-    if(NOT ${PLUGIN_SHARED_LIB})
-        set(target_type "MODULE")
-    else()
-        set(target_type "SHARED")
-    endif()
-
-    list(APPEND tomahawk_add_library_args
-      "${target}"
-      "EXPORT_MACRO" "${PLUGIN_EXPORT_MACRO}"
-      "TARGET_TYPE" "${target_type}"
-      "SOURCES" "${PLUGIN_SOURCES}"
-    )
-
-    if(PLUGIN_UI)
-        list(APPEND tomahawk_add_library_args "UI" "${PLUGIN_UI}")
-    endif()
-
-    if(PLUGIN_LINK_LIBRARIES)
-        list(APPEND tomahawk_add_library_args "LINK_LIBRARIES" "${PLUGIN_LINK_LIBRARIES}")
-    endif()
-
-    if(PLUGIN_COMPILE_DEFINITIONS)
-        list(APPEND tomahawk_add_library_args "COMPILE_DEFINITIONS" ${PLUGIN_COMPILE_DEFINITIONS})
-    endif()
-
-    list(APPEND tomahawk_add_library_args "NO_VERSION")
-
-    list(APPEND tomahawk_add_library_args "INSTALL_BINDIR" "${CMAKE_INSTALL_LIBDIR}")
-
-    tomahawk_add_library(${tomahawk_add_library_args})
-endfunction()

TomahawkBuildTreeSettings.cmake.in

@@ -1,4 +0,0 @@
-set(TOMAHAWK_INCLUDE_DIRS
-  "@PROJECT_SOURCE_DIR@/src/libtomahawk"
-  "@PROJECT_BINARY_DIR@/src/libtomahawk"
-)

TomahawkCPack.cmake

@@ -7,7 +7,7 @@ SET( CPACK_PACKAGE_FILE_NAME  tomahawk-${TOMAHAWK_VERSION} )    # Package file n
 # CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
 # CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
 # CPACK_INSTALL_CMAKE_PROJECTS    List of four values: Build directory, Project Name, Project Component, Directory in the package     /home/andy/vtk/CMake-bin;CMake;ALL;/
-SET( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README.md" ) # File used as a description of a project     /path/to/project/ReadMe.txt
+SET( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README" ) # File used as a description of a project     /path/to/project/ReadMe.txt
 SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${TOMAHAWK_DESCRIPTION_SUMMARY} ) #  Description summary of a project
 # CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
 SET( CPACK_PACKAGE_INSTALL_DIRECTORY  ${TOMAHAWK_APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody

TomahawkConfig.cmake.in

@@ -1,24 +0,0 @@
-# - Config file for the Tomahawk package
-# It defines the following variables
-#  TOMAHAWK_INCLUDE_DIRS - include directories for Tomahawk
-#  TOMAHAWK_LIBRARIES    - libraries to link against
-#  TOMAHAWK_EXECUTABLE   - the bar executable
-
-# Compute paths
-get_filename_component(TOMAHAWK_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-if(EXISTS "${TOMAHAWK_CMAKE_DIR}/CMakeCache.txt")
-   # In build tree
-   include("${TOMAHAWK_CMAKE_DIR}/TomahawkBuildTreeSettings.cmake")
-else()
-   set(TOMAHAWK_INCLUDE_DIRS "${TOMAHAWK_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@/libtomahawk")
-endif()
-
-# Our library dependencies (contains definitions for IMPORTED targets)
-include("${TOMAHAWK_CMAKE_DIR}/TomahawkLibraryDepends.cmake")
-
-# These are IMPORTED targets created by TomahawkLibraryDepends.cmake
-set(TOMAHAWK_LIBRARIES tomahawklib)
-set(TOMAHAWK_USE_FILE "${TOMAHAWK_CMAKE_DIR}/TomahawkUse.cmake")
-set(TOMAHAWK_DEFINITIONS "@TOMAHAWK_DEFINITIONS@")
-set(TOMAHAWK_CXX_FLAGS "@TOMAHAWK_CXX_FLAGS@")
-set(TOMAHAWK_C_FLAGS "@TOMAHAWK_C_FLAGS@")

TomahawkConfigVersion.cmake.in

@@ -1,12 +0,0 @@
-set(PACKAGE_VERSION "@TOMAHAWK_VERSION@")
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
-  set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
-  set(PACKAGE_VERSION_COMPATIBLE TRUE)
-  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
-    set(PACKAGE_VERSION_EXACT TRUE)
-  endif()
-endif()
-

TomahawkUse.cmake.in

@@ -1,112 +0,0 @@
-#FIXME: this duplicates top level cmakelists: how can we reduce code duplication?
-
-set( TOMAHAWK_QT5 @TOMAHAWK_QT5@ )
-
-if(TOMAHAWK_QT5)
-    message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
-
-    # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
-    find_package(Qt5Core REQUIRED)
-    find_package(Qt5Concurrent REQUIRED)
-    find_package(Qt5Svg REQUIRED)
-    find_package(Qt5UiTools REQUIRED)
-    find_package(Qt5WebKitWidgets REQUIRED)
-    find_package(Qt5Widgets REQUIRED)
-    find_package(Qt5Xml REQUIRED)
-    find_package(Qt5Sql REQUIRED)
-
-    macro(qt_wrap_ui)
-        qt5_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt5_add_resources(${ARGN})
-    endmacro()
-
-    find_package(Qt5LinguistTools REQUIRED)
-    macro(qt_add_translation)
-        qt5_add_translation(${ARGN})
-    endmacro()
-
-    if( UNIX AND NOT APPLE )
-        # We need this to find the paths to qdbusxml2cpp and co
-        find_package(Qt5DBus REQUIRED)
-    endif()
-
-    if(APPLE)
-        find_package(Qt5MacExtras REQUIRED)
-    endif()
-
-    if(WIN32)
-        find_package(Qt5WinExtras REQUIRED)
-    endif()
-
-    macro(qt_wrap_ui)
-        qt5_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt5_add_resources(${ARGN})
-    endmacro()
-
-    find_package(Qt5LinguistTools REQUIRED)
-    macro(qt_add_translation)
-        qt5_add_translation(${ARGN})
-    endmacro()
-
-    if( UNIX AND NOT APPLE )
-        macro(qt_add_dbus_interface)
-            qt5_add_dbus_interface(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_adaptor)
-            qt5_add_dbus_adaptor(${ARGN})
-        endmacro()
-    endif()
-
-    macro(setup_qt)
-    endmacro()
-
-    set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-    #FIXME: CrashReporter depends on deprecated QHttp
-    set(WITH_KDE4 OFF)
-
-else(TOMAHAWK_QT5)
-    find_package(Qt4 COMPONENTS QtNetwork QtCore QtGui QtSql REQUIRED)
-    include( ${QT_USE_FILE} )
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-    if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
-        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
-    endif()
-
-    find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS})
-    include( ${QT_USE_FILE} )
-
-    macro(qt5_use_modules)
-    endmacro()
-
-    macro(qt_wrap_ui)
-        qt4_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt4_add_resources(${ARGN})
-    endmacro()
-
-    macro(qt_add_translation)
-        qt4_add_translation(${ARGN})
-    endmacro()
-endif(TOMAHAWK_QT5)
-
-
-if(NOT TOMAHAWK_CMAKE_DIR)
-    set(TOMAHAWK_CMAKE_DIR ${CMAKE_CURRENT_LIST_DIR})
-endif()
-
-include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddLibrary.cmake" )
-include( "${TOMAHAWK_CMAKE_DIR}/TomahawkAddPlugin.cmake" )
-
-add_definitions( ${TOMAHAWK_DEFINITIONS} )
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TOMAHAWK_CXX_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TOMAHAWK_C_FLAGS}")

admin/mac/Info.plist

@@ -23,11 +23,7 @@
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7.0</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<true />
+	<string>10.5.0</string>
 	<key>SUFeedURL</key>
 	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
 	<key>SUPublicDSAKeyFile</key>
@@ -63,174 +59,6 @@
 			<key>CFBundleTypeRole</key>
 			<string>Viewer</string>
 		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>jspf</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>Generic.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>application/jspf</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>JSPF Playlist</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>mp3</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>mp3.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/mpeg</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>MPEG Audio Layer 3</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>oga</string>
-				<string>ogg</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>ogg.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/ogg</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Ogg Audio File</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>opus</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>ogg.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/opus</string>
-				<string>application/opus</string>
-				<string>audio/ogg; codecs=opus</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>OPUS file</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>aac</string>
-				<string>mp4</string>
-				<string>m4a</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/aac</string>
-				<string>audio/mp4</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>AAC file</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>mpc</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/x-musepack</string>
-				<string>audio/mpc</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Musepack Audio File</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>wma</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/x-ms-wma</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Windows Media Audio</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>flac</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/flac</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>FLAC Audio File</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>aiff</string>
-				<string>aif</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/aiff</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>AIFF File</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>wv</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>audio.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>audio/x-wavpack</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>WavePack Audio File</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-		</dict>
 	</array>
 </dict>
 </plist>

admin/mac/build-release-osx.sh

@@ -1,11 +1,9 @@
 #!/bin/bash
 #
-# Usage: ./admin/mac/build-release-osx.sh VERSION CERT_SIGNER [--no-clean]
+# Usage: ./admin/mac/build-release-osx.sh [--no-clean]
 #
 ################################################################################
 
-set -e
-
 
 function header {
     echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -18,43 +16,40 @@ function die {
 }
 ################################################################################
 
-if [ -z "$2" ]
+if [ -z $1 ]
 then
-    echo This script expects the version number and cert-signer as parameters, e.g. "1.0.0 John Doe"
+    echo This script expects the version number as a parameter, e.g. 1.0.0
     exit 1
 fi
 
 ROOT=`pwd`
 VERSION=$1
-CERT_SIGNER=$2
 
 ################################################################################
 
+    mv tomahawk.app Tomahawk.app
+    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
+
     header "Fixing and copying libraries"
     $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
 
     cd Tomahawk.app
 
+    header "Renaming icon"
+    mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
     cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
-#    header "Copying Sparkle framework"
-#    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-
+    header "Copying Sparkle framework"
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
+    
     header "Creating DMG"
     cd ..
 
-    header "Signing bundle"
-#    codesign -s "Developer ID Application: $CERT_SIGNER" -f -v ./Tomahawk.app
-
-    if [ -f ~/sign_step.sh ];
-    then
-        ~/sign_step.sh "$CERT_SIGNER" "Tomahawk.app" || true
-    fi
-
     $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
     mv Tomahawk.dmg Tomahawk-$VERSION.dmg
-
+    
     header "Creating signed Sparkle update"
     $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
+    mv Tomahawk.app tomahawk.app
 
     header "Done!"

admin/mac/macdeploy.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-#  This file is part of Tomahawk.
+#  This file is part of Tomahawk. 
 #  It was inspired in large part by the macdeploy script in Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
@@ -20,169 +20,171 @@ import re
 import subprocess
 import commands
 import sys
-import glob
 
 FRAMEWORK_SEARCH_PATH=[
     '/Library/Frameworks',
     os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]
 
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
+
+LIBSPOTIFY_VERSION = commands.getoutput("brew ls -version libspotify | tr -s \" \" \"\\\\012\" | tail -n 1").strip()
+LIBSPOTIFY_PATH = "/usr/local/lib/libspotify.%s.dylib" % LIBSPOTIFY_VERSION
 
 VLC_PLUGINS=[
-  'access/libattachment_plugin.dylib',
-  #'access/libaccess_avio_plugin.dylib',
-  #'access/libaccess_fake_plugin.dylib',
-  'access/libftp_plugin.dylib',
-  'access/libhttp_plugin.dylib',
-  'access/libimem_plugin.dylib',
-  #'access/libaccess_mmap_plugin.dylib',
-  'access/libaccess_mms_plugin.dylib',
-  'access/libaccess_realrtsp_plugin.dylib',
-  'access/libtcp_plugin.dylib',
-  'access/libudp_plugin.dylib',
-  'access/libcdda_plugin.dylib',
-  'access/libfilesystem_plugin.dylib',
-  'access/libqtcapture_plugin.dylib',
-  'access/librtp_plugin.dylib',
-  'access/libzip_plugin.dylib',
-  'access_output/libaccess_output_dummy_plugin.dylib',
-  'access_output/libaccess_output_file_plugin.dylib',
-  'access_output/libaccess_output_http_plugin.dylib',
-  'access_output/libaccess_output_shout_plugin.dylib',
-  'access_output/libaccess_output_udp_plugin.dylib',
-  'audio_filter/liba52tofloat32_plugin.dylib',
-  'audio_filter/liba52tospdif_plugin.dylib',
-  'audio_filter/libaudio_format_plugin.dylib',
-  'audio_filter/libaudiobargraph_a_plugin.dylib',
-  'audio_filter/libchorus_flanger_plugin.dylib',
-  #'libconverter_fixed_plugin.dylib',
-  'audio_filter/libdolby_surround_decoder_plugin.dylib',
-  'audio_filter/libdtstofloat32_plugin.dylib',
-  'audio_filter/libdtstospdif_plugin.dylib',
-  'audio_filter/libequalizer_plugin.dylib',
-  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
-  'audio_filter/libmono_plugin.dylib',
-  'audio_filter/libmpgatofixed32_plugin.dylib',
-  'audio_filter/libnormvol_plugin.dylib',
-  'audio_filter/libparam_eq_plugin.dylib',
-  'audio_filter/libscaletempo_plugin.dylib',
-  'audio_filter/libsimple_channel_mixer_plugin.dylib',
-  'audio_filter/libspatializer_plugin.dylib',
-  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
-  'audio_filter/libugly_resampler_plugin.dylib',
-  'audio_mixer/libfloat_mixer_plugin.dylib',
+  'libaccess_attachment_plugin.dylib',
+  #'libaccess_avio_plugin.dylib',
+  #'libaccess_fake_plugin.dylib',
+  'libaccess_ftp_plugin.dylib',
+  'libaccess_http_plugin.dylib',
+  'libaccess_imem_plugin.dylib',
+  #'libaccess_mmap_plugin.dylib',
+  'libaccess_mms_plugin.dylib',
+  'libaccess_realrtsp_plugin.dylib',
+  'libaccess_tcp_plugin.dylib',
+  'libaccess_udp_plugin.dylib',
+  'libcdda_plugin.dylib',
+  'libfilesystem_plugin.dylib',
+  'libqtcapture_plugin.dylib',
+  'librtp_plugin.dylib',
+  'libzip_plugin.dylib',
+  'libaccess_output_dummy_plugin.dylib',
+  'libaccess_output_file_plugin.dylib',
+  'libaccess_output_http_plugin.dylib',
+  'libaccess_output_shout_plugin.dylib',
+  'libaccess_output_udp_plugin.dylib',
+  'liba52tofloat32_plugin.dylib',
+  'liba52tospdif_plugin.dylib',
+  'libaudio_format_plugin.dylib',
+  'libaudiobargraph_a_plugin.dylib',
+  'libchorus_flanger_plugin.dylib',
+  'libconverter_fixed_plugin.dylib',
+  'libdolby_surround_decoder_plugin.dylib',
+  'libdtstofloat32_plugin.dylib',
+  'libdtstospdif_plugin.dylib',
+  'libequalizer_plugin.dylib',
+  'libheadphone_channel_mixer_plugin.dylib',
+  'libmono_plugin.dylib',
+  'libmpgatofixed32_plugin.dylib',
+  'libnormvol_plugin.dylib',
+  'libparam_eq_plugin.dylib',
+  'libscaletempo_plugin.dylib',
+  'libsimple_channel_mixer_plugin.dylib',
+  'libspatializer_plugin.dylib',
+  'libtrivial_channel_mixer_plugin.dylib',
+  'libugly_resampler_plugin.dylib',
+  'libfloat32_mixer_plugin.dylib',
   #'libspdif_mixer_plugin.dylib',
   #'libtrivial_mixer_plugin.dylib',
-  #'libaout_file_plugin.dylib',
-  'audio_output/libauhal_plugin.dylib',
-  'codec/liba52_plugin.dylib',
-  'codec/libadpcm_plugin.dylib',
-  'codec/libaes3_plugin.dylib',
-  'codec/libaraw_plugin.dylib',
-  'codec/libavcodec_plugin.dylib',
-  'codec/libcc_plugin.dylib',
-  'codec/libcdg_plugin.dylib',
-  'codec/libdts_plugin.dylib',
-  'codec/libfaad_plugin.dylib',
+  'libaout_file_plugin.dylib',
+  'libauhal_plugin.dylib',
+  'liba52_plugin.dylib',
+  'libadpcm_plugin.dylib',
+  'libaes3_plugin.dylib',
+  'libaraw_plugin.dylib',
+  'libavcodec_plugin.dylib',
+  'libcc_plugin.dylib',
+  'libcdg_plugin.dylib',
+  'libdts_plugin.dylib',
+  'libfaad_plugin.dylib',
   #'libfake_plugin.dylib',
-  'codec/libflac_plugin.dylib',
-  #'libfluidsynth_plugin.dylib',
+  'libflac_plugin.dylib',
+  'libfluidsynth_plugin.dylib',
   #'libinvmem_plugin.dylib',
-  'codec/liblpcm_plugin.dylib',
-  'codec/libmpeg_audio_plugin.dylib',
-  'codec/libpng_plugin.dylib',
-  'codec/librawvideo_plugin.dylib',
-  'codec/libspeex_plugin.dylib',
-  'codec/libspudec_plugin.dylib',
-  'codec/libtheora_plugin.dylib',
-  'codec/libtwolame_plugin.dylib',
-  'codec/libvorbis_plugin.dylib',
-  #'control/libgestures_plugin.dylib',
-  #'libhotkeys_plugin.dylib',
-  #'libmotion_plugin.dylib',
-  #'libnetsync_plugin.dylib',
+  'liblpcm_plugin.dylib',
+  'libmpeg_audio_plugin.dylib',
+  'libpng_plugin.dylib',
+  'librawvideo_plugin.dylib',
+  'libspeex_plugin.dylib',
+  'libspudec_plugin.dylib',
+  'libtheora_plugin.dylib',
+  'libtwolame_plugin.dylib',
+  'libvorbis_plugin.dylib',
+  'libgestures_plugin.dylib',
+  'libhotkeys_plugin.dylib',
+  'libmotion_plugin.dylib',
+  'libnetsync_plugin.dylib',
   #'libsignals_plugin.dylib',
-  'demux/libaiff_plugin.dylib',
-  'demux/libasf_plugin.dylib',
-  'demux/libau_plugin.dylib',
+  'libaiff_plugin.dylib',
+  'libasf_plugin.dylib',
+  'libau_plugin.dylib',
   #'libavformat_plugin.dylib',
-  'demux/libavi_plugin.dylib',
-  'demux/libdemux_cdg_plugin.dylib',
-  'demux/libdemuxdump_plugin.dylib',
-  'demux/libdiracsys_plugin.dylib',
-  'demux/libes_plugin.dylib',
-  'demux/libflacsys_plugin.dylib',
-  'access/liblive555_plugin.dylib',
-  'demux/libmkv_plugin.dylib',
-  'demux/libmod_plugin.dylib',
-  'demux/libmp4_plugin.dylib',
-  'demux/libmpc_plugin.dylib',
-  'demux/libmpgv_plugin.dylib',
-  'demux/libnsc_plugin.dylib',
-  'demux/libnsv_plugin.dylib',
-  'demux/libnuv_plugin.dylib',
-  'demux/libogg_plugin.dylib',
-  'demux/libplaylist_plugin.dylib',
-  'demux/libps_plugin.dylib',
-  'demux/libpva_plugin.dylib',
-  'demux/librawaud_plugin.dylib',
-  'demux/librawdv_plugin.dylib',
-  'demux/librawvid_plugin.dylib',
-  'demux/libreal_plugin.dylib',
-  'demux/libsmf_plugin.dylib',
-  'demux/libts_plugin.dylib',
-  'demux/libtta_plugin.dylib',
-  'demux/libty_plugin.dylib',
-  'demux/libvc1_plugin.dylib',
-  'demux/libvoc_plugin.dylib',
-  'demux/libwav_plugin.dylib',
-  'demux/libxa_plugin.dylib',
-  'meta_engine/libfolder_plugin.dylib',
-  'meta_engine/libtaglib_plugin.dylib',
-  #'libaudioscrobbler_plugin.dylib',
-  'control/libdummy_plugin.dylib',
-  'misc/libexport_plugin.dylib',
-  #'libfreetype_plugin.dylib',
-  #'libgnutls_plugin.dylib',
-  'misc/liblogger_plugin.dylib',
-  'lua/liblua_plugin.dylib',
-  #'libosd_parser_plugin.dylib',
-  #'libquartztext_plugin.dylib',
-  #'libstats_plugin.dylib',
-  'misc/libvod_rtsp_plugin.dylib',
-  'misc/libxml_plugin.dylib',
+  'libavi_plugin.dylib',
+  'libdemux_cdg_plugin.dylib',
+  'libdemuxdump_plugin.dylib',
+  'libdirac_plugin.dylib',
+  'libes_plugin.dylib',
+  'libflacsys_plugin.dylib',
+  'liblive555_plugin.dylib',
+  'libmkv_plugin.dylib',
+  'libmod_plugin.dylib',
+  'libmp4_plugin.dylib',
+  'libmpc_plugin.dylib',
+  'libmpgv_plugin.dylib',
+  'libnsc_plugin.dylib',
+  'libnsv_plugin.dylib',
+  'libnuv_plugin.dylib',
+  'libogg_plugin.dylib',
+  'libplaylist_plugin.dylib',
+  'libps_plugin.dylib',
+  'libpva_plugin.dylib',
+  'librawaud_plugin.dylib',
+  'librawdv_plugin.dylib',
+  'librawvid_plugin.dylib',
+  'libreal_plugin.dylib',
+  'libsmf_plugin.dylib',
+  'libts_plugin.dylib',
+  'libtta_plugin.dylib',
+  'libty_plugin.dylib',
+  'libvc1_plugin.dylib',
+  'libvoc_plugin.dylib',
+  'libwav_plugin.dylib',
+  'libxa_plugin.dylib',
+  'libfolder_plugin.dylib',
+  'libtaglib_plugin.dylib',
+  'libaudioscrobbler_plugin.dylib',
+  'libdummy_plugin.dylib',
+  'libexport_plugin.dylib',
+  'libfreetype_plugin.dylib',
+  'libgnutls_plugin.dylib',
+  'liblogger_plugin.dylib',
+  'liblua_plugin.dylib',
+  'libosd_parser_plugin.dylib',
+  'libquartztext_plugin.dylib',
+  'libstats_plugin.dylib',
+  'libvod_rtsp_plugin.dylib',
+  'libxml_plugin.dylib',
   #'libxtag_plugin.dylib',
-  'video_chroma/libi420_rgb_mmx_plugin.dylib',
-  'video_chroma/libi420_yuy2_mmx_plugin.dylib',
-  'video_chroma/libi422_yuy2_mmx_plugin.dylib',
-  #'libmemcpymmx_plugin.dylib',
-  #'libmemcpymmxext_plugin.dylib',
-  'mux/libmux_asf_plugin.dylib',
-  'mux/libmux_avi_plugin.dylib',
-  'mux/libmux_dummy_plugin.dylib',
-  'mux/libmux_mp4_plugin.dylib',
-  'mux/libmux_mpjpeg_plugin.dylib',
-  'mux/libmux_ogg_plugin.dylib',
-  'mux/libmux_ps_plugin.dylib',
-  'mux/libmux_ts_plugin.dylib',
-  'mux/libmux_wav_plugin.dylib',
-  'packetizer/libpacketizer_copy_plugin.dylib',
-  'packetizer/libpacketizer_dirac_plugin.dylib',
-  'packetizer/libpacketizer_flac_plugin.dylib',
-  'packetizer/libpacketizer_h264_plugin.dylib',
-  'packetizer/libpacketizer_mlp_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
-  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
-  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
-  'packetizer/libpacketizer_vc1_plugin.dylib',
-  'video_chroma/libi420_rgb_sse2_plugin.dylib',
-  'video_chroma/libi420_yuy2_sse2_plugin.dylib',
-  'video_chroma/libi422_yuy2_sse2_plugin.dylib',
-  'stream_filter/libdecomp_plugin.dylib',
-  #'access/libstream_filter_rar_plugin.dylib',
-  'stream_filter/librecord_plugin.dylib',
-  #'libvisual_plugin.dylib',
+  'libi420_rgb_mmx_plugin.dylib',
+  'libi420_yuy2_mmx_plugin.dylib',
+  'libi422_yuy2_mmx_plugin.dylib',
+  'libmemcpymmx_plugin.dylib',
+  'libmemcpymmxext_plugin.dylib',
+  'libmux_asf_plugin.dylib',
+  'libmux_avi_plugin.dylib',
+  'libmux_dummy_plugin.dylib',
+  'libmux_mp4_plugin.dylib',
+  'libmux_mpjpeg_plugin.dylib',
+  'libmux_ogg_plugin.dylib',
+  'libmux_ps_plugin.dylib',
+  'libmux_ts_plugin.dylib',
+  'libmux_wav_plugin.dylib',
+  'libpacketizer_copy_plugin.dylib',
+  'libpacketizer_dirac_plugin.dylib',
+  'libpacketizer_flac_plugin.dylib',
+  'libpacketizer_h264_plugin.dylib',
+  'libpacketizer_mlp_plugin.dylib',
+  'libpacketizer_mpeg4audio_plugin.dylib',
+  'libpacketizer_mpeg4video_plugin.dylib',
+  'libpacketizer_mpegvideo_plugin.dylib',
+  'libpacketizer_vc1_plugin.dylib',
+  'libi420_rgb_sse2_plugin.dylib',
+  'libi420_yuy2_sse2_plugin.dylib',
+  'libi422_yuy2_sse2_plugin.dylib',
+  'libdecomp_plugin.dylib',
+  'libstream_filter_rar_plugin.dylib',
+  'libstream_filter_record_plugin.dylib',
+  'libvisual_plugin.dylib',
 ]
 
 VLC_SEARCH_PATH=[
@@ -190,26 +192,20 @@ VLC_SEARCH_PATH=[
 ]
 
 QT_PLUGINS = [
-#    'crypto/libqca-ossl.dylib',
-    'platforms/libqcocoa.dylib',
+    'crypto/libqca-ossl.dylib',
+    'phonon_backend/phonon_vlc.so',
     'sqldrivers/libqsqlite.dylib',
     'imageformats/libqgif.dylib',
     'imageformats/libqico.dylib',
     'imageformats/libqjpeg.dylib',
-    'imageformats/libqsvg.dylib',
     'imageformats/libqmng.dylib',
 ]
 
-SNORE_PLUGINS = [
-#    'libsnore_backend_growl.so',
-#    'libsnore_backend_osxnotificationcenter.so',
-]
-
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.dylib',
+  'libtomahawk_account_xmpp.so',
   'libtomahawk_account_google.so',
+  'libtomahawk_account_twitter.so',
   'libtomahawk_account_zeroconf.so',
-#  'libtomahawk_account_hatchet.so',
   'libtomahawk_infoplugin_adium.so',
   'libtomahawk_infoplugin_charts.so',
   'libtomahawk_infoplugin_discogs.so',
@@ -219,22 +215,13 @@ TOMAHAWK_PLUGINS = [
   'libtomahawk_infoplugin_musixmatch.so',
   'libtomahawk_infoplugin_newreleases.so',
   'libtomahawk_infoplugin_rovi.so',
-#  'libtomahawk_infoplugin_snorenotify.so',
   'libtomahawk_infoplugin_spotify.so',
-  'libtomahawk_viewpage_dashboard.so',
-#  'libtomahawk_viewpage_networkactivity.so',
-  'libtomahawk_viewpage_charts.so',
-  'libtomahawk_viewpage_newreleases.so',
-  'libtomahawk_viewpage_whatsnew_0_8.so',
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt5/5.4.0/plugins',
+    '/usr/local/Cellar/qt/4.8.2/plugins',
 ]
 
-SNORE_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/snorenotify/HEAD/lib/libsnore',
-]
 
 class Error(Exception):
   pass
@@ -252,10 +239,6 @@ class CouldNotFindQtPluginError(Error):
   pass
 
 
-class CouldNotFindSnorePluginError(Error):
-  pass
-
-
 class CouldNotFindVLCPluginError(Error):
   pass
 
@@ -264,22 +247,19 @@ class CouldNotFindScriptPluginError(Error):
   pass
 
 
+
 if len(sys.argv) < 2:
   print 'Usage: %s <bundle.app>' % sys.argv[0]
 
 bundle_dir = sys.argv[1]
+
 bundle_name = os.path.basename(bundle_dir).split('.')[0]
 
 commands = []
-framework_paths = []
 
 binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
 frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
 commands.append(['mkdir', '-p', frameworks_dir])
-vlcplugins_dir = os.path.join(frameworks_dir, 'vlc', 'plugins')
-commands.append(['mkdir', '-p', vlcplugins_dir])
-snoreplugins_dir = os.path.join(binary_dir, 'libsnore')
-commands.append(['mkdir', '-p', snoreplugins_dir])
 resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
 commands.append(['mkdir', '-p', resources_dir])
 plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
@@ -391,12 +371,12 @@ def FixLibrary(path):
   for library in broken_libs['libs']:
     FixLibraryInstallPath(library, new_path)
 
-def FixVLCPlugin(abs_path):
+def FixVLCPlugin(abs_path, subdir):
   broken_libs = GetBrokenLibraries(abs_path)
   FixAllLibraries(broken_libs)
 
   #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  new_path = os.path.join(vlcplugins_dir, os.path.basename(abs_path))
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(abs_path))
   args = ['mkdir', '-p', os.path.dirname(new_path)]
   commands.append(args)
   args = ['ditto', '--arch=i386', '--arch=x86_64', abs_path, new_path]
@@ -449,14 +429,7 @@ def CopyFramework(path):
   for i, part in enumerate(parts):
     if re.match(r'\w+\.framework', part):
       full_path = os.path.join(frameworks_dir, *parts[i:-1])
-      framework_name = part.split(".framework")[0]
       break
-
-  if full_path in framework_paths:
-    return os.path.join(full_path, parts[-1])
-
-  framework_paths.append(full_path)
-
   args = ['mkdir', '-p', full_path]
   commands.append(args)
   args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path]
@@ -466,44 +439,9 @@ def CopyFramework(path):
 
   menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib')
   if os.path.exists(menu_nib):
-    args = ['cp', '-rf', menu_nib, resources_dir]
+    args = ['cp', '-r', menu_nib, resources_dir]
     commands.append(args)
 
-  # Fix framework structure for signing
-  path_base_dir = os.path.join(os.path.split(path)[0], '..', '..')
-  path_versions_dir = os.path.join(path_base_dir, 'Versions')
-
-  if not os.path.exists(os.path.join(full_path, 'Versions', 'Current')):
-    framework_base_dir = os.path.join(full_path, '..', '..')
-    framework_versions_dir = os.path.join(framework_base_dir, 'Versions')
-
-    versionParts = glob.glob(path_versions_dir+'/*')[0].split(os.sep)
-    args = ['ln', '-s', versionParts[-1], framework_versions_dir+'/Current']
-    commands.append(args)
-
-    args = ['ln', '-s', 'Versions/Current/'+framework_name, framework_base_dir+'/'+framework_name]
-    commands.append(args)
-
-    args = ['ln', '-s', 'Versions/Current/Resources', framework_base_dir+'/Resources']
-    commands.append(args)
-
-  # Copy Contents/Info.plist to Resources/Info.plist if Resources/Info.plist does not exist
-  # If Contents/Info.plist doesn't exist either, error out. If we actually see this, we can copy QtCore's Info.plist
-  info_plist_in_resources = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
-  if os.path.exists(info_plist_in_resources):
-    info_plist_in_contents = os.path.join(os.path.split(path)[0], '..', '..', 'Resources', 'Info.plist')
-    framework_resources_dir = os.path.join(framework_versions_dir, versionParts[-1], 'Resources')
-    args = ['mkdir', '-p', framework_resources_dir]
-    commands.append(args)
-    if os.path.exists(info_plist_in_contents):
-      args = ['cp', '-rf', info_plist_in_contents, framework_resources_dir]
-      commands.append(args)
-      args = ['chmod', '+rw', os.path.join(framework_resources_dir, 'Info.plist')]
-      commands.append(args)
-    else:
-      print "%s: Framework does not contain an Info.plist file in Resources/ folder." % (path)
-      sys.exit(-1)
-
   return os.path.join(full_path, parts[-1])
 
 def FixId(path, library_name):
@@ -553,12 +491,6 @@ def FindQtPlugin(name):
         return os.path.join(path, name)
   raise CouldNotFindQtPluginError(name)
 
-def FindSnorePlugin(name):
-  for path in SNORE_PLUGINS_SEARCH_PATH:
-    if os.path.exists(path):
-      if os.path.exists(os.path.join(path, name)):
-        return os.path.join(path, name)
-  raise CouldNotFindSnorePluginError(name)
 
 def FindVLCPlugin(name):
   for path in VLC_SEARCH_PATH:
@@ -570,19 +502,21 @@ def FindVLCPlugin(name):
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin))
+  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
 
 for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
-for plugin in SNORE_PLUGINS:
-  FixPlugin(FindSnorePlugin(plugin), '../MacOS/libsnore')
-
 try:
   FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
   print 'Failed to find tomahawk_crash_reporter'
 
+try:
+  FixPlugin(LIBSPOTIFY_PATH, "../Frameworks")
+except:
+  print "Failed to copy libspotify from os: %s" % LIBSPOTIFY_PATH
+
 for plugin in QT_PLUGINS:
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
 

admin/unix/tomahawk.desktop

@@ -3,19 +3,10 @@ Type=Application
 Version=1.0
 Name=Tomahawk
 GenericName=Music Player
-GenericName[de]=Musik Player
-GenericName[fi]=Musiikkisoitin
-GenericName[pl]=Odtwarzacz Muzyki
-GenericName[ro]=Redare muzică
-GenericName[se]=Musikspelare
 TryExec=tomahawk
 Exec=tomahawk %u
-Comment=Tomahawk — Multi Source Music Player
-Comment[fi]=Tomahawk – sosiaalinen musiikkisoitin
-Comment[pl]=Tomahawk – Społecznościowy Odtwarzacz Muzyki
-Comment[ro]=Tomahawk – Redare muzică în mod social
-Comment[se]=Tomahawk — Den Sociala Musikspelaren
+Comment=Tomahawk - Social Music Player
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;audio/aac;audio/mp4;audio/mpeg;audio/mpegurl;audio/vorbis;audio/x-flac;audio/x-mp3;audio/x-mpegurl;audio/x-ms-wma;audio/x-musepack;audio/x-oggflac;audio/opus;application/opus;audio/x-vorbis;application/x-ogm-audio;audio/x-vorbis+ogg;audio/ogg;application/xspf+xml;application/jspf;
+MimeType=x-scheme-handler/tomahawk;

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -5,11 +5,11 @@ SET(CMAKE_SYSTEM_NAME Windows)
 
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
-SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
-SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres CACHE FILEPATH "windres")
-SET(CMAKE_AR /usr/bin/${MINGW_PREFIX}-ar CACHE FILEPATH "ar")
-
+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
 SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -18,21 +18,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 
 
-## configure qt variables
-# generic
-SET(QMAKESPEC               win32-g++-cross)
-
-# dirs
-SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
-SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
-SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)
-
-SET(QT_QMAKE_EXECUTABLE     /usr/bin/${MINGW_PREFIX}-qmake CACHE FILEPATH "qmake" )
-SET(QT_MOC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-moc CACHE FILEPATH "moc")
-SET(QT_RCC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-rcc CACHE FILEPATH "rcc")
-SET(QT_UIC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-uic CACHE FILEPATH "uic")
-SET(QT_LRELEASE_EXECUTABLE  /usr/bin/${MINGW_PREFIX}-lrelease CACHE FILEPATH "lrelease")
-
-# phonon -_-
-SET(Automoc4_DIR	    "/usr/lib64/automoc4/")
+# configure qt variables
+SET(QT_LIBRARY_DIR  /usr/${MINGW_PREFIX}/bin)
+SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)

admin/win/update-vlc.sh

@@ -15,13 +15,13 @@ echo "Download phonon archive..."
 # 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/vlc.tar.bz2
+wget -c http://download.tomahawk-player.org/test/pvlc.tar.bz2
 
 echo "Extract binary..."
 # 7z x phonon*.7z
 # mv -v vlc-*/ vlc/
 # unzip tomahawk-vlc-0.1.zip
-tar xvjf vlc.tar.bz2
+tar xvjf pvlc.tar.bz2
 
 # echo "Download phonon_vlc_no_video.dll..."
 # wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
@@ -49,36 +49,11 @@ tar xvjf vlc.tar.bz2
 #     libtaglib_plugin.dll
 
 
-# this is for vlc-2.x
-cd vlc/plugins
-rm -rvf \
-    video_*/ \
-    gui/ \
-    **/libold* \
-    **/libvcd* \
-    **/libdvd* \
-    **/liblibass* \
-    **/libx264* \
-    **/libschroe* \
-    **/liblibmpeg2* \
-    **/libstream_out_* \
-    **/libmjpeg_plugin* \
-    **/libh264_plugin* \
-    **/libzvbi_plugin* \
-    **/lib*sub* \
-    services_discovery/ \
-    visualization/ \
-    control/ \
-    **/libi420* \
-    **/libi422* \
-    mux/ \
-    stream_filter/ \
-    **/libtheora_plugin* \
-    **/liblibbluray_plugin* \
-    **/libdtv_plugin* \
-    **/*.dll.a \
-    **/*.la \
-    misc/liblogger_plugin*
+# this is for vlc-1.2
+# rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
+#      */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub* \
+#      services_discover/ visualization/ control/ misc/
 
 
 echo "Downloaded and stripped VLC"
+

data/fonts/OFL.txt

@@ -1,92 +0,0 @@
-Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved.
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.

data/icons/tomahawk-icon.svg

@@ -1,14 +1,80 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="512px" height="512px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>tomahawk-icon-512x512</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Oval-1-+-Shape" sketch:type="MSLayerGroup" transform="translate(18.000000, 19.000000)">
-            <g id="Oval-1" transform="translate(0.927734, 0.927734)" fill-opacity="0.9" fill="#FFFFFF" sketch:type="MSShapeGroup">
-                <path d="M236.572266,473.144531 C367.227527,473.144531 473.144531,367.227527 473.144531,236.572266 C473.144531,105.917005 367.227527,0 236.572266,0 C105.917005,0 0,105.917005 0,236.572266 C0,367.227527 105.917005,473.144531 236.572266,473.144531 Z"></path>
-            </g>
-            <path d="M237.385542,0 C106.48012,0 -1.70530257e-13,106.48012 -1.70530257e-13,237.356928 C-1.70530257e-13,368.239458 106.48012,474.713855 237.385542,474.713855 C368.262349,474.713855 474.748193,368.239458 474.748193,237.356928 C474.74247,106.48012 368.262349,0 237.385542,0 L237.385542,0 Z M336.706325,394.261446 L336.706325,123.946386 L285.51506,123.946386 L280.07259,123.946386 L280.07259,215.672892 L152.234639,125.211145 C150.191566,123.774699 147.50753,123.58012 145.241265,124.684639 C142.975,125.875 141.567169,128.221386 141.567169,130.710843 L141.567169,342.761145 C141.567169,345.250602 142.975,347.574096 145.241265,348.73012 C146.208434,349.285241 147.284337,349.508434 148.337349,349.508434 C149.687952,349.508434 151.095783,349.062048 152.234639,348.289458 L280.07259,257.833434 L280.07259,418.137349 C266.343373,421.393675 252.081928,423.219277 237.385542,423.219277 C134.882831,423.219277 51.5231928,339.836747 51.5231928,237.362651 C51.5231928,134.888554 134.877108,51.5289157 237.385542,51.5289157 C339.859639,51.5289157 423.247892,134.882831 423.247892,237.362651 C423.242169,303.336145 388.647289,361.274699 336.706325,394.261446 L336.706325,394.261446 Z" id="Shape" fill="#FF004C" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="606.2478"
+   height="595.49866"
+   viewBox="0 0 606.24779 595.49863"
+   enable-background="new 0 0 841.89 595.28"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="tomahawk-icon.svg"><metadata
+   id="metadata15"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs13" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1440"
+   inkscape:window-height="794"
+   id="namedview11"
+   showgrid="false"
+   inkscape:zoom="1"
+   inkscape:cx="431.12548"
+   inkscape:cy="336.94553"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:snap-page="false"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0"><sodipodi:guide
+     position="-3.5728101e-05,-1.501866e-05"
+     orientation="0,841.89001"
+     id="guide2994" /><sodipodi:guide
+     position="841.88997,-1.501866e-05"
+     orientation="-595.28003,0"
+     id="guide2996" /><sodipodi:guide
+     position="841.88997,595.28001"
+     orientation="0,-841.89001"
+     id="guide2998" /><sodipodi:guide
+     position="-3.5728101e-05,595.28001"
+     orientation="595.28003,0"
+     id="guide3000" /></sodipodi:namedview>
+<g
+   id="g3"
+   transform="matrix(7.3080643,0,0,7.1790074,-2773.1692,-1839.0104)">
+	<g
+   id="g5">
+		<path
+   d="m 420.947,265.168 c -17.911,0 -32.477,14.565 -32.477,32.472 0,17.906 14.565,32.476 32.477,32.476 2.568,0 5.06,-0.318 7.459,-0.888 v -28.011 l -22.338,15.806 c -0.198,0.135 -0.444,0.213 -0.681,0.213 -0.184,0 -0.372,-0.039 -0.541,-0.136 -0.396,-0.202 -0.642,-0.608 -0.642,-1.043 v -37.053 c 0,-0.435 0.246,-0.845 0.642,-1.053 0.396,-0.193 0.864,-0.159 1.222,0.092 l 22.338,15.807 v -16.028 h 0.951 8.945 v 47.234 c 9.076,-5.764 15.121,-15.888 15.121,-27.417 10e-4,-17.905 -14.569,-32.471 -32.476,-32.471 z"
+   id="path7"
+   inkscape:connector-curvature="0"
+   style="fill:none" />
+		<path
+   d="m 420.947,256.165 c -22.874,0 -41.48,18.606 -41.48,41.475 0,22.87 18.606,41.475 41.48,41.475 22.869,0 41.476,-18.605 41.476,-41.475 0,-22.869 -18.607,-41.475 -41.476,-41.475 z m 17.356,68.892 v -47.234 h -8.945 -0.951 v 16.028 l -22.338,-15.807 c -0.357,-0.251 -0.826,-0.285 -1.222,-0.092 -0.396,0.208 -0.642,0.618 -0.642,1.053 v 37.053 c 0,0.435 0.246,0.841 0.642,1.043 0.169,0.097 0.357,0.136 0.541,0.136 0.236,0 0.482,-0.078 0.681,-0.213 l 22.338,-15.806 v 28.011 c -2.399,0.569 -4.891,0.888 -7.459,0.888 -17.911,0 -32.477,-14.57 -32.477,-32.476 0,-17.906 14.565,-32.472 32.477,-32.472 17.906,0 32.477,14.565 32.477,32.472 -0.001,11.528 -6.046,21.652 -15.122,27.416 z"
+   id="path9"
+   inkscape:connector-curvature="0"
+   style="fill:#e63e30" />
+	</g>
+</g>
 </svg>

data/images/account-none.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
-            <stop stop-color="#000000" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#000000" sketch:type="MSShapeGroup"></path>
-        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
-    </g>
-</svg>

data/images/account-offline.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
-            <stop stop-color="#000000" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#D6D6D6" sketch:type="MSShapeGroup"></path>
-        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
-    </g>
-</svg>

data/images/account-online.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="63px" height="63px" viewBox="0 0 63 63" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="0%" fx="50%" fy="0%" r="50%" id="radialGradient-1">
-            <stop stop-color="#000000" offset="0%"></stop>
-            <stop stop-color="#FFFFFF" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M39.4882425,50.1164605 L31,62 L22.2995024,49.8193034 C9.95141137,46.556924 1,36.9024496 1,25.5 C1,11.4167382 14.6553143,0 31.5,0 C48.3446857,0 62,11.4167382 62,25.5 C62,37.2723466 52.4583986,47.1814694 39.4882425,50.1164605 Z" id="Triangle-1" fill="#198DE7" sketch:type="MSShapeGroup"></path>
-        <path d="M4.5,62 L56.5,62" id="Line" stroke="url(#radialGradient-1)" stroke-width="2" stroke-linecap="square" sketch:type="MSShapeGroup"></path>
-    </g>
-</svg>

data/images/add-contact.svg

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="icon_Connect1" sketch:type="MSLayerGroup">
-            <g id="Layer_2"></g>
-            <g id="Layer_3"></g>
-            <g id="Layer_4"></g>
-            <g id="Layer_5"></g>
-            <g id="Layer_6"></g>
-            <g id="Layer_8"></g>
-            <g id="Layer_9"></g>
-            <g id="Layer_10"></g>
-            <g id="Layer_11"></g>
-            <g id="Layer_12"></g>
-            <g id="Layer_13"></g>
-            <g id="Layer_14"></g>
-            <g id="Layer_15"></g>
-            <g id="Layer_16"></g>
-            <g id="Layer_17"></g>
-            <g id="Layer_18"></g>
-            <g id="Layer_19"></g>
-            <g id="Layer_20"></g>
-            <g id="Layer_21"></g>
-            <g id="Layer_24"></g>
-            <g id="Layer_25"></g>
-            <g id="Layer_26"></g>
-            <g id="Layer_27"></g>
-            <g id="Layer_28"></g>
-            <g id="Layer_29"></g>
-            <g id="Layer_47"></g>
-            <g id="Layer_30"></g>
-            <g id="Layer_31"></g>
-            <g id="Layer_32"></g>
-            <g id="Layer_33"></g>
-            <g id="Layer_34"></g>
-            <g id="Layer_35"></g>
-            <g id="Layer_36"></g>
-            <g id="Layer_37"></g>
-            <g id="Layer_38"></g>
-            <g id="Layer_39"></g>
-            <g id="Layer_40"></g>
-            <g id="Layer_41"></g>
-            <g id="Layer_42"></g>
-            <g id="Layer_43"></g>
-            <g id="Layer_44"></g>
-            <g id="Layer_45"></g>
-            <g id="Layer_46"></g>
-            <g id="Layer_48"></g>
-            <g id="Layer_49"></g>
-            <g id="Layer_51"></g>
-            <g id="Layer_52"></g>
-            <g id="Layer_53"></g>
-            <g id="Layer_54" fill="#000000" sketch:type="MSShapeGroup">
-                <g id="Group">
-                    <path d="M36,32.25 C35.25,33 34.5,33.375 34.125,34.125 C31.875,36 30,38.25 28.125,40.125 C25.125,37.5 22.5,34.5 19.875,31.875 L21.375,30.375 L27.75,24 C28.5,23.25 28.5,22.125 27.75,21.375 C27.375,20.625 26.25,20.625 25.5,21.375 C25.125,21.75 24.75,22.125 24.375,22.125 L16.875,29.625 C16.125,28.5 15.375,27.75 14.25,26.625 C12,29.25 9.375,31.5 7.5,34.125 C5.625,36.375 5.25,39 5.625,42 C5.625,44.25 6.75,46.5 7.875,48.375 L0.375,55.875 L4.125,59.625 L11.625,52.125 C16.125,54.75 20.625,55.125 25.5,52.5 C28.875,50.625 30.75,47.625 33.75,45 C32.625,44.25 31.875,43.125 30.75,42.375 L34.125,39 C35.625,37.5 37.125,36 39,34.5 C39.75,33.75 40.125,32.625 39.375,31.875 C37.875,31.5 36.75,31.5 36,32.25 L36,32.25 Z" id="Shape"></path>
-                    <path d="M60,3.75 L56.25,0 L48.75,7.5 C48.375,7.5 48.375,7.125 48,7.125 C43.5,4.875 38.625,4.5 34.125,7.5 C31.5,9.375 29.25,12 27,14.25 L45.75,33 C47.625,31.125 49.5,29.625 51.375,27.375 C53.625,24.75 54.75,21.375 54.375,18 C54.375,15.75 53.625,13.5 52.125,11.625 L60,3.75 L60,3.75 Z" id="Shape"></path>
-                </g>
-            </g>
-            <g id="Layer_55"></g>
-            <g id="Layer_56"></g>
-            <g id="Layer_57"></g>
-            <g id="Layer_58"></g>
-            <g id="Layer_59"></g>
-            <g id="Layer_60"></g>
-            <g id="Layer_61"></g>
-            <g id="Layer_62"></g>
-            <g id="Layer_63"></g>
-            <g id="Layer_64"></g>
-            <g id="Layer_65"></g>
-            <g id="Layer_66"></g>
-            <g id="Layer_50"></g>
-        </g>
-    </g>
-</svg>

data/images/add.svg

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="68px" height="68px" viewBox="0 0 68 68" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="list-remove" sketch:type="MSLayerGroup" transform="translate(34.500000, 33.500000) rotate(-45.000000) translate(-34.500000, -33.500000) translate(6.000000, 5.000000)">
-            <g id="Page-1">
-                <g id="list-remove">
-                    <g id="Page-1">
-                        <g id="icon_Cross">
-                            <g id="Layer_2"></g>
-                            <g id="Layer_3"></g>
-                            <g id="Layer_4"></g>
-                            <g id="Layer_5"></g>
-                            <g id="Layer_6"></g>
-                            <g id="Layer_8"></g>
-                            <g id="Layer_9"></g>
-                            <g id="Layer_10"></g>
-                            <g id="Layer_11"></g>
-                            <g id="Layer_12"></g>
-                            <g id="Layer_13"></g>
-                            <g id="Layer_14"></g>
-                            <g id="Layer_15"></g>
-                            <g id="Layer_16"></g>
-                            <g id="Layer_17"></g>
-                            <g id="Layer_18"></g>
-                            <g id="Layer_19"></g>
-                            <g id="Layer_20"></g>
-                            <g id="Layer_21"></g>
-                            <g id="Layer_24"></g>
-                            <g id="Layer_25"></g>
-                            <g id="Layer_26"></g>
-                            <g id="Layer_27"></g>
-                            <g id="Layer_28"></g>
-                            <g id="Layer_29"></g>
-                            <g id="Layer_47"></g>
-                            <g id="Layer_30"></g>
-                            <g id="Layer_31"></g>
-                            <g id="Layer_32"></g>
-                            <g id="Layer_33"></g>
-                            <g id="Layer_34"></g>
-                            <g id="Layer_35"></g>
-                            <g id="Layer_36"></g>
-                            <g id="Layer_37"></g>
-                            <g id="Layer_38"></g>
-                            <g id="Layer_39"></g>
-                            <g id="Layer_40"></g>
-                            <g id="Layer_41"></g>
-                            <g id="Layer_42"></g>
-                            <g id="Layer_43"></g>
-                            <g id="Layer_44" fill="#000000" sketch:type="MSShapeGroup">
-                                <path d="M56.6666667,9.33333333 L47.3333333,0 L28,18.6666667 L9.33333333,0 L0,9.33333333 L18.6666667,28 L0,47.3333333 L9.33333333,56.6666667 L28,38 L47.3333333,56.6666667 L56.6666667,47.3333333 L38,28 L56.6666667,9.33333333 L56.6666667,9.33333333 Z" id="Shape"></path>
-                            </g>
-                            <g id="Layer_45"></g>
-                            <g id="Layer_46"></g>
-                            <g id="Layer_48"></g>
-                            <g id="Layer_49"></g>
-                            <g id="Layer_51"></g>
-                            <g id="Layer_52"></g>
-                            <g id="Layer_53"></g>
-                            <g id="Layer_54"></g>
-                            <g id="Layer_55"></g>
-                            <g id="Layer_56"></g>
-                            <g id="Layer_57"></g>
-                            <g id="Layer_58"></g>
-                            <g id="Layer_59"></g>
-                            <g id="Layer_60"></g>
-                            <g id="Layer_61"></g>
-                            <g id="Layer_62"></g>
-                            <g id="Layer_63"></g>
-                            <g id="Layer_64"></g>
-                            <g id="Layer_65"></g>
-                            <g id="Layer_66"></g>
-                            <g id="Layer_50"></g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/advanced-settings.svg

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="icon_Settings" sketch:type="MSLayerGroup">
-            <g id="Layer_2"></g>
-            <g id="Layer_3"></g>
-            <g id="Layer_4"></g>
-            <g id="Layer_5"></g>
-            <g id="Layer_6"></g>
-            <g id="Layer_8"></g>
-            <g id="Layer_9"></g>
-            <g id="Layer_10"></g>
-            <g id="Layer_11"></g>
-            <g id="Layer_12"></g>
-            <g id="Layer_13"></g>
-            <g id="Layer_14"></g>
-            <g id="Layer_15"></g>
-            <g id="Layer_16"></g>
-            <g id="Layer_17"></g>
-            <g id="Layer_18"></g>
-            <g id="Layer_19"></g>
-            <g id="Layer_20"></g>
-            <g id="Layer_21"></g>
-            <g id="Layer_24"></g>
-            <g id="Layer_25"></g>
-            <g id="Layer_26"></g>
-            <g id="Layer_27"></g>
-            <g id="Layer_28"></g>
-            <g id="Layer_29"></g>
-            <g id="Layer_47"></g>
-            <g id="Layer_30"></g>
-            <g id="Layer_31"></g>
-            <g id="Layer_32"></g>
-            <g id="Layer_33"></g>
-            <g id="Layer_34"></g>
-            <g id="Layer_35"></g>
-            <g id="Layer_36"></g>
-            <g id="Layer_37"></g>
-            <g id="Layer_38"></g>
-            <g id="Layer_39"></g>
-            <g id="Layer_40"></g>
-            <g id="Layer_41"></g>
-            <g id="Layer_42"></g>
-            <g id="Layer_43"></g>
-            <g id="Layer_44"></g>
-            <g id="Layer_45"></g>
-            <g id="Layer_46"></g>
-            <g id="Layer_48"></g>
-            <g id="Layer_49"></g>
-            <g id="Layer_51"></g>
-            <g id="Layer_52"></g>
-            <g id="Layer_53"></g>
-            <g id="Layer_54"></g>
-            <g id="Layer_55"></g>
-            <g id="Layer_56"></g>
-            <g id="Layer_57"></g>
-            <g id="Layer_58"></g>
-            <g id="Layer_59"></g>
-            <g id="Layer_60"></g>
-            <g id="Layer_61"></g>
-            <g id="Layer_62"></g>
-            <g id="Layer_63" fill="#000000" sketch:type="MSShapeGroup">
-                <path d="M39.5,9.5 C39,9.5 38.5,9 38,9 C37.5,9 37,8.5 36.5,8.5 L34.5,0.5 C31,1.38777878e-17 28,1.38777878e-17 24.5,0.5 L22.5,9 C21.5,9 20.5,9.5 19.5,10 L12,6 C9.5,8 7,10 5.5,13 L10,20.5 C10,21 9.5,21.5 9.5,22 C9.5,22.5 9,23 9,23.5 L0.5,25.5 C1.38777878e-17,29 1.38777878e-17,32 0.5,35.5 L9,37.5 C9,38.5 9.5,39.5 10,40.5 L6,48 C8,50.5 10.5,53 13,55 L20.5,50.5 C21,50.5 21.5,51 22,51 C22.5,51 23,51.5 23.5,51.5 L26,59.5 C29.5,60 32.5,60 35.5,59.5 L37.5,51 L40.5,49.5 L48,53.5 C50.5,51.5 53,49 55,46.5 L50.5,39 C50.5,38.5 51,38 51,37.5 C51,37 51.5,36.5 51.5,36 L59.5,33.5 C60,30 60,27 59.5,24 L51,22 L49.5,19 L53.5,11.5 C51.5,9 49,6.5 46.5,4.5 L39.5,9.5 L39.5,9.5 Z M40.5,34 C38,39.5 31.5,42.5 26,40.5 C20.5,38 17.5,31.5 19.5,26 C21.5,20.5 28,17.5 34,20 C39.5,22 42.5,28.5 40.5,34 L40.5,34 Z" id="Shape"></path>
-            </g>
-            <g id="Layer_64"></g>
-            <g id="Layer_65"></g>
-            <g id="Layer_66"></g>
-            <g id="Layer_50"></g>
-        </g>
-    </g>
-</svg>

data/images/album-icon.svg

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="album-icon" sketch:type="MSLayerGroup">
-            <g id="Page-1">
-                <g id="icon_Playlist">
-                    <g id="Layer_2"></g>
-                    <g id="Layer_3"></g>
-                    <g id="Layer_4"></g>
-                    <g id="Layer_5"></g>
-                    <g id="Layer_6"></g>
-                    <g id="Layer_8"></g>
-                    <g id="Layer_9"></g>
-                    <g id="Layer_10"></g>
-                    <g id="Layer_11"></g>
-                    <g id="Layer_12"></g>
-                    <g id="Layer_13"></g>
-                    <g id="Layer_14"></g>
-                    <g id="Layer_15"></g>
-                    <g id="Layer_16"></g>
-                    <g id="Layer_17"></g>
-                    <g id="Layer_18"></g>
-                    <g id="Layer_19"></g>
-                    <g id="Layer_20"></g>
-                    <g id="Layer_21"></g>
-                    <g id="Layer_24"></g>
-                    <g id="Layer_25"></g>
-                    <g id="Layer_26"></g>
-                    <g id="Layer_27"></g>
-                    <g id="Layer_28"></g>
-                    <g id="Layer_29"></g>
-                    <g id="Layer_47"></g>
-                    <g id="Layer_30"></g>
-                    <g id="Layer_31"></g>
-                    <g id="Layer_32"></g>
-                    <g id="Layer_33"></g>
-                    <g id="Layer_34"></g>
-                    <g id="Layer_35"></g>
-                    <g id="Layer_36"></g>
-                    <g id="Layer_37"></g>
-                    <g id="Layer_38"></g>
-                    <g id="Layer_39"></g>
-                    <g id="Layer_40" fill="#000000" sketch:type="MSShapeGroup">
-                        <path d="M30,0 C13.5,0 0,13.5 0,30 C0,46.5 13.5,60 30,60 C46.5,60 60,46.5 60,30 C59.5,13.5 46.5,0 30,0 L30,0 L30,0 Z M30,40 C24.5,40 20,35.5 20,30 C20,24.5 24.5,20 30,20 C35.5,20 39.5,24.5 39.5,30 C39.5,35.5 35,40 30,40 L30,40 L30,40 Z" id="Shape"></path>
-                    </g>
-                    <g id="Layer_41"></g>
-                    <g id="Layer_42"></g>
-                    <g id="Layer_43"></g>
-                    <g id="Layer_44"></g>
-                    <g id="Layer_45"></g>
-                    <g id="Layer_46"></g>
-                    <g id="Layer_48"></g>
-                    <g id="Layer_49"></g>
-                    <g id="Layer_51"></g>
-                    <g id="Layer_52"></g>
-                    <g id="Layer_53"></g>
-                    <g id="Layer_54"></g>
-                    <g id="Layer_55"></g>
-                    <g id="Layer_56"></g>
-                    <g id="Layer_57"></g>
-                    <g id="Layer_58"></g>
-                    <g id="Layer_59"></g>
-                    <g id="Layer_60"></g>
-                    <g id="Layer_61"></g>
-                    <g id="Layer_62"></g>
-                    <g id="Layer_63"></g>
-                    <g id="Layer_64"></g>
-                    <g id="Layer_65"></g>
-                    <g id="Layer_66"></g>
-                    <g id="Layer_50"></g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/album-placeholder-grid.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>album-placeholder-grid</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <rect id="Rectangle-1" fill="#D8D8D8" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
-        <g id="icon_Playlist" sketch:type="MSLayerGroup" transform="translate(70.000000, 70.000000)">
-            <path id="Shape" stroke="#449FDB" opacity="0" fill="#000000" sketch:type="MSShapeGroup"></path>
-            <path d="M30,0 C13.5,0 0,13.5 0,30 C0,46.5 13.5,60 30,60 C46.5,60 60,46.5 60,30 C59.499375,13.5 46.5,0 30,0 L30,0 Z M30,39.999375 C24.500625,39.999375 20.000625,35.499375 20.000625,30 C20.000625,24.500625 24.500625,20.000625 30,20.000625 C35.499375,20.000625 39.500625,24.500625 39.500625,30 C39.500625,35.499375 35.000625,39.999375 30,39.999375 L30,39.999375 Z" id="Shape" fill="#606060" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>

data/images/apply-check.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="50px" viewBox="0 0 51 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>apply-check</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="apply-check" sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)">
-            <g id="Page-1" sketch:type="MSShapeGroup">
-                <g id="apply-check">
-                    <g id="Page-1">
-                        <g id="Group">
-                            <path d="M4.24000168,-0.24597168 C1.78800178,-0.24597168 -0.208998203,1.74902833 -0.208998203,4.2030282 L-0.208998203,43.8820291 C-0.208998203,46.3350291 1.78800178,48.3320289 4.24000168,48.3320289 L45,48.3320289 C47.4519999,48.3320289 49.4489999,46.3350289 49.4489999,43.8820291 L49.4489999,4.2030282 C49.4489746,1.74902344 47.4520264,-0.24597168 45,-0.24597168 L4.24000168,-0.24597168 Z" id="Shape" fill="#000000"></path>
-                            <path d="M38.992981,10.0159912 C38.112981,9.3459912 36.857981,9.5139912 36.1889811,10.3919912 L19.0559816,32.827992 L12.6759815,25.2839919 C11.9629815,24.4409919 10.6999816,24.3349919 9.8579814,25.0479919 C9.0139815,25.7619919 8.90898144,27.0239918 9.6219814,27.865992 L17.6079815,37.3099922 C17.9889815,37.7599922 18.5469815,38.0189922 19.1349815,38.0189922 C19.1519815,38.0189922 19.1679815,38.0189922 19.1849815,38.0179922 C19.7899815,38.0029922 20.3569815,37.7139922 20.7249814,37.2329922 L39.3689805,12.8199921 C40.0390015,11.94104 39.8709717,10.6870117 38.992981,10.0159912 C38.992981,10.0159912 39.8709717,10.6870117 38.992981,10.0159912 L38.992981,10.0159912" id="Shape" fill="#FFFFFF"></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/arrow-down-double.svg

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="9px" height="9px" viewBox="0 0 9 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="icon_chev_up" sketch:type="MSLayerGroup" transform="translate(4.500000, 4.500000) scale(1, -1) translate(-4.500000, -4.500000) translate(0.000000, 2.000000)">
-            <g id="Layer_2"></g>
-            <g id="Layer_3"></g>
-            <g id="Layer_4"></g>
-            <g id="Layer_5"></g>
-            <g id="Layer_6"></g>
-            <g id="Layer_8"></g>
-            <g id="Layer_9"></g>
-            <g id="Layer_10"></g>
-            <g id="Layer_11"></g>
-            <g id="Layer_12"></g>
-            <g id="Layer_13"></g>
-            <g id="Layer_14"></g>
-            <g id="Layer_15"></g>
-            <g id="Layer_16"></g>
-            <g id="Layer_17"></g>
-            <g id="Layer_18"></g>
-            <g id="Layer_19"></g>
-            <g id="Layer_20"></g>
-            <g id="Layer_21"></g>
-            <g id="Layer_24"></g>
-            <g id="Layer_25"></g>
-            <g id="Layer_26"></g>
-            <g id="Layer_27"></g>
-            <g id="Layer_28"></g>
-            <g id="Layer_29"></g>
-            <g id="Layer_47"></g>
-            <g id="Layer_30"></g>
-            <g id="Layer_31"></g>
-            <g id="Layer_32"></g>
-            <g id="Layer_33"></g>
-            <g id="Layer_34"></g>
-            <g id="Layer_35"></g>
-            <g id="Layer_36"></g>
-            <g id="Layer_37"></g>
-            <g id="Layer_38"></g>
-            <g id="Layer_39" fill="#000000" sketch:type="MSShapeGroup">
-                <path d="M0.724137931,5 L0,4.33962264 L4.55172414,0 L9,4.33962264 L8.27586207,5 L4.55172414,1.41509434 L0.724137931,5 Z" id="Shape"></path>
-            </g>
-            <g id="Layer_40"></g>
-            <g id="Layer_41"></g>
-            <g id="Layer_42"></g>
-            <g id="Layer_43"></g>
-            <g id="Layer_44"></g>
-            <g id="Layer_45"></g>
-            <g id="Layer_46"></g>
-            <g id="Layer_48"></g>
-            <g id="Layer_49"></g>
-            <g id="Layer_51"></g>
-            <g id="Layer_52"></g>
-            <g id="Layer_53"></g>
-            <g id="Layer_54"></g>
-            <g id="Layer_55"></g>
-            <g id="Layer_56"></g>
-            <g id="Layer_57"></g>
-            <g id="Layer_58"></g>
-            <g id="Layer_59"></g>
-            <g id="Layer_60"></g>
-            <g id="Layer_61"></g>
-            <g id="Layer_62"></g>
-            <g id="Layer_63"></g>
-            <g id="Layer_64"></g>
-            <g id="Layer_65"></g>
-            <g id="Layer_66"></g>
-            <g id="Layer_50"></g>
-        </g>
-    </g>
-</svg>

data/images/artist-icon.svg

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="62px" height="61px" viewBox="0 0 62 61" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="artist-icon" sketch:type="MSLayerGroup" transform="translate(1.000000, 1.000000)" fill="#000000">
-            <g id="Page-1" sketch:type="MSShapeGroup">
-                <path d="M59.9125522,22.5833558 C59.6763462,21.809491 59.0039372,21.2801979 58.2332538,21.2619446 L48.0212482,21.0429275 L45.0195468,20.9808738 L42.0178377,20.9133423 L39.4557841,20.8622368 L38.2557947,20.8348625 L37.6213153,18.9202774 L31.6989366,1.072129 C31.445492,0.31286692 30.7644617,-0.2 30.0006754,-0.2 C29.2368853,-0.2 28.5541307,0.31286692 28.3006861,1.072129 L22.3800317,18.9202774 L21.7438279,20.8348625 L20.5421144,20.8622368 L17.9800607,20.9133423 L14.9800797,20.9808738 L11.9800988,21.0429275 L1.7663707,21.2619446 C0.9974098,21.2801979 0.3232765,21.809491 0.0870705,22.5833558 C-0.14913376,23.3590439 0.1060371,24.204087 0.72155,24.6914032 L16.6300698,37.3287476 L10.8473473,57.3378723 C10.6249352,58.115384 10.8887273,58.9531295 11.5076885,59.4331482 C11.6645833,59.5536011 11.8335477,59.6430405 12.0128594,59.7032669 C12.0697556,59.7251709 12.1300964,59.7233475 12.1921654,59.7397736 C12.3128548,59.7653244 12.4352685,59.7963532 12.5594063,59.7981766 L12.5732002,59.8 C12.6869927,59.8 12.7990609,59.7707946 12.9128532,59.7470673 C12.973198,59.7342957 13.0352631,59.7397736 13.0938836,59.7178696 C13.269745,59.66129 13.4369851,59.5791596 13.5921594,59.4641693 L30.0023958,47.5003097 L46.4126361,59.4641693 C46.7212527,59.6886642 47.076424,59.8 47.4333194,59.8 C47.8074573,59.8 48.1815952,59.6795394 48.4988329,59.4331482 C49.1160663,58.9513061 49.3798602,58.1099136 49.1574481,57.3378723 L43.3730013,37.3287476 L59.2849659,24.6914032 C59.8954014,24.202195 60.1487964,23.357129 59.9125522,22.5833558 L59.9125522,22.5833558 L59.9125522,22.5833558 Z" id="Path"></path>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/artist-placeholder-grid.svg

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>artist-placeholder-grid</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="artist-placeholder-grid" sketch:type="MSLayerGroup">
-            <g id="Page-1">
-                <rect id="Rectangle-1" fill="#D8D8D8" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
-                <g id="icon_Star" transform="translate(70.000000, 70.000000)">
-                    <g id="Layer_2"></g>
-                    <g id="Layer_3"></g>
-                    <g id="Layer_4"></g>
-                    <g id="Layer_5"></g>
-                    <g id="Layer_6"></g>
-                    <g id="Layer_8"></g>
-                    <g id="Layer_9"></g>
-                    <g id="Layer_10"></g>
-                    <g id="Layer_11"></g>
-                    <g id="Layer_12"></g>
-                    <g id="Layer_13"></g>
-                    <g id="Layer_14"></g>
-                    <g id="Layer_15"></g>
-                    <g id="Layer_16"></g>
-                    <g id="Layer_17"></g>
-                    <g id="Layer_18"></g>
-                    <g id="Layer_19"></g>
-                    <g id="Layer_20"></g>
-                    <g id="Layer_21"></g>
-                    <g id="Layer_24"></g>
-                    <g id="Layer_25"></g>
-                    <g id="Layer_26"></g>
-                    <g id="Layer_27"></g>
-                    <g id="Layer_28"></g>
-                    <g id="Layer_29"></g>
-                    <g id="Layer_47"></g>
-                    <g id="Layer_30"></g>
-                    <g id="Layer_31"></g>
-                    <g id="Layer_32"></g>
-                    <g id="Layer_33"></g>
-                    <g id="Layer_34"></g>
-                    <g id="Layer_35"></g>
-                    <g id="Layer_36"></g>
-                    <g id="Layer_37"></g>
-                    <g id="Layer_38"></g>
-                    <g id="Layer_39"></g>
-                    <g id="Layer_40"></g>
-                    <g id="Layer_41"></g>
-                    <g id="Layer_42"></g>
-                    <g id="Layer_43"></g>
-                    <g id="Layer_44"></g>
-                    <g id="Layer_45"></g>
-                    <g id="Layer_46"></g>
-                    <g id="Layer_48"></g>
-                    <g id="Layer_49"></g>
-                    <g id="Layer_51"></g>
-                    <g id="Layer_52"></g>
-                    <g id="Layer_53"></g>
-                    <g id="Layer_54"></g>
-                    <g id="Layer_55"></g>
-                    <g id="Layer_56"></g>
-                    <g id="Layer_57"></g>
-                    <g id="Layer_58"></g>
-                    <g id="Layer_59"></g>
-                    <g id="Layer_60"></g>
-                    <g id="Layer_61"></g>
-                    <g id="Layer_62"></g>
-                    <g id="Layer_63"></g>
-                    <g id="Layer_64" fill="#606060" sketch:type="MSShapeGroup">
-                        <path d="M37,22.9090909 L30,0 L23,22.9090909 L0,22.9090909 L19,37.0909091 L11.5,60 L30,45.8181818 L48.5,60 L41,37.0909091 L60,22.9090909 L37,22.9090909 L37,22.9090909 Z" id="Shape"></path>
-                    </g>
-                    <g id="Layer_65"></g>
-                    <g id="Layer_66"></g>
-                    <g id="Layer_50"></g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/automatic-playlist.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="60px" height="60px" viewBox="0 0 60 60" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>Slice 1</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="g2550-+-g2554" sketch:type="MSLayerGroup" transform="translate(0.000000, 2.000000)" fill="#000000">
-            <g id="g2550" sketch:type="MSShapeGroup">
-                <path d="M54.8541622,14.9280009 L43.0142092,21.7644343 L30.0939982,21.7644343 C27.0593814,21.7644343 24.590457,24.2070779 24.590457,27.2088415 C24.590457,30.2139034 27.0593816,32.6532486 30.0939982,32.6532486 L42.0098167,32.6532486 L54.8541622,40.0702432 C55.9509123,40.7035823 56.3252917,42.1055047 55.6919804,43.1990041 C55.0603183,44.2958023 53.6601065,44.6701981 52.5650056,44.036859 L34.7564225,33.7566447 L45.0378364,51.5643579 C45.6694985,52.6611561 45.2951191,54.0614293 44.2000183,54.6931189 C43.1049175,55.3248086 41.7030563,54.9504129 41.0713944,53.8536147 L30.9878908,36.3873104 L30.9878908,43.9593409 C30.9878908,45.2227204 29.9620585,46.2485978 28.6987342,46.2485978 C27.4337608,46.2485978 26.4079283,45.2227205 26.4079283,43.9593409 L26.4079283,35.7061409 L15.9286048,53.8536147 C15.2969427,54.9504129 13.896731,55.3248086 12.8016301,54.6931189 C11.7065293,54.0614291 11.3321499,52.661156 11.9638119,51.5643579 L22.246875,33.7549947 L4.43664347,44.035209 C3.33989335,44.6685481 1.93968152,44.2958016 1.30801961,43.1990035 C0.674708276,42.1038547 1.04908763,40.7035815 2.14583775,40.0702425 L19.5668466,30.0126861 L12.4602358,30.0126861 C11.1969117,30.0126861 10.1710792,28.9851594 10.1710792,27.7234292 C10.1710792,26.4551018 11.1969116,25.4308737 12.4602358,25.4308737 L20.3403438,25.4308737 L2.14748629,14.9280009 C1.05073617,14.2930125 0.676356815,12.8943886 1.30801892,11.79924 C1.73352495,11.063643 2.50207462,10.6529622 3.29371381,10.6529622 C3.6829364,10.6529622 4.07545749,10.7535708 4.43664288,10.9613852 L22.2452261,21.2415995 L11.965462,3.43388621 C11.3321507,2.33873744 11.70653,0.94176288 12.8016309,0.306774504 C13.1628163,0.0973107947 13.5553374,8.84764461e-07 13.94456,8.84764461e-07 C14.7361992,8.84764461e-07 15.5063981,0.410681685 15.9302549,1.14462932 L26.4079293,19.2937516 L26.4079293,11.4842188 C26.4079293,10.21919 27.4337617,9.19331255 28.6987352,9.19331255 C29.9620593,9.19331255 30.9878918,10.2191899 30.9878918,11.4842188 L30.9878918,18.612582 L41.0730445,1.14627773 C41.4969013,0.410680776 42.2671002,0 43.0587394,0 C43.4463127,0 43.8404831,0.0989592276 44.2000191,0.30677362 C45.2967693,0.941761995 45.6711486,2.34038586 45.0394865,3.43388533 L34.7580726,21.2415986 L52.5650058,10.9630335 C52.9245419,10.7535698 53.3187123,10.6546105 53.7079349,10.6546105 C54.499574,10.6546105 55.269773,11.0652913 55.6919805,11.799239 C56.3252917,12.896038 55.9509123,14.2946618 54.8541622,14.9280009" id="path2552"></path>
-            </g>
-            <g id="g2554" transform="translate(26.000000, 24.000000)" sketch:type="MSShapeGroup">
-                <path d="M1.88781858,7 C0.845060474,7 0,5.43204391 0,3.5 C0,1.56612642 0.845060474,0 1.88781858,0 L33,0 L33,7 L1.88781858,7 L1.88781858,7 L1.88781858,7" id="path2556"></path>
-            </g>
-        </g>
-    </g>
-</svg>