Changelog for spotify config dialog

Keep config UI in sync with resolver
Some more fixes
2025-09-07 20:50:53 +02:00 · 2012-07-25 09:39:01 -04:00 · 2012-07-25 09:38:22 -04:00 · 2012-07-25 09:38:22 -04:00 · 2012-07-25 09:38:22 -04:00 · 2012-07-25 14:37:42 +02:00
2955 changed files with 556096 additions and 333292 deletions
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1,16 +0,0 @@
-name: C/C++ CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container:
-      image: tomahawkmusicplayer/ubuntu:latest
-      env:
-        MIX_ENV: test
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@master
-      - name: Build and test
-        run: /usr/local/bin/build-and-test.sh
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,18 +0,0 @@
-name: Docker Image CI
-
-on: [push]
-
-jobs:
-
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-    - name: Login to DockerHub Registry
-      run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
-    - name: Build the Docker image
-      run: cd Docker && docker build . --file Dockerfile --tag ${{ secrets.DOCKERHUB_USERNAME }}/ubuntu:latest
-    - name: Push the latest Docker image
-      run: docker push ${{ secrets.DOCKERHUB_USERNAME }}/ubuntu:latest
--- a/.gitignore
+++ b/.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
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "thirdparty/libcrashreporter-qt"]
-	path = thirdparty/libcrashreporter-qt
-	url = https://github.com/dschmidt/libcrashreporter-qt
--- a/.tx/config
+++ b/.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
--- a/16
+++ b/16
@@ -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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,30 +1,7 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
+SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 CMAKE_POLICY(SET CMP0017 NEW)
-CMAKE_POLICY(SET CMP0022 NEW)
-IF(POLICY CMP0075)
-    CMAKE_POLICY(SET CMP0075 NEW)
-ENDIF()
-
-# TODO:
-# Update to NEW and fix things up
-CMAKE_POLICY(SET CMP0023 NEW)
-
-# Let AUTOMOC and AUTOUIC process generated files
-IF(POLICY CMP0071)
-    CMAKE_POLICY(SET CMP0071 NEW)
-ENDIF()
-
-# TODO:
-# Disable automatic qtmain linking
-CMAKE_POLICY(SET CMP0020 OLD)
-
-find_package(ECM 1.7.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
-
-
-
-INCLUDE(CMakeDependentOption)

 ###
 ### Tomahawk application info
@@ -33,123 +10,63 @@ 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" )
-SET( TOMAHAWK_APPLICATION_PACKAGE_NAME "org.tomahawk-player.Tomahawk")
-IF(APPLE)
-    SET( TOMAHAWK_TARGET_NAME "Tomahawk" )
-ELSE()
-    SET( TOMAHAWK_TARGET_NAME "tomahawk" )
-ENDIF()
-
-STRING(TOLOWER "${TOMAHAWK_TARGET_NAME}" TOMAHAWK_BASE_TARGET_NAME)
-
-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 5 )

-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 )
+#SET( TOMAHAWK_VERSION_RC 0 )

-# 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()
-
-if(NOT WIN32)
-    # enforce proper symbol exporting on all platforms but Windows
-    tomahawk_add_cxx_flags( "-fvisibility=hidden" )
-    tomahawk_add_c_flags( "-fvisibility=hidden" )
-endif()
-
-# enforce using constBegin, constEnd for const-iterators
-tomahawk_add_definitions( "-DQT_STRICT_ITERATORS" )
+# enforce proper symbol exporting on all platforms
+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" 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)

-# 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.")
+    IF( CMAKE_COMPILER_IS_GNUCXX )
+        ADD_DEFINITIONS( -DSTDC_HEADERS -std=gnu++98 )
+    ENDIF()
+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}" )
@@ -160,136 +77,67 @@ INCLUDE( GNUInstallDirs )
 # installer creation
 INCLUDE( TomahawkCPack.cmake )

-# deps
+#deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )

-message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} ***" )
+# 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()

-find_package(Qt5Core REQUIRED)
-find_package(Qt5Concurrent REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Sql 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 QUIET)
+IF( BUILD_GUI AND UNIX AND NOT APPLE )
+    FIND_PACKAGE( X11 )
+ENDIF()

-if(Qt5X11Extras_FOUND)
-    set(HAVE_X11 TRUE)
-else()
-    set(HAVE_X11 FALSE)
+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()

-if( UNIX AND NOT APPLE )
-    # We need this to find the paths to qdbusxml2cpp and co
-    find_package(Qt5DBus REQUIRED)
-endif()
+macro_optional_find_package(Echonest 2.0.0)
+macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.0.0 is needed for dynamic playlists and the infosystem")

-if(APPLE)
-    find_package(Qt5MacExtras REQUIRED)
-endif()
+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")

-if(WIN32)
-    find_package(Qt5WinExtras REQUIRED)
-endif()
+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")

-find_package(Qt5LinguistTools REQUIRED)
-
-set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-# FIXME: CrashReporter depends on deprecated QHttp
-
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-
-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")
-
-macro_optional_find_package(Taglib 1.8.0)
+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 "" "")

-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()
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
-
-macro_optional_find_package(KF5Attica 1.0.0)
-set(LIBATTICA_FOUND ${KF5Attica_FOUND})
-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 )
-macro_optional_find_package(Qt5Keychain 0.1.0)
-macro_log_feature(Qt5Keychain_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)
-    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")
-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 )
-    macro_optional_find_package(LibsnoreQt5 0.6.0 QUIET)
-    macro_log_feature(LibsnoreQt5_FOUND "Libsnore" "Library for notifications" "https://projects.kde.org/projects/playground/libs/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
@@ -305,7 +153,37 @@ add_subdirectory(${THIRDPARTY_DIR}/libportfwd)

 #### submodules end

-SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+### libportfwd
+SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
+SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
+SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
+ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
+
+# we need pthreads too
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
+
+macro_optional_find_package(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.)
+        STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+    ENDIF()
+ELSE()
+    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+ENDIF()
+
+IF( WIN32 )
+  find_library(QTSPARKLE_LIBRARIES qtsparkle)
+ENDIF( WIN32 )

 #show dep log
 macro_display_feature_log()
@@ -318,75 +196,18 @@ CONFIGURE_FILE(
  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
  IMMEDIATE @ONLY)

-IF( ( NOT APPLE ) AND ( NOT SANITIZE_ADDRESS ))
+# 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 )
    # 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_LIBRARY ${TOMAHAWK_BASE_TARGET_NAME}lib )
-SET( TOMAHAWK_LIBRARIES ${TOMAHAWK_LIBRARY} )
-SET( TOMAHAWK_WIDGETS_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-widgets )
-SET( TOMAHAWK_PLAYDARAPI_LIBRARIES ${TOMAHAWK_BASE_TARGET_NAME}-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)
-  find_package(Qt5Test REQUIRED)
-  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 ${TOMAHAWK_LIBRARY}
-  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}"
-)
--- a/CMakeModules/AddAppIconMacro.cmake
+++ b/CMakeModules/AddAppIconMacro.cmake
@@ -0,0 +1,114 @@
+SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
+
+# This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
+#
+# Copyright (c) 2006-2009 Alexander Neundorf, <neundorf@kde.org>
+# Copyright (c) 2006, 2007, Laurent Montel, <montel@kde.org>
+# Copyright (c) 2007 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 [in KDE repositories].
+
+
+# adds application icon to target source list 
+# for detailed documentation see the top of FindKDE4Internal.cmake
+macro (KDE4_ADD_APP_ICON appsources pattern)
+    set (_outfilename ${CMAKE_CURRENT_BINARY_DIR}/${appsources})
+
+    if (WIN32)
+        if(NOT WINCE)
+        find_program(PNG2ICO_EXECUTABLE NAMES png2ico)
+        else(NOT WINCE)
+        find_program(PNG2ICO_EXECUTABLE NAMES png2ico PATHS ${HOST_BINDIR} NO_DEFAULT_PATH )
+        endif(NOT WINCE)
+        find_program(WINDRES_EXECUTABLE NAMES windres)
+        if(MSVC)
+            set(WINDRES_EXECUTABLE TRUE)
+        endif(MSVC)
+        if (PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
+            string(REPLACE "*" "(.*)" pattern_rx "${pattern}")
+            file(GLOB files  "${pattern}")
+            foreach (it ${files})
+                string(REGEX REPLACE "${pattern_rx}" "\\1" fn "${it}")
+                if (fn MATCHES ".*16.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*16.*")
+                if (fn MATCHES ".*32.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*32.*")
+                if (fn MATCHES ".*48.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*48.*")
+                if (fn MATCHES ".*64.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*64.*")
+                if (fn MATCHES ".*128.*" )
+                    list (APPEND _icons ${it})
+                endif (fn MATCHES ".*128.*")
+            endforeach (it)
+            if (_icons)
+                add_custom_command(OUTPUT ${_outfilename}.ico ${_outfilename}.rc
+                                   COMMAND ${PNG2ICO_EXECUTABLE} ARGS --rcfile ${_outfilename}.rc ${_outfilename}.ico ${_icons}
+                                   DEPENDS ${PNG2ICO_EXECUTABLE} ${_icons}
+                                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                                  )
+                if (MINGW)
+                    add_custom_command(OUTPUT ${_outfilename}_res.o
+                                       COMMAND ${WINDRES_EXECUTABLE} ARGS -i ${_outfilename}.rc -o ${_outfilename}_res.o --include-dir=${CMAKE_CURRENT_SOURCE_DIR}
+                                       DEPENDS ${WINDRES_EXECUTABLE} ${_outfilename}.rc
+                                       WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+                                      )
+                    list(APPEND ${appsources} ${_outfilename}_res.o)
+                else(MINGW)
+                    list(APPEND ${appsources} ${_outfilename}.rc)
+                endif(MINGW)
+            else(_icons)
+                message(STATUS "Unable to find a related icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
+            endif(_icons)
+        else(PNG2ICO_EXECUTABLE AND WINDRES_EXECUTABLE)
+            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 (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)
+        find_program(TIFF2ICNS_EXECUTABLE NAMES tiff2icns)
+        if (SIPS_EXECUTABLE AND TIFF2ICNS_EXECUTABLE)
+            file(GLOB_RECURSE files  "${pattern}")
+            # we can only test for the 128-icon like that - we don't use patterns anymore
+            foreach (it ${files})
+                if (it MATCHES ".*128.*" )
+                    set (_icon ${it})
+                endif (it MATCHES ".*128.*")
+            endforeach (it)
+
+            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
+                                   DEPENDS ${_icon}
+                                   )
+
+                # This will register the icon into the bundle
+                set(MACOSX_BUNDLE_ICON_FILE ${appsources}.icns)
+
+                # Append the icns file to the sources list so it will be a dependency to the
+                # main target
+                list(APPEND ${appsources} ${_outfilename}.icns)
+
+                # Install the icon into the Resources dir in the bundle
+                set_source_files_properties(${_outfilename}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+
+            else(_icon)
+                # TODO - try to scale a non-128 icon...? Try to convert an SVG on the fly?
+                message(STATUS "Unable to find an 128x128 icon that matches pattern ${pattern} for variable ${appsources} - application will not have an application icon!")
+            endif(_icon)
+
+        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(Q_WS_MAC)
+endmacro (KDE4_ADD_APP_ICON)
--- a/CMakeModules/AddTomahawkPlugin.cmake
+++ b/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()
--- a/CMakeModules/COPYING-CMAKE-SCRIPTS
+++ b/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.
--- a/CMakeModules/FindCLucene.cmake
+++ b/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
+  )
--- a/CMakeModules/FindCLuceneUnstable.cmake
+++ b/CMakeModules/FindCLuceneUnstable.cmake
@@ -0,0 +1,37 @@
+# - Try to find clucene-unstable
+#  This is a workaround for distros, that want to ship a recent enough clucene but don't want to replace the old version
+#
+#  CLUCENEUNSTABLE_FOUND - system has clucene-unstable
+#  CLUCENE_UNSTABLE_INCLUDE_DIR - the clucene-unstable include directories
+#  CLUCENE_UNSTABLE_LIBS - link these to use clucene-unstable
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
+
+# Include dir
+find_path(CLUCENE_UNSTABLE_INCLUDE_DIR
+  NAMES CLucene.h
+  PATH_SUFFIXES clucene-unstable
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+# Finally the library itself
+find_library(CLUCENE_UNSTABLE_SHARED_LIB
+  NAMES clucene-unstable-shared
+  PATHS ${KDE4_LIB_DIR}
+)
+
+find_library(CLUCENE_UNSTABLE_CORE_LIB
+  NAMES clucene-unstable-core
+  PATHS ${KDE4_LIB_DIR}
+)
+
+
+SET( CLUCENE_UNSTABLE_LIBS  ${CLUCENE_UNSTABLE_SHARED_LIB} ${CLUCENE_UNSTABLE_CORE_LIB} )
+SET( CLUCENE_UNSTABLE_INCLUDE_DIRS ${CLUCENE_UNSTABLE_INCLUDE_DIR})
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(CLuceneUnstable DEFAULT_MSG CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+
+
+MARK_AS_ADVANCED(CLUCENE_UNSTABLE_LIBS CLUCENE_UNSTABLE_INCLUDE_DIRS)
+
--- a/CMakeModules/FindEchonest.cmake
+++ b/CMakeModules/FindEchonest.cmake
@@ -0,0 +1,36 @@
+# - 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)
+PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest)
+
+FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
+    HINTS
+        ${PC_ECHONEST_INCLUDEDIR}
+        ${PC_ECHONEST_INCLUDE_DIRS}
+        ${CMAKE_INSTALL_INCLUDEDIR}
+        ${KDE4_INCLUDE_DIR}
+)
+
+FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest
+    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)
--- a/CMakeModules/FindJreen.cmake
+++ b/CMakeModules/FindJreen.cmake
@@ -6,22 +6,22 @@
 # LIBJREEN_FOUND, whether libjreen was found

 FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_JREEN QUIET libjreen-qt5)
+PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)

 FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
    HINTS
        ${PC_JREEN_INCLUDEDIR}
        ${PC_JREEN_INCLUDE_DIRS}
        ${CMAKE_INSTALL_INCLUDEDIR}
-    PATH_SUFFIXES
-        jreen-qt5
+        ${KDE4_INCLUDE_DIR}
 )

-FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen-qt5
+FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
    HINTS
        ${PC_JREEN_LIBDIR}
        ${PC_JREEN_LIBRARY_DIRS}
        ${CMAKE_INSTALL_LIBDIR}
+        ${KDE4_LIB_DIR}
 )

 IF(JREEN_LIBRARIES AND JREEN_INCLUDE_DIR AND NOT PC_JREEN_VERSION)
--- a/CMakeModules/FindKDE4Installed.cmake
+++ b/CMakeModules/FindKDE4Installed.cmake
@@ -0,0 +1,20 @@
+# Simple hack to detect wether KDE4 is *installed* -- not anything about the development environment!
+
+FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
+
+# For KDE4 kde-config has been renamed to kde4-config
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
+   # the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
+   PATH_SUFFIXES bin               
+   HINTS
+   ${CMAKE_INSTALL_PREFIX}
+   ${_KDEDIRS}
+   /opt/kde4
+   ONLY_CMAKE_FIND_ROOT_PATH
+   )
+
+IF (KDE4_KDECONFIG_EXECUTABLE)
+   SET (KDE4_INSTALLED TRUE)
+   message(STATUS "KDE4 is installed, will install protocol file")
+ENDIF (KDE4_KDECONFIG_EXECUTABLE)
+
--- a/CMakeModules/FindLIBVLC.cmake
+++ b/CMakeModules/FindLIBVLC.cmake
@@ -1,34 +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}
-        /usr/local/opt/vlc/include
-)
-
-find_library(LIBVLC_LIBRARY NAMES vlc libvlc
-    HINTS
-        ${PC_LIBVLC_LIBDIR}
-        ${PC_LIBVLC_LIBRARY_DIRS}
-        /usr/local/opt/vlc/lib
-)
-
-
-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 LIBVLC_INCLUDE_DIR
-    VERSION_VAR LIBVLC_VERSION
-)
--- a/CMakeModules/FindLibLastFm.cmake
+++ b/CMakeModules/FindLibLastFm.cmake
@@ -7,15 +7,22 @@
 # (c) Dominik Schmidt <dev@dominik-schmidt.de>
 #

+# 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 lastfm5/Track.h
+  NAMES lastfm/Track.h
+  PATHS ${KDE4_INCLUDE_DIR}
 )

 # Finally the library itself
 find_library(LIBLASTFM_LIBRARY
-  NAMES lastfm5
+  NAMES lastfm
+  PATHS ${KDE4_LIB_DIR}
 )

 set(LIBLASTFM_LIBRARIES ${LIBLASTFM_LIBRARY})
--- a/CMakeModules/FindLucene++.cmake
+++ b/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 VERSION_LESS "${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 VERSION_LESS "${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
-  )
--- a/CMakeModules/FindOggVorbis.cmake
+++ b/CMakeModules/FindOggVorbis.cmake
@@ -0,0 +1,89 @@
+# - Try to find the OggVorbis libraries
+# Once done this will define
+#
+#  OGGVORBIS_FOUND - system has OggVorbis
+#  OGGVORBIS_VERSION - set either to 1 or 2
+#  OGGVORBIS_INCLUDE_DIR - the OggVorbis include directory
+#  OGGVORBIS_LIBRARIES - The libraries needed to use OggVorbis
+#  OGG_LIBRARY         - The Ogg library
+#  VORBIS_LIBRARY      - The Vorbis library
+#  VORBISFILE_LIBRARY  - The VorbisFile library
+#  VORBISENC_LIBRARY   - The VorbisEnc library
+
+# Copyright (c) 2006, Richard Laerkaeng, <richard@goteborg.utfors.se>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+include (CheckLibraryExists)
+
+find_path(VORBIS_INCLUDE_DIR vorbis/vorbisfile.h)
+find_path(OGG_INCLUDE_DIR ogg/ogg.h)
+
+find_library(OGG_LIBRARY NAMES ogg)
+find_library(VORBIS_LIBRARY NAMES vorbis)
+find_library(VORBISFILE_LIBRARY NAMES vorbisfile)
+find_library(VORBISENC_LIBRARY NAMES vorbisenc)
+
+mark_as_advanced(VORBIS_INCLUDE_DIR OGG_INCLUDE_DIR
+                 OGG_LIBRARY VORBIS_LIBRARY VORBISFILE_LIBRARY VORBISENC_LIBRARY)
+
+
+if (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+   set(OGGVORBIS_FOUND TRUE)
+
+   set(OGGVORBIS_LIBRARIES ${OGG_LIBRARY} ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBISENC_LIBRARY})
+
+   set(_CMAKE_REQUIRED_LIBRARIES_TMP ${CMAKE_REQUIRED_LIBRARIES})
+   set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${OGGVORBIS_LIBRARIES})
+   check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+   set(CMAKE_REQUIRED_LIBRARIES ${_CMAKE_REQUIRED_LIBRARIES_TMP})
+
+   if (HAVE_LIBVORBISENC2)
+      set (OGGVORBIS_VERSION 2)
+   else (HAVE_LIBVORBISENC2)
+      set (OGGVORBIS_VERSION 1)
+   endif (HAVE_LIBVORBISENC2)
+
+else (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+   set (OGGVORBIS_VERSION)
+   set(OGGVORBIS_FOUND FALSE)
+endif (VORBIS_INCLUDE_DIR AND VORBIS_LIBRARY AND VORBISFILE_LIBRARY AND VORBISENC_LIBRARY)
+
+
+if (OGGVORBIS_FOUND)
+   if (NOT OggVorbis_FIND_QUIETLY)
+      message(STATUS "Found OggVorbis: ${OGGVORBIS_LIBRARIES}")
+   endif (NOT OggVorbis_FIND_QUIETLY)
+else (OGGVORBIS_FOUND)
+   if (OggVorbis_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find OggVorbis libraries")
+   endif (OggVorbis_FIND_REQUIRED)
+   if (NOT OggVorbis_FIND_QUITELY)
+      message(STATUS "Could NOT find OggVorbis libraries")
+   endif (NOT OggVorbis_FIND_QUITELY)
+endif (OGGVORBIS_FOUND)
+
+#check_include_files(vorbis/vorbisfile.h HAVE_VORBISFILE_H)
+#check_library_exists(ogg ogg_page_version "" HAVE_LIBOGG)
+#check_library_exists(vorbis vorbis_info_init "" HAVE_LIBVORBIS)
+#check_library_exists(vorbisfile ov_open "" HAVE_LIBVORBISFILE)
+#check_library_exists(vorbisenc vorbis_info_clear "" HAVE_LIBVORBISENC)
+#check_library_exists(vorbis vorbis_bitrate_addblock "" HAVE_LIBVORBISENC2)
+
+#if (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+#    message(STATUS "Ogg/Vorbis found")
+#    set (VORBIS_LIBS "-lvorbis -logg")
+#    set (VORBISFILE_LIBS "-lvorbisfile")
+#    set (VORBISENC_LIBS "-lvorbisenc")
+#    set (OGGVORBIS_FOUND TRUE)
+#    if (HAVE_LIBVORBISENC2)
+#        set (HAVE_VORBIS 2)
+#    else (HAVE_LIBVORBISENC2)
+#        set (HAVE_VORBIS 1)
+#    endif (HAVE_LIBVORBISENC2)
+#else (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+#    message(STATUS "Ogg/Vorbis not found")
+#endif (HAVE_LIBOGG AND HAVE_VORBISFILE_H AND HAVE_LIBVORBIS AND HAVE_LIBVORBISFILE AND HAVE_LIBVORBISENC)
+
--- a/CMakeModules/FindPhonon.cmake
+++ b/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)
--- a/CMakeModules/FindQJSON.cmake
+++ b/CMakeModules/FindQJSON.cmake
@@ -0,0 +1,50 @@
+# Find QJSON - JSON handling library for Qt
+#
+# This module defines
+#  QJSON_FOUND - whether the qsjon library was found
+#  QJSON_LIBRARIES - the qjson library
+#  QJSON_INCLUDE_DIR - the include path of the qjson library
+#
+
+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
+    NAMES
+    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)
+
+  if ( UNIX AND NOT APPLE )
+    set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
+  endif ()
+
+endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
--- a/CMakeModules/FindQTweetLib.cmake
+++ b/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)
+
--- a/CMakeModules/FindQtSparkle.cmake
+++ b/CMakeModules/FindQtSparkle.cmake
@@ -1,20 +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
-
-FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle-qt5/Updater
-    HINTS ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle-qt5
-    HINTS ${CMAKE_INSTALL_LIBDIR}
-)
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(QtSparkle
-                                  REQUIRED_VARS QTSPARKLE_LIBRARIES QTSPARKLE_INCLUDE_DIR)
-
-MARK_AS_ADVANCED(QTSPARKLE_INCLUDE_DIR QTSPARKLE_LIBRARIES)
--- a/CMakeModules/FindQuaZip.cmake
+++ b/CMakeModules/FindQuaZip.cmake
@@ -1,40 +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 (WIN32)
-		FIND_PATH(QUAZIP_LIBRARY_DIR
-			WIN32_DEBUG_POSTFIX d
-            NAMES libquazip5.dll
-			HINTS "C:/Programme/" "C:/Program Files"
-			PATH_SUFFIXES QuaZip/lib
-		)
-        FIND_LIBRARY(QUAZIP_LIBRARIES NAMES libquazip5.dll HINTS ${QUAZIP_LIBRARY_DIR})
-		FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip5)
-		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 quazip5
-			HINTS /usr/lib /usr/lib64
-		)
-		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
-			HINTS /usr/include /usr/local/include
-			PATH_SUFFIXES quazip5
-		)
-		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()
--- a/CMakeModules/FindSparsehash.cmake
+++ b/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)
--- a/CMakeModules/FindTaglib.cmake
+++ b/CMakeModules/FindTaglib.cmake
@@ -34,10 +34,10 @@ ELSE()

 	  exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)

-	  if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+	  if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
 		 message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
 		 set(TAGLIB_FOUND FALSE)
-	  else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+	  else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")

 		 exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)

@@ -48,7 +48,7 @@ ELSE()
 #			message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
 		 endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
 		 string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
-	  endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+	  endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
 	  mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)

 	else(TAGLIBCONFIG_EXECUTABLE)
@@ -61,6 +61,7 @@ ELSE()
 		tag.h
 		PATH_SUFFIXES taglib
 		PATHS
+		${KDE4_INCLUDE_DIR}
 		${INCLUDE_INSTALL_DIR}
 	  )

@@ -68,6 +69,7 @@ ELSE()
 		WIN32_DEBUG_POSTFIX d
 		NAMES tag
 		PATHS
+		${KDE4_LIB_DIR}
 		${LIB_INSTALL_DIR}
 	  )
 	  
--- a/CMakeModules/FindTelepathyQt.cmake
+++ b/CMakeModules/FindTelepathyQt.cmake
@@ -1,16 +0,0 @@
-# Copyright (c) 2013, Teo Mrnjavac <teo@kde.org>
-
-include(FindPackageHandleStandardArgs)
-
-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})
-
-set(TELEPATHY_QT_FOUND ${TelepathyQt_FOUND})
-
-find_package_handle_standard_args(TelepathyQt DEFAULT_MSG  TELEPATHY_QT_INSTALL_DIR )
--- a/CMakeModules/GNUInstallDirs.cmake
+++ b/CMakeModules/GNUInstallDirs.cmake
@@ -0,0 +1,182 @@
+# - Define GNU standard installation directories
+# Provides install directory variables as defined for GNU software:
+#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+# Inclusion of this module defines the following variables:
+#  CMAKE_INSTALL_<dir>      - destination for files of a given type
+#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+# where <dir> is one of:
+#  BINDIR           - user executables (bin)
+#  SBINDIR          - system admin executables (sbin)
+#  LIBEXECDIR       - program executables (libexec)
+#  SYSCONFDIR       - read-only single-machine data (etc)
+#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#  LOCALSTATEDIR    - modifiable single-machine data (var)
+#  LIBDIR           - object code libraries (lib or lib64)
+#  INCLUDEDIR       - C header files (include)
+#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#  DATAROOTDIR      - read-only architecture-independent data root (share)
+#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#  INFODIR          - info documentation (DATAROOTDIR/info)
+#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#  MANDIR           - man documentation (DATAROOTDIR/man)
+#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+# install() commands for the corresponding file type.  If the includer does
+# not define a value the above-shown default will be used and the value will
+# appear in the cache for editing by the user.
+# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the value
+# of CMAKE_INSTALL_PREFIX.
+
+#=============================================================================
+# Copyright 2011 Nikita Krupen'ko <krnekit@gmail.com>
+# Copyright 2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Installation directories
+#
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+  set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+  set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+  set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+  set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+  set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # Note that the future of multi-arch handling may be even
+  # more complicated than that: http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING
+      AND NOT EXISTS "/etc/debian_version")
+    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+      message(AUTHOR_WARNING
+        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+        "Please enable at least one language before including GNUInstallDirs.")
+    else()
+      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+        set(_LIBDIR_DEFAULT "lib64")
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+  set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+endif()
+
+#-----------------------------------------------------------------------------
+# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
+# the cache and store the defaults in local variables if the cache values are
+# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
+
+if(NOT CMAKE_INSTALL_DATADIR)
+  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+endif()
+
+if(NOT CMAKE_INSTALL_INFODIR)
+  set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+  set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+endif()
+
+if(NOT CMAKE_INSTALL_MANDIR)
+  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+endif()
+
+if(NOT CMAKE_INSTALL_DOCDIR)
+  set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+  set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+endif()
+
+#-----------------------------------------------------------------------------
+
+mark_as_advanced(
+  CMAKE_INSTALL_BINDIR
+  CMAKE_INSTALL_SBINDIR
+  CMAKE_INSTALL_LIBEXECDIR
+  CMAKE_INSTALL_SYSCONFDIR
+  CMAKE_INSTALL_SHAREDSTATEDIR
+  CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_INCLUDEDIR
+  CMAKE_INSTALL_OLDINCLUDEDIR
+  CMAKE_INSTALL_DATAROOTDIR
+  CMAKE_INSTALL_DATADIR
+  CMAKE_INSTALL_INFODIR
+  CMAKE_INSTALL_LOCALEDIR
+  CMAKE_INSTALL_MANDIR
+  CMAKE_INSTALL_DOCDIR
+  )
+
+# Result directories
+#
+foreach(dir
+    BINDIR
+    SBINDIR
+    LIBEXECDIR
+    SYSCONFDIR
+    SHAREDSTATEDIR
+    LOCALSTATEDIR
+    LIBDIR
+    INCLUDEDIR
+    OLDINCLUDEDIR
+    DATAROOTDIR
+    DATADIR
+    INFODIR
+    LOCALEDIR
+    MANDIR
+    DOCDIR
+    )
+  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+  else()
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+  endif()
+endforeach()
--- a/CMakeModules/MacroLogFeature.cmake
+++ b/CMakeModules/MacroLogFeature.cmake
@@ -93,7 +93,7 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _
   FILE(APPEND "${_LOGFILENAME}" "${_logtext}\n")

   IF(COMMAND SET_PACKAGE_INFO)  # in FeatureSummary.cmake since CMake 2.8.3
-     SET_PACKAGE_PROPERTIES("${_package}" PROPERTIES DESCRIPTION "\"${_description}\"" URL "${_url}" PURPOSE "\"${_comments}\"")
+     SET_PACKAGE_INFO("${_package}" "\"${_description}\"" "${_url}" "\"${_comments}\"")
   ENDIF(COMMAND SET_PACKAGE_INFO)

 ENDMACRO(MACRO_LOG_FEATURE)
--- a/CMakeModules/NSIS.template.in
+++ b/CMakeModules/NSIS.template.in
@@ -15,24 +15,16 @@
 ;-----------------------------------------------------------------------------
 ; Some paths.
 ;-----------------------------------------------------------------------------
-!ifndef MINGW_ROOT
-    !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw"
+!ifndef MING_PATH
+    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
 !endif
-!define APPLICATION_NAME "@CPACK_PACKAGE_NAME@"
-!define TARGET_NAME "@CPACK_PACKAGE_TARGET_NAME@"
-;define app id needed for Windows 8 notifications
-!define AppUserModelId "@TOMAHAWK_APPLICATION_PACKAGE_NAME@"
-
-!define MINGW_BIN "${MINGW_ROOT}/bin"
-!define MINGW_LIB "${MINGW_ROOT}/lib"
-!define MINGW_SHARE "${MINGW_ROOT}/share"
-
+!define MING_BIN "${MING_PATH}/bin"
+!define MING_LIB "${MING_PATH}/lib"
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
-!define QT_DLL_PATH "${MINGW_BIN}"
-!define QT_QML_PATH "${MINGW_SHARE}/qt5/qml"
-!define SQLITE_DLL_PATH "${MINGW_LIB}/qt5/plugins/sqldrivers"
-!define IMAGEFORMATS_DLL_PATH "${MINGW_LIB}/qt5/plugins/imageformats"
+!define QT_DLL_PATH "${MING_BIN}"
+!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
@@ -60,11 +52,11 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
-Caption "${APPLICATION_NAME} Installer"
-BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
+Caption "Tomahawk Installer"
+BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
 OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
 InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
-InstallDirRegKey HKCU "Software\{APPLICATION_NAME}" ""
+InstallDirRegKey HKCU "Software\Tomahawk" ""
 InstType Standard
 InstType Full
 InstType Minimal
@@ -87,18 +79,12 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include WinVer.nsh ;Windows version detection.
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
 !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
-!include ${NSI_PATH}\SnoreNotify.nsh ; Macro for creation of a shortcut with a AppUserModelId.

 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
 ;-----------------------------------------------------------------------------
 !define MEMENTO_REGISTRY_ROOT HKLM
-!define MEMENTO_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
-
-;-----------------------------------------------------------------------------
-; Setup macros for the creation of a shortcut supporting Windows 8 notifications.
-;-----------------------------------------------------------------------------
-!define SnoreToastExe "$INSTDIR\SnoreToast.exe"
+!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk

 ;-----------------------------------------------------------------------------
 ; Modern User Interface (MUI) defintions and setup.
@@ -161,7 +147,7 @@ Function LaunchTomahawk
 FunctionEnd

 Function LaunchTomahawkAsUser
-   Exec "$INSTDIR\${APPLICATION_NAME}.exe"
+   Exec "$INSTDIR\tomahawk.exe"
 FunctionEnd

 ##############################################################################
@@ -171,31 +157,31 @@ FunctionEnd
 ##############################################################################

 !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess "${processName}"
-   StrCmp $R0 "0" "${gotoWhenNotFound}" "${gotoWhenFound}"
+   Processes::FindProcess ${processName}
+   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
 !macroend

-!macro ConfirmEndProcess processTitle processName
+!macro ConfirmEndProcess processName
   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
-     IDYES "process_${processTitle}_kill" IDNO "process_${processTitle}_ended"
-   process_${processTitle}_kill:
+     IDYES process_${processName}_kill IDNO process_${processName}_ended
+   process_${processName}_kill:
      DetailPrint "Killing ${processName} processes."
-      Processes::KillProcess "${processName}"
+      Processes::KillProcess ${processName}
      Sleep 1500
-      StrCmp $R0 "1" "process_${processTitle}_ended"
+      StrCmp $R0 "1" process_${processName}_ended
      DetailPrint "Process to kill not found!"
-   process_${processTitle}_ended:
+   process_${processName}_ended:
 !macroend

-!macro CheckAndConfirmEndProcess processTitle processName
-   !insertmacro CheckForProcess "${processName}" 0 "no_process_${processTitle}_to_end"
-   !insertmacro ConfirmEndProcess "${processTitle}" "${processName}"
-   no_process_${processTitle}_to_end:
+!macro CheckAndConfirmEndProcess processName
+   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
+   !insertmacro ConfirmEndProcess ${processName}
+   no_process_${processName}_to_end:
 !macroend

 Function EnsureTomahawkShutdown
-   !insertmacro CheckAndConfirmEndProcess "${TARGET_NAME}" "${APPLICATION_NAME}.exe"
+   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
 FunctionEnd

 ##############################################################################
@@ -205,40 +191,40 @@ FunctionEnd
 ##############################################################################

 Function PageReinstall
-   ReadRegStr $R0 HKLM "Software\${APPLICATION_NAME}" ""
+   ReadRegStr $R0 HKLM "Software\Tomahawk" ""
   StrCmp $R0 "" 0 +2
   Abort

   ;Detect version
-   ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
+   ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMajor"
   IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
   minor_check:
-      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMinor"
      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
   build_check:
-      ReadRegDWORD $R0 HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
      IntCmp $R0 ${VER_BUILD} same_version new_version older_version

   new_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of ${APPLICATION_NAME} is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
      StrCpy $R0 "1"
      Goto reinst_start

   older_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of ${APPLICATION_NAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install ${APPLICATION_NAME}."
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
      StrCpy $R0 "1"
      Goto reinst_start

   same_version:
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "${APPLICATION_NAME} ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
-      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall ${APPLICATION_NAME}"
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall Tomahawk"
      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
      StrCpy $R0 "2"

@@ -253,12 +239,12 @@ Function PageLeaveReinstall
   StrCmp $R0 "2" 0 +3
   StrCmp $R1 "1" reinst_done reinst_uninstall
   reinst_uninstall:
-      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString"
+      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString"
      HideWindow
      ClearErrors
      ExecWait '$R1 _?=$INSTDIR'
      IfErrors no_remove_uninstaller
-      IfFileExists "$INSTDIR\${APPLICATION_NAME}.exe" no_remove_uninstaller
+      IfFileExists "$INSTDIR\tomahawk.exe" no_remove_uninstaller
      Delete $R1
      RMDir $INSTDIR
   no_remove_uninstaller:
@@ -274,40 +260,40 @@ FunctionEnd
 #   INSTALLER SECTIONS                                                       #
 #                                                                            #
 ##############################################################################
-Section "${APPLICATION_NAME}" SEC_TOMAHAWK_PLAYER
+Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
   SectionIn 1 2 3 RO
   SetDetailsPrint listonly

   SetDetailsPrint textonly
-   DetailPrint "Installing ${APPLICATION_NAME} essentials."
+   DetailPrint "Installing Tomahawk Player essentials."
   SetDetailsPrint listonly
   SetOutPath "$INSTDIR"

   !ifdef INSTALL_PATH
        ;Main executable.
-        File "${INSTALL_PATH}\bin\${APPLICATION_NAME}.exe"
+        File "${INSTALL_PATH}\bin\tomahawk.exe"

-        File "${INSTALL_PATH}\bin\${TARGET_NAME}_crash_reporter.exe"
-
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}.dll"
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-widgets.dll"
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-playdarapi.dll"
+        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
+        File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"

+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
        ; plugins
-        File "${INSTALL_PATH}\lib\lib${TARGET_NAME}_*_*.dll"
+        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
   !endif
   !ifndef INSTALL_PATH
        ;Main executable.
-        File "${BUILD_PATH}\${APPLICATION_NAME}.exe"
+        File "${BUILD_PATH}\tomahawk.exe"

-        File "${BUILD_PATH}\${TARGET_NAME}_crash_reporter.exe"
-
-        File "${BUILD_PATH}\lib${TARGET_NAME}.dll"
-        File "${BUILD_PATH}\lib${TARGET_NAME}-widgets.dll"
-        File "${BUILD_PATH}\lib${TARGET_NAME}-playdarapi.dll"
+        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
+        File "${BUILD_PATH}\libtomahawk_breakpad.dll"

+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
        ; plugins
-        File "${BUILD_PATH}\lib${TARGET_NAME}_*_*.dll"
+        File "${BUILD_PATH}\libtomahawk_*_*.dll"
   !endif

   ;License & release notes.
@@ -315,139 +301,72 @@ Section "${APPLICATION_NAME}" 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"
-    File "${QT_DLL_PATH}\Qt5Positioning.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"

-    ;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-5.dll"
-    File "${QT_DLL_PATH}\icuuc56.dll"
-    File "${QT_DLL_PATH}\icudata56.dll"
-    File "${QT_DLL_PATH}\icui18n56.dll"
+   ;SQLite driver
+   SetOutPath "$INSTDIR\sqldrivers"
+   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
+   SetOutPath "$INSTDIR"

-    ;SQLite driver
-    SetOutPath "$INSTDIR\sqldrivers"
-    File "${SQLITE_DLL_PATH}\qsqlite.dll"
-    SetOutPath "$INSTDIR"
-    File "${MINGW_BIN}\libsqlite3-0.dll"
+   ;Image plugins
+   SetOutPath "$INSTDIR\imageformats"
+   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
+   SetOutPath "$INSTDIR"

-    ;Qt platform plugins
-    SetOutPath "$INSTDIR\platforms"
-     File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.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"

-    ;Image plugins
-    SetOutPath "$INSTDIR\imageformats"
-    File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
-    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
-    File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
-    SetOutPath "$INSTDIR"
+   ;Phonon stuff
+   File "${MING_BIN}\libphonon.dll"
+   SetOutPath "$INSTDIR\phonon_backend"
+   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
+   SetOutPath "$INSTDIR"

-    ;Qt qml plugins
-    SetOutPath "$INSTDIR\QtQuick.2"
-    File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
-    SetOutPath "$INSTDIR\QtQuick\Window.2"
-    File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
-    SetOutPath "$INSTDIR"
+   ;VLC
+   File "${VLC_BIN}\libvlc.dll"
+   File "${VLC_BIN}\libvlccore.dll"
+   SetOutPath "$INSTDIR\plugins"
+   File /r "${VLC_PLUGIN_PATH}\*.dll"
+   SetOutPath "$INSTDIR"

-    ;Cygwin/c++ stuff
-    File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
-    File "${MINGW_BIN}\libstdc++-6.dll"
+   ; Other
+   File "${MING_BIN}\libqjson.dll"
+   File "${MING_BIN}\libtag.dll"
+   File "${MING_BIN}\libpng15-15.dll"
+   File "${MING_BIN}\libjpeg-8.dll"
+   File "${MING_BIN}\zlib1.dll"

-    ;VLC
-    File "${VLC_BIN}\libvlc.dll"
-    File "${VLC_BIN}\libvlccore.dll"
-    SetOutPath "$INSTDIR\plugins"
-    File /r "${VLC_PLUGIN_PATH}\*.dll"
-    SetOutPath "$INSTDIR"
-
-    ; Other
-    File "${MINGW_BIN}\libtag.dll"
-    File "${MINGW_BIN}\libpng16-16.dll"
-    File "${MINGW_BIN}\libjpeg-8.dll"
-    File "${MINGW_BIN}\zlib1.dll"
-    File "${MINGW_BIN}\libfreetype-6.dll"
-    File "${MINGW_BIN}\libglib-2.0-0.dll"
-    File "${MINGW_BIN}\libharfbuzz-0.dll"
-
-    ; ANGLE
-    File "${MINGW_BIN}\D3DCompiler_43.dll"
-
-    File "${MINGW_BIN}\libechonest5.dll"
-    File "${MINGW_BIN}\liblastfm5.dll"
-    File "${MINGW_BIN}\libquazip5.dll"
-    File "${MINGW_BIN}\libqt5keychain.dll"
-
-    ; GnuTLS
-    File "${MINGW_BIN}\libgnutls-28.dll"
-    File "${MINGW_BIN}\libtasn1-6.dll"
-    File "${MINGW_BIN}\libgmp-10.dll"
-    File "${MINGW_BIN}\libhogweed-4-1.dll"
-    File "${MINGW_BIN}\libintl-8.dll"
-    File "${MINGW_BIN}\libnettle-6-1.dll"
-    File "${MINGW_BIN}\libp11-kit-0.dll"
-    File "${MINGW_BIN}\libffi-6.dll"
-
-    ; Snorenotify
-    File "${MINGW_BIN}\SnoreToast.exe"
-    File "${MINGW_BIN}\libsnore-qt5.dll"
-    File "${MINGW_BIN}\libsnoresettings-qt5.dll"
-    File "${MINGW_BIN}\snoresettings.exe"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_growl.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_growl.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snarl.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snarl.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_snore.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_settings_backend_snore.dll"
-    File "${MINGW_LIB}\plugins\libsnore-qt5\libsnore_backend_windowstoast.dll"
-
-    ; Snoregrowl
-    File "${MINGW_BIN}\libsnoregrowl++.dll"
-    File "${MINGW_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 "${MINGW_BIN}\libjreen-qt5.dll"
-    File "${MINGW_BIN}\libidn-11.dll"
-    File "${MINGW_BIN}\libgsasl-7.dll"
-    File "${MINGW_BIN}\libqca-qt5.dll"
-    SetOutPath "$INSTDIR\crypto"
-    File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
-    SetOutPath "$INSTDIR"
-    File "${MINGW_BIN}\libssl-10.dll"
-    File "${MINGW_BIN}\libcrypto-10.dll"
+   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libqca.dll"
+   SetOutPath "$INSTDIR\crypto"
+   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-8.dll"

-    ; LucenePlusPlus
-    File "${MINGW_BIN}\liblucene++.dll"
-    File "${MINGW_BIN}\libboost_system-mt.dll"
-    File "${MINGW_BIN}\libboost_filesystem-mt.dll"
-    File "${MINGW_BIN}\libboost_iostreams-mt.dll"
-    File "${MINGW_BIN}\libboost_regex-mt.dll"
-    File "${MINGW_BIN}\libboost_thread-mt.dll"
-    File "${MINGW_BIN}\libbz2-1.dll"
+   File "${MING_LIB}\libclucene-core.dll"
+   File "${MING_LIB}\libclucene-shared.dll"

-    File "${MINGW_BIN}\libqtsparkle-qt5.dll"
-    File "${MINGW_BIN}\libKF5Attica.dll"
+   File "${MING_BIN}\libqtsparkle.dll"
+   File "${MING_BIN}\libattica.dll"
 SectionEnd

 SectionGroup "Shortcuts"
@@ -456,16 +375,15 @@ SectionGroup "Shortcuts"
   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
      SectionIn 1 2
      SetDetailsPrint textonly
-      DetailPrint "Adding shortcuts for the ${APPLICATION_NAME} program group to the Start Menu."
+      DetailPrint "Adding shortcuts for the Tomahawk program group to the Start Menu."
      SetDetailsPrint listonly
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Notification Settings.lnk" "$INSTDIR\snoresettings.exe" "-a ${APPLICATION_NAME}"
-      !insertmacro SnoreShortcut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe" "${AppUserModelId}"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+      RMDir /r "$SMPROGRAMS\Tomahawk"
+      CreateDirectory "$SMPROGRAMS\Tomahawk"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
      SetShellVarContext current
   ${MementoSectionEnd}
 !endif
@@ -476,7 +394,7 @@ SectionGroup "Shortcuts"
      SetDetailsPrint textonly
      DetailPrint "Creating Desktop Shortcuts"
      SetDetailsPrint listonly
-      CreateShortCut "$DESKTOP\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe"
+      CreateShortCut "$DESKTOP\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
   ${MementoSectionEnd}
 !endif

@@ -486,7 +404,7 @@ SectionGroup "Shortcuts"
      SetDetailsPrint textonly
      DetailPrint "Creating Quick Launch Shortcut"
      SetDetailsPrint listonly
-      CreateShortCut "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe"
+      CreateShortCut "$QUICKLAUNCH\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
   ${MementoSectionEnd}
 !endif

@@ -497,10 +415,10 @@ ${MementoSectionDone}
 ; Installer section descriptions
 ;--------------------------------
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "${APPLICATION_NAME} essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "Tomahawk player essentials."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "Tomahawk program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for Tomahawk."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for Tomahawk."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 Section -post
@@ -517,98 +435,32 @@ Section -post
   SetDetailsPrint listonly

   ;Version numbers used to detect existing installation version for comparisson.
-   WriteRegStr HKLM "Software\${APPLICATION_NAME}" "" $INSTDIR
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionRevision" "${REVISION}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"
+   WriteRegStr HKLM "Software\Tomahawk" "" $INSTDIR
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMinor" "${VER_MINOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionRevision" "${REVISION}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionBuild" "${VER_BUILD}"

   ;Add or Remove Programs entry.
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "@TOMAHAWK_ORGANIZATION_DOMAIN@"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}.${REVISION}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "URLInfoAbout" "http://@TOMAHAWK_ORGANIZATION_DOMAIN@/"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "HelpLink" "http://@TOMAHAWK_ORGANIZATION_DOMAIN@/"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoModify" "1"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoRepair" "1"
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation" "$INSTDIR"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayName" "Tomahawk"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "Publisher" "Tomahawk-player.org"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayVersion" "${VERSION}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMinor" "${VER_MINOR}.${REVISION}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "URLInfoAbout" "http://tomahawk-player.org/"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "HelpLink" "http://tomahawk-player.org/"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"

   ; Register tomahawk:// protocol handler
   WriteRegStr HKCR "tomahawk" "" "URL:Tomahawk Protocol"
   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
-   WriteRegStr HKCR "tomahawk\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
+   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
   WriteRegStr HKCR "tomahawk\shell" "" "open"
-   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   ; Register file associations
-   WriteRegStr HKCR ".mp3" "" "MPEG Audio Layer 3"
-   WriteRegStr HKCR ".mp3\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".mp3\shell" "" "open"
-   WriteRegStr HKCR ".mp3\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".oga" "" "Ogg Audio File"
-   WriteRegStr HKCR ".oga\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".oga\shell" "" "open"
-   WriteRegStr HKCR ".oga\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".ogg" "" "Ogg Audio File"
-   WriteRegStr HKCR ".ogg\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".ogg\shell" "" "open"
-   WriteRegStr HKCR ".ogg\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".opus" "" "OPUS File"
-   WriteRegStr HKCR ".opus\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".opus\shell" "" "open"
-   WriteRegStr HKCR ".opus\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".mp4" "" "AAC File"
-   WriteRegStr HKCR ".mp4\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".mp4\shell" "" "open"
-   WriteRegStr HKCR ".mp4\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".aac" "" "AAC File"
-   WriteRegStr HKCR ".aac\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".aac\shell" "" "open"
-   WriteRegStr HKCR ".aac\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".m4a" "" "AAC File"
-   WriteRegStr HKCR ".m4a\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".m4a\shell" "" "open"
-   WriteRegStr HKCR ".m4a\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".mpc" "" "Musepack Audio File"
-   WriteRegStr HKCR ".mpc\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".mpc\shell" "" "open"
-   WriteRegStr HKCR ".mpc\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".wma" "" "Windows Media Audio"
-   WriteRegStr HKCR ".wma\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".wma\shell" "" "open"
-   WriteRegStr HKCR ".wma\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".aiff" "" "AIFF File"
-   WriteRegStr HKCR ".aiff\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".aiff\shell" "" "open"
-   WriteRegStr HKCR ".aiff\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".aif" "" "AIFF File"
-   WriteRegStr HKCR ".aif\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".aif\shell" "" "open"
-   WriteRegStr HKCR ".aif\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".wv" "" "WavePack Audio File"
-   WriteRegStr HKCR ".wv\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".wv\shell" "" "open"
-   WriteRegStr HKCR ".wv\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
-
-   WriteRegStr HKCR ".flac" "" "FLAC Audio File"
-   WriteRegStr HKCR ".flac\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
-   WriteRegStr HKCR ".flac\shell" "" "open"
-   WriteRegStr HKCR ".flac\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'

   SetDetailsPrint textonly
   DetailPrint "Finsihed."
@@ -626,7 +478,7 @@ Var UnPageUserAppDataCheckbox_State
 Var UnPageUserAppDataEditBox

 Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT "Uninstall ${APPLICATION_NAME}" "Remove ${APPLICATION_NAME}'s data folder from your computer."
+   !insertmacro MUI_HEADER_TEXT "Uninstall Tomahawk" "Remove Tomahawk's data folder from your computer."
   nsDialogs::Create /NOUNLOAD 1018
   Pop $UnPageUserAppDataDialog

@@ -634,10 +486,10 @@ Function un.UnPageUserAppData
      Abort
   ${EndIf}

-   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete ${APPLICATION_NAME}'s data folder?"
+   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete Tomahawk's data folder?"
   Pop $0

-   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\${APPLICATION_NAME}"
+   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\Tomahawk"
   Pop $UnPageUserAppDataEditBox
   SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0

@@ -655,41 +507,39 @@ Function un.UnPageUserAppDataLeave
 FunctionEnd

 Section Uninstall
-   IfFileExists "$INSTDIR\${APPLICATION_NAME}.exe" tomahawk_installed
-      MessageBox MB_YESNO "It does not appear that ${APPLICATION_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
+   IfFileExists "$INSTDIR\tomahawk.exe" tomahawk_installed
+      MessageBox MB_YESNO "It does not appear that Tomahawk is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
      Abort "Uninstall aborted by user"
   tomahawk_installed:

   ;Delete registry keys.
-   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionRevision"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" ""
-   DeleteRegKey HKLM "Software\${APPLICATION_NAME}"
+   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionBuild"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMajor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMinor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
+   DeleteRegValue HKLM "Software\Tomahawk" ""
+   DeleteRegKey HKLM "Software\Tomahawk"

-   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}"
-   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}Spotify"
-   DeleteRegKey HKCR "${APPLICATION_NAME}"
+   DeleteRegKey HKCR "tomahawk"

   ;Start menu shortcuts.
   !ifdef OPTION_SECTION_SC_START_MENU
      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\${APPLICATION_NAME}"
+      RMDir /r "$SMPROGRAMS\Tomahawk"
      SetShellVarContext current
   !endif

   ;Desktop shortcut.
   !ifdef OPTION_SECTION_SC_DESKTOP
-      IfFileExists "$DESKTOP\${APPLICATION_NAME}.lnk" 0 +2
-         Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
+      IfFileExists "$DESKTOP\Tomahawk.lnk" 0 +2
+         Delete "$DESKTOP\Tomahawk.lnk"
   !endif

   ;Quick Launch shortcut.
   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-      IfFileExists "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" 0 +2
-         Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
+      IfFileExists "$QUICKLAUNCH\Tomahawk.lnk" 0 +2
+         Delete "$QUICKLAUNCH\Tomahawk.lnk"
   !endif

   ;Remove all the Program Files.
@@ -697,7 +547,7 @@ Section Uninstall

   ;Uninstall User Data if option is checked, otherwise skip.
   ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
-      RMDir /r "$LOCALAPPDATA\${APPLICATION_NAME}"
+      RMDir /r "$LOCALAPPDATA\Tomahawk"
   ${EndIf}

   SetDetailsPrint textonly
@@ -751,7 +601,7 @@ Function .onInit

   ;Use available InstallLocation when possible. This is useful in the uninstaller
   ;via re-install, which would otherwise use a default location - a bug.
-   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation"
+   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
   StrCmp $R0 "" SkipSetInstDir
   StrCpy $INSTDIR $R0
   SkipSetInstDir:
--- a/149
+++ b/149
@@ -1,152 +1,3 @@
-Version 0.9.0:
-    * Resolved various playback issues by switching to a new audio engine.
-    * Fixed collection sorting.
-    * Fixed volume/mute state not being reset correctly on startup.
-
-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.
--- a/Docker/Docker.variables
+++ b/Docker/Docker.variables
@@ -1,2 +0,0 @@
-DOCKER_IMAGE_NAME=tomahawkmusicplayer/ubuntu
-DOCKER_IMAGE_VER=latest
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,274 +0,0 @@
-FROM ubuntu:19.04 as base
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-    build-essential \
-    ca-certificates \
-    ninja-build \
-    openssh-client \
-    curl \
-    gnupg2 \
-    gosu \
-    wget \
-    locales \
-    git \
-    subversion \
-    make \
-    pkg-config \
-    unzip \
-    xz-utils \
-    software-properties-common \
-    sudo \
-    apt-utils \
-    && rm -rf /var/lib/apt/lists/*
-
-# LLVM/Clang
-ENV CLANG_VERSION=9
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
-    && apt-add-repository "deb http://apt.llvm.org/disco/ llvm-toolchain-disco-$CLANG_VERSION main" \
-    && apt-get update && apt-get install -y \
-    clang-$CLANG_VERSION \
-    clang-tidy-$CLANG_VERSION \
-    clang-format-$CLANG_VERSION \
-    llvm-$CLANG_VERSION-dev \
-    libclang-$CLANG_VERSION-dev \
-    && update-alternatives \
-    --install /usr/bin/clang clang /usr/bin/clang-$CLANG_VERSION 100 \
-    --slave /usr/bin/clang++ clang++ /usr/bin/clang++-$CLANG_VERSION \
-    --slave /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-$CLANG_VERSION \
-    --slave /usr/bin/clang-format clang-format /usr/bin/clang-format-$CLANG_VERSION
-
-# GCC
-ENV GCC_VERSION=9
-RUN sudo apt-get update \
-    && sudo apt-get install -y --no-install-recommends \
-    g++-$GCC_VERSION \
-    gcc-$GCC_VERSION \
-    && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9
-
-# Tomahawk deps
-RUN sudo apt-get update \
-    && apt-get install -y --no-install-recommends \
-    cmake \
-    libattica-dev \
-    libboost-dev    \
-    libboost-filesystem-dev \
-    libboost-iostreams-dev \
-    libboost-thread-dev \
-    libfftw3-dev \
-    libgnutls28-dev \
-    libgsasl7-dev \
-    liblastfm-dev \
-    liblastfm5-dev \
-    liblucene++-dev \
-    libphonon-dev \
-    libphononexperimental-dev \
-    libqca-qt5-2-dev \
-    libqca2-dev \
-    libqca2-plugins \
-    libqjson-dev \
-    libqt5svg5-dev \
-    libqt5webkit5-dev \
-    libqt5webkit5\
-    libsamplerate0-dev \
-    libsparsehash-dev \
-    libssl-dev \
-    libtelepathy-qt5-dev \
-    libvlc-dev \
-    libvlccore-dev \
-    libx11-dev \
-    libz-dev \
-    qt5-default \
-    qtbase5-dev \
-    qttools5-dev \
-    qttools5-dev-tools \
-    zlib1g-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN git clone  --depth 1 https://github.com/zaphoyd/websocketpp.git --branch master --single-branch websocketpp \
-    && mkdir websocketpp/build && cd websocketpp/build \
-    && cmake .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r websocketpp
-
-RUN git clone --depth 1 https://github.com/frankosterfeld/qtkeychain.git --branch master --single-branch qtkeychain \
-    && mkdir qtkeychain/build && cd qtkeychain/build \
-    && cmake .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r qtkeychain
-
-RUN git clone --depth 1 https://github.com/taglib/taglib.git --branch master --single-branch taglib \
-    && mkdir taglib/build && cd taglib/build \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_SHARED_LIBS=ON .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r taglib
-
-RUN git clone --depth 1 https://anongit.kde.org/extra-cmake-modules.git --branch master --single-branch ecm \
-    && mkdir ecm/build && cd ecm/build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r ecm
-
-RUN git clone --depth 1 https://github.com/KDE/attica.git --branch master --single-branch attica \
-    && mkdir attica/build && cd attica/build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r attica
-
-RUN git clone --depth 1 https://github.com/stachenov/quazip.git --branch master --single-branch quazip \
-    && mkdir quazip/build && cd quazip/build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r quazip
-
-RUN git clone --depth 1 https://github.com/euroelessar/jreen.git --branch master --single-branch jreen \
-    && mkdir jreen/build && cd jreen/build \
-    && cmake -DCMAKE_BUILD_TYPE=Release .. \
-    && sudo cmake --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r jreen
-
-# MXE deps
-RUN sudo apt-get update \
-    && apt-get install -y --no-install-recommends \
-    autoconf \
-    automake \
-    autopoint \
-    bash \
-    bison \
-    bzip2 \
-    flex \
-    g++ \
-    g++-multilib \
-    gettext \
-    git \
-    gperf \
-    intltool \
-    libc6-dev-i386 \
-    libgdk-pixbuf2.0-dev \
-    libltdl-dev \
-    libssl-dev \
-    libtool-bin \
-    libxml-parser-perl \
-    lzip \
-    make \
-    openssl \
-    p7zip-full \
-    patch \
-    perl \
-    pkg-config \
-    python \
-    ruby \
-    sed \
-    unzip \
-    wget \
-    xz-utils \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN git clone --depth 1 https://github.com/mxe/mxe.git --branch master --single-branch mxe \
-    && sudo mv mxe /opt/mxe
-
-ENV MXE_PATH=/opt/mxe
-ENV MXE_TOOLCHAIN="i686-w64-mingw32.shared"
-ENV MXE_CMAKE=i686-w64-mingw32.shared-cmake
-ENV MXE_PLUGINS=/opt/mxe/plugins/gcc9
-
-RUN cd $MXE_PATH \
-    && sudo make MXE_TARGETS=$MXE_TOOLCHAIN MXE_PLUGIN_DIRS=$MXE_PLUGINS \
-    qt5
-
-RUN cd $MXE_PATH \
-    && sudo make MXE_TARGETS=$MXE_TOOLCHAIN MXE_PLUGIN_DIRS=$MXE_PLUGINS \
-    qttools
-
-RUN cd $MXE_PATH \
-    && sudo make MXE_TARGETS=$MXE_TOOLCHAIN MXE_PLUGIN_DIRS=$MXE_PLUGINS \
-    boost
-
-RUN cd $MXE_PATH \
-    && sudo make MXE_TARGETS=$MXE_TOOLCHAIN MXE_PLUGIN_DIRS=$MXE_PLUGINS \
-    cc \
-    qca \
-    qtsparkle \
-    nsis \
-    liblastfm \
-    libgsasl
-
-RUN cd $MXE_PATH \
-    && sudo make MXE_TARGETS=$MXE_TOOLCHAIN MXE_PLUGIN_DIRS=$MXE_PLUGINS \
-    qtwebkit \
-    sparsehash
-
-ENV PATH=/opt/mxe/usr/bin:$PATH
-RUN sudo chmod -R 777 /opt/mxe/.ccache
-
-RUN git clone --depth 1 https://anongit.kde.org/extra-cmake-modules.git --branch master --single-branch ecm \
-    && mkdir ecm/build && cd ecm/build \
-    && $MXE_CMAKE -DCMAKE_BUILD_TYPE=Release .. \
-    && $MXE_CMAKE  --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r ecm
-
-RUN git clone  --depth 1 https://github.com/zaphoyd/websocketpp.git --branch master --single-branch websocketpp \
-    && mkdir websocketpp/build && cd websocketpp/build \
-    && $MXE_CMAKE .. \
-    && $MXE_CMAKE  --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r websocketpp
-
-RUN git clone --depth 1 https://github.com/frankosterfeld/qtkeychain.git --branch master --single-branch qtkeychain \
-    && mkdir qtkeychain/build && cd qtkeychain/build \
-    && $MXE_CMAKE .. \
-    && $MXE_CMAKE --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r qtkeychain
-
-RUN git clone --depth 1 https://github.com/taglib/taglib.git --branch master --single-branch taglib \
-    && mkdir taglib/build && cd taglib/build \
-    && $MXE_CMAKE -DCMAKE_INSTALL_PREFIX=/opt/mxe/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_SHARED_LIBS=ON .. \
-    && $MXE_CMAKE --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r taglib
-
-RUN git clone --depth 1 https://github.com/KDE/attica.git --branch master --single-branch attica \
-    && mkdir attica/build && cd attica/build \
-    && $MXE_CMAKE -DCMAKE_BUILD_TYPE=Release .. \
-    && $MXE_CMAKE --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r attica
-
-RUN git clone --depth 1 https://github.com/stachenov/quazip.git --branch master --single-branch quazip \
-    && mkdir quazip/build && cd quazip/build \
-    && $MXE_CMAKE -DCMAKE_BUILD_TYPE=Release .. \
-    && $MXE_CMAKE --build . -j 16 --target install \
-    && cd ../.. \
-    && rm -r quazip
-
-#RUN git clone --depth 1 https://github.com/euroelessar/jreen.git --branch master --single-branch jreen \
-#    && mkdir jreen/build && cd jreen/build \
-#    && $MXE_CMAKE -DCMAKE_BUILD_TYPE=Release .. \
-#    && $MXE_CMAKE -build . -j 16 --target install \
-#    && cd ../.. \
-#    && rm -r jreen
-
-# Language
-ENV LANG=en_US.UTF-8
-RUN echo "$LANG UTF-8" > /etc/locale.gen && locale-gen $LANG && update-locale LANG=$LANG
-
-#entrypoint, if it is last here makes it easy to build new image without rebuilding all layers
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-COPY build-and-test.sh /usr/local/bin/build-and-test.sh
-RUN chmod +x /usr/local/bin/build-and-test.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-WORKDIR /tmp/workspace
--- a/Docker/build-and-test.sh
+++ b/Docker/build-and-test.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-mkdir build
-cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} ..
-ninja
-ninja install
-env CTEST_OUTPUT_ON_FAILURE=1 ninja test
--- a/Docker/docker-commands.sh
+++ b/Docker/docker-commands.sh
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-get_repository_root(){
-    local REPOSITORY_ROOT="$(git rev-parse --show-toplevel)"
-    echo "$REPOSITORY_ROOT"
-}
-
-get_repository_subdir(){
-    REPOSITORY_ROOT=$(get_repository_root)
-    CUR_DIR=$(pwd)
-    SUB_DIR=$(echo "$CUR_DIR" | grep -oP "^$REPOSITORY_ROOT\K.*")
-    echo "$SUB_DIR"
-}
-
-# Run commands inside docker container
-_docker_run() {
-    REPOSITORY_ROOT=$(get_repository_root)
-    SUB_DIR=$(get_repository_subdir)
-
-    echo "SUB_DIR: " "$SUB_DIR"
-
-    source $REPOSITORY_ROOT/Docker/Docker.variables
-    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
-
-    echo "Got command: " "$*"
-    USER_ID=$(id -u $USER)
-    echo "Using USER_ID:" $USER_ID
-
-    docker run  --env LOCAL_USER_ID=$USER_ID \
-                --rm \
-                --volume $REPOSITORY_ROOT:/tmp/workspace \
-				--workdir /tmp/workspace$SUB_DIR \
-                --env "TERM=xterm-256color" \
-                --tty \
-                --privileged \
-				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" \
-				$*
-}
-
-# 1st command: Run make target inside docker
-docker-make() {
-    _docker_run make "${@}"
-}
-
-# 2nd command: Run bash command inside docker
-docker-run() {
-    _docker_run "${@}"
-}
-
-# 3rd command: Run bash interactive inside docker
-docker-interactive() {
-    REPOSITORY_ROOT=$(get_repository_root)
-    SUB_DIR=$(get_repository_subdir)
-
-    echo "SUB_DIR: " "$SUB_DIR"
-
-    source $REPOSITORY_ROOT/Docker/Docker.variables
-    echo "Starting container: " "$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER"
-
-    echo "Got command: " "$*"
-    USER_ID=$(id -u $USER)
-    echo "Using USER_ID:" $USER_ID
-
-    docker run  --env LOCAL_USER_ID=$USER_ID \
-                --rm \
-                --interactive \
-                --volume $REPOSITORY_ROOT:/tmp/workspace \
-				--workdir /tmp/workspace$SUB_DIR \
-                --env "TERM=xterm-256color" \
-                --tty \
-				"$DOCKER_IMAGE_NAME:$DOCKER_IMAGE_VER" /bin/bash
-}
-
-docker-help() {
-    echo "docker-make            - Run a make target inside docker container"
-    echo "docker-run             - Run a specific bash command inside docker container and remove container on exit"
-    echo "docker-interactive     - Start an interactive bash session inside docker container and remove it on exit"
-    echo "docker-help            - Show this help text"
-}
--- a/Docker/entrypoint.sh
+++ b/Docker/entrypoint.sh
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-# Add local user
-# Either use the LOCAL_USER_ID if passed in at runtime or
-# fallback
-USER_ID=${LOCAL_USER_ID:-9001}
-USER=docker
-UPWD=Docker!
-
-echo "Starting with USER: $USER and UID : $USER_ID"
-useradd --shell /bin/bash -u $USER_ID -o -c "docker user" -m "$USER"
-export HOME=/home/$USER
-
-# Add user to sudoers
-echo "docker ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/10-installer
-# Add root password
-echo "root":$UPWD | chpasswd
-# Add user password
-echo "$USER:$UPWD" | chpasswd
-
-if [ -z "$CLANG_VERSION" ]; then
-  echo "No CLANG_VERSION set"
-else
-  echo "alias clang=clang-$CLANG_VERSION" >> $HOME/.bashrc
-  echo "alias clang-tidy=clang-tidy-$CLANG_VERSION" >> $HOME/.bashrc
-  echo "alias clang-format=clang-format-$CLANG_VERSION" >> $HOME/.bashrc
-fi
-
-export PATH=/opt/mxe/usr/bin:$PATH
-
-# Startup user
-exec gosu "$USER" "$@"
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -1,70 +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).
-
-##### ```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_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))
--- a/51
+++ b/51
@@ -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 2.0.0 - 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!
--- a/README.md
+++ b/README.md
@@ -1,151 +0,0 @@
-# This project is essentially abandoned
-There is no one working on it.
-There isn't much sense in adding any new issues in the issue tracker unless you want to fix them yourself.
-
-# 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)
-* TIDAL
-* Rdio (Android only)
-* Deezer (Android only)
-
-### Free Streaming/Music Promotion Platforms
-
-* Soundcloud
-* Bandcamp
-* Last.fm
-* Jamendo
-* Official.fm
-* YouTube
-
-### 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.4**](http://download.tomahawk-player.org/Tomahawk-0.8.4.dmg) | [**0.8.4**](http://download.tomahawk-player.org/tomahawk-0.8.4.exe) | [**0.8.4**](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](https://taglib.github.io/)
-* [Boost 1.3](http://www.boost.org/)
-* [Lucene++ 3.0.6](https://github.com/luceneplusplus/LucenePlusPlus/)
-* [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/)
-
-If you are using Qt>5.6 you need to build and install QtWebKit
-
-* [QtWebKit](https://github.com/qt/qtwebkit)
-
-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!
--- a/TomahawkAddLibrary.cmake
+++ b/TomahawkAddLibrary.cmake
@@ -1,112 +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)
-        qt5_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")
-        qt5_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()
-
-    # 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} PRIVATE ${TOMAHAWK_LIBRARIES})
-    if(LIBRARY_LINK_LIBRARIES)
-        target_link_libraries(${target} PUBLIC ${LIBRARY_LINK_LIBRARIES})
-    endif()
-    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
-        target_link_libraries(${target} 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()
--- a/TomahawkAddPlugin.cmake
+++ b/TomahawkAddPlugin.cmake
@@ -1,68 +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_BASE_TARGET_NAME}_${PLUGIN_TYPE}_${PLUGIN_NAME}")
-
-    # create option to disable plugins
-    string(TOUPPER "${PLUGIN_TYPE}" PLUGIN_TYPE_UPPER)
-    string(TOUPPER "${PLUGIN_NAME}" PLUGIN_NAME_UPPER)
-    set(PLUGIN_OPTION "BUILD_${PLUGIN_TYPE_UPPER}_${PLUGIN_NAME_UPPER}")
-
-    if(NOT DEFINED ${PLUGIN_OPTION})
-        set(${PLUGIN_OPTION} ON)
-    endif()
-
-    option(${PLUGIN_OPTION} "Build Tomahawk with the ${PLUGIN_NAME} ${PLUGIN_TYPE}" ${${PLUGIN_OPTION}})
-
-    if(${PLUGIN_OPTION})
-        # 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})
-    endif()
-endfunction()
--- a/TomahawkBuildTreeSettings.cmake.in
+++ b/TomahawkBuildTreeSettings.cmake.in
@@ -1,4 +0,0 @@
-set(TOMAHAWK_INCLUDE_DIRS
-  "@PROJECT_SOURCE_DIR@/src/libtomahawk"
-  "@PROJECT_BINARY_DIR@/src/libtomahawk"
-)
--- a/TomahawkCPack.cmake
+++ b/TomahawkCPack.cmake
@@ -2,20 +2,18 @@ INCLUDE( InstallRequiredSystemLibraries )

 SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )

-SET( CPACK_PACKAGE_FILE_NAME  "${TOMAHAWK_TARGET_NAME}-${TOMAHAWK_VERSION}" )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
+SET( CPACK_PACKAGE_FILE_NAME  tomahawk-${TOMAHAWK_VERSION} )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686

 # 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
 SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
 SET( CPACK_PACKAGE_NAME  ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name
-SET( CPACK_PACKAGE_TARGET_NAME  ${TOMAHAWK_TARGET_NAME} ) # Used to build library and executable names
 SET( CPACK_PACKAGE_VENDOR  ${TOMAHAWK_ORGANIZATION_NAME} )   # Package vendor name
-SET( TOMAHAWK_APPLICATION_PACKAGE_NAME ${TOMAHAWK_APPLICATION_PACKAGE_NAME} )
 SET( CPACK_PACKAGE_VERSION_MAJOR  ${TOMAHAWK_VERSION_MAJOR} )
 SET( CPACK_PACKAGE_VERSION_MINOR  ${TOMAHAWK_VERSION_MINOR} )
 SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )
@@ -24,7 +22,7 @@ SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )

 SET( CPACK_SOURCE_GENERATOR TGZ )
 SET( CPACK_SOURCE_IGNORE_FILES "/\\\\.git/" ".*~$" ".kate-swp$" "/build_dir/" "/clang/" "/gcc/" "/build/" "/win/" ) # Pattern of files in the source tree that won't be packaged
-SET( CPACK_SOURCE_PACKAGE_FILE_NAME ${TOMAHAWK_APPLICATION_NAME}-${TOMAHAWK_VERSION} ) # Name of the source package
+SET( CPACK_SOURCE_PACKAGE_FILE_NAME tomahawk-${TOMAHAWK_VERSION} ) # Name of the source package
 # CPACK_SOURCE_STRIP_FILES    List of files in the source tree that will be stripped. Starting with CMake 2.6.0 CPACK_SOURCE_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).
 # CPACK_STRIP_FILES   List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).   bin/ccmake;bin/cmake;bin/cpack;bin/ctest
 # CPACK_SYSTEM_NAME   System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.     Linux-i686
--- a/TomahawkConfig.cmake.in
+++ b/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@")
--- a/TomahawkConfigVersion.cmake.in
+++ b/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()
-
--- a/TomahawkUse.cmake.in
+++ b/TomahawkUse.cmake.in
@@ -1,10 +0,0 @@
-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}")
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -5,31 +5,27 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>@TOMAHAWK_APPLICATION_NAME@</string>
+	<string>Tomahawk</string>
 	<key>CFBundleIdentifier</key>
-	<string>@TOMAHAWK_APPLICATION_PACKAGE_NAME@</string>
+	<string>org.tomahawk-player.Tomahawk</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleVersion</key>
-	<string>@TOMAHAWK_VERSION@</string>
+	<string>TOMAHAWK_VERSION</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@TOMAHAWK_VERSION@</string>
+	<string>TOMAHAWK_VERSION</string>
 	<key>CFBundleSignature</key>
-	<string>@TOMAHAWK_BASE_TARGET_NAME@</string>
+	<string>tomahawk</string>
 	<key>CFBundleIconFile</key>
-	<string>@TOMAHAWK_APPLICATION_NAME@.icns</string>
+	<string>Tomahawk.icns</string>
 	<key>CFBundleName</key>
-	<string>@TOMAHAWK_APPLICATION_NAME@</string>
+	<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>@TOMAHAWK_SPARKLE_UPDATE_URL@</string>
+	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>sparkle_pub.pem</string>
 	<key>SUEnableSystemProfiling</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>
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -1,12 +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]
 #
 ################################################################################

-TARGET_NAME="Tomahawk"
-
-set -e

 function header {
    echo -e "\033[0;34m==>\033[0;0;1m $1 \033[0;0m"
@@ -19,41 +16,43 @@ 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 "${TARGET_NAME}.app" quiet
+    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet

-    cd "${TARGET_NAME}.app"
+    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 "Fixing fonts"
-    mkdir "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
-    cp -R $ROOT/../data/fonts/*.ttf "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
+    header "Copying Sparkle framework"
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
+    
+    header "Creating DMG"
+    cd ..

    header "Signing bundle"
-    cd ..
-    if [ -f ~/sign_step.sh ];
-    then
-        ~/sign_step.sh "$CERT_SIGNER" "${TARGET_NAME}.app"
-    fi
-
-    header "Creating DMG"
-    $ROOT/../admin/mac/create-dmg.sh "${TARGET_NAME}.app"
-    mv "${TARGET_NAME}.dmg" "${TARGET_NAME}-$VERSION.dmg"
+    codesign -s "Developer ID Application: Leonardo Franchi" -f -v ./Tomahawk.app

+    $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 "${TARGET_NAME}" $VERSION ~/tomahawk_sparkle_privkey.pem
+    $ROOT/../admin/mac/sign_bundle.rb $VERSION ~/tomahawk_sparkle_privkey.pem
+    mv Tomahawk.app tomahawk.app

    header "Done!"
--- a/admin/mac/create-dmg.sh
+++ b/admin/mac/create-dmg.sh
@@ -43,7 +43,7 @@ ln -s /Applications "$TMP/Applications"
 cp -R "$IN" "$TMP"

 # create
-hdiutil makehybrid -hfs -hfs-volume-name "$NAME" -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
+hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
 hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$OUT"

 # cleanup
--- a/admin/mac/dmg_background.png
+++ b/admin/mac/dmg_background.png
--- a/admin/mac/macdeploy.py
+++ b/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,41 +20,42 @@ import re
 import subprocess
 import commands
 import sys
-import glob
-
-TARGET_NAME="tomahawk"

 FRAMEWORK_SEARCH_PATH=[
    '/Library/Frameworks',
    os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]

-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/opt/vlc/lib', '/usr/local/Cellar/gettext/0.19.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']

 VLC_PLUGINS=[
-  'libattachment_plugin.dylib',
+  'libaccess_attachment_plugin.dylib',
  #'libaccess_avio_plugin.dylib',
  #'libaccess_fake_plugin.dylib',
-  'libftp_plugin.dylib',
-  'libhttp_plugin.dylib',
-  'libhttplive_plugin.dylib',
-  'libimem_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',
-  'libtcp_plugin.dylib',
-  'libudp_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',
+  'libconverter_fixed_plugin.dylib',
  'libdolby_surround_decoder_plugin.dylib',
  'libdtstofloat32_plugin.dylib',
  'libdtstospdif_plugin.dylib',
@@ -69,10 +70,10 @@ VLC_PLUGINS=[
  'libspatializer_plugin.dylib',
  'libtrivial_channel_mixer_plugin.dylib',
  'libugly_resampler_plugin.dylib',
-  'libfloat_mixer_plugin.dylib',
+  'libfloat32_mixer_plugin.dylib',
  #'libspdif_mixer_plugin.dylib',
  #'libtrivial_mixer_plugin.dylib',
-  #'libaout_file_plugin.dylib',
+  'libaout_file_plugin.dylib',
  'libauhal_plugin.dylib',
  'liba52_plugin.dylib',
  'libadpcm_plugin.dylib',
@@ -85,7 +86,7 @@ VLC_PLUGINS=[
  'libfaad_plugin.dylib',
  #'libfake_plugin.dylib',
  'libflac_plugin.dylib',
-  #'libfluidsynth_plugin.dylib',
+  'libfluidsynth_plugin.dylib',
  #'libinvmem_plugin.dylib',
  'liblpcm_plugin.dylib',
  'libmpeg_audio_plugin.dylib',
@@ -96,10 +97,10 @@ VLC_PLUGINS=[
  'libtheora_plugin.dylib',
  'libtwolame_plugin.dylib',
  'libvorbis_plugin.dylib',
-  #'libgestures_plugin.dylib',
-  #'libhotkeys_plugin.dylib',
-  #'libmotion_plugin.dylib',
-  #'libnetsync_plugin.dylib',
+  'libgestures_plugin.dylib',
+  'libhotkeys_plugin.dylib',
+  'libmotion_plugin.dylib',
+  'libnetsync_plugin.dylib',
  #'libsignals_plugin.dylib',
  'libaiff_plugin.dylib',
  'libasf_plugin.dylib',
@@ -108,7 +109,7 @@ VLC_PLUGINS=[
  'libavi_plugin.dylib',
  'libdemux_cdg_plugin.dylib',
  'libdemuxdump_plugin.dylib',
-  'libdiracsys_plugin.dylib',
+  'libdirac_plugin.dylib',
  'libes_plugin.dylib',
  'libflacsys_plugin.dylib',
  'liblive555_plugin.dylib',
@@ -138,24 +139,24 @@ VLC_PLUGINS=[
  'libxa_plugin.dylib',
  'libfolder_plugin.dylib',
  'libtaglib_plugin.dylib',
-  #'libaudioscrobbler_plugin.dylib',
+  'libaudioscrobbler_plugin.dylib',
  'libdummy_plugin.dylib',
  'libexport_plugin.dylib',
-  #'libfreetype_plugin.dylib',
-  #'libgnutls_plugin.dylib',
+  'libfreetype_plugin.dylib',
+  'libgnutls_plugin.dylib',
  'liblogger_plugin.dylib',
  'liblua_plugin.dylib',
-  #'libosd_parser_plugin.dylib',
-  #'libquartztext_plugin.dylib',
-  #'libstats_plugin.dylib',
+  'libosd_parser_plugin.dylib',
+  'libquartztext_plugin.dylib',
+  'libstats_plugin.dylib',
  'libvod_rtsp_plugin.dylib',
  'libxml_plugin.dylib',
  #'libxtag_plugin.dylib',
  'libi420_rgb_mmx_plugin.dylib',
  'libi420_yuy2_mmx_plugin.dylib',
  'libi422_yuy2_mmx_plugin.dylib',
-  #'libmemcpymmx_plugin.dylib',
-  #'libmemcpymmxext_plugin.dylib',
+  'libmemcpymmx_plugin.dylib',
+  'libmemcpymmxext_plugin.dylib',
  'libmux_asf_plugin.dylib',
  'libmux_avi_plugin.dylib',
  'libmux_dummy_plugin.dylib',
@@ -178,62 +179,46 @@ VLC_PLUGINS=[
  'libi420_yuy2_sse2_plugin.dylib',
  'libi422_yuy2_sse2_plugin.dylib',
  'libdecomp_plugin.dylib',
-  #'libstream_filter_rar_plugin.dylib',
-  'librecord_plugin.dylib',
-  #'libvisual_plugin.dylib',
-  'libsecuretransport_plugin.dylib'
+  'libstream_filter_rar_plugin.dylib',
+  'libstream_filter_record_plugin.dylib',
+  'libvisual_plugin.dylib',
 ]

 VLC_SEARCH_PATH=[
-    '/usr/local/opt/vlc/lib/vlc/plugins/',
+    '/usr/local/lib/vlc/plugins/',
 ]

 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 = [
-  'lib%s_account_xmpp.dylib' % TARGET_NAME,
-  'lib%s_account_google.so' % TARGET_NAME,
-  'lib%s_account_zeroconf.so' % TARGET_NAME,
-  'lib%s_account_hatchet.so' % TARGET_NAME,
-  'lib%s_infoplugin_adium.so' % TARGET_NAME,
-  'lib%s_infoplugin_charts.so' % TARGET_NAME,
-#  'lib%s_infoplugin_discogs.so' % TARGET_NAME,
-  'lib%s_infoplugin_echonest.so' % TARGET_NAME,
-  'lib%s_infoplugin_hypem.so' % TARGET_NAME,
-#  'lib%s_infoplugin_musicbrainz.so' % TARGET_NAME,
-  'lib%s_infoplugin_musixmatch.so' % TARGET_NAME,
-  'lib%s_infoplugin_newreleases.so' % TARGET_NAME,
-#  'lib%s_infoplugin_rovi.so' % TARGET_NAME,
-  'lib%s_infoplugin_snorenotify.so' % TARGET_NAME,
-  'lib%s_infoplugin_spotify.so' % TARGET_NAME,
-  'lib%s_viewpage_dashboard.so' % TARGET_NAME,
-#  'lib%s_viewpage_networkactivity.so' % TARGET_NAME,
-  'lib%s_viewpage_charts.so' % TARGET_NAME,
-  'lib%s_viewpage_newreleases.so' % TARGET_NAME,
-  'lib%s_viewpage_whatsnew_0_8.so' % TARGET_NAME,
+  'libtomahawk_account_xmpp.so',
+  'libtomahawk_account_google.so',
+  'libtomahawk_account_twitter.so',
+  'libtomahawk_account_zeroconf.so',
+  'libtomahawk_infoplugin_adium.so',
+  'libtomahawk_infoplugin_charts.so',
+  'libtomahawk_infoplugin_discogs.so',
+  'libtomahawk_infoplugin_echonest.so',
+  'libtomahawk_infoplugin_hypem.so',
+  'libtomahawk_infoplugin_musicbrainz.so',
+  'libtomahawk_infoplugin_musixmatch.so',
+  'libtomahawk_infoplugin_newreleases.so',
+  'libtomahawk_infoplugin_rovi.so',
+  'libtomahawk_infoplugin_spotify.so',
 ]

 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/qt5/plugins',
+    '/usr/local/Cellar/qt/4.8.2/plugins',
 ]

-SNORE_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5',
-]

 class Error(Exception):
  pass
@@ -246,17 +231,11 @@ class CouldNotFindQtPluginErrorFindFrameworkError(Error):
 class InstallNameToolError(Error):
  pass

-class CouldNotFindFrameworkError(Error):
-  pass

 class CouldNotFindQtPluginError(Error):
  pass


-class CouldNotFindSnorePluginError(Error):
-  pass
-
-
 class CouldNotFindVLCPluginError(Error):
  pass

@@ -265,22 +244,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')
@@ -309,7 +285,7 @@ def GetBrokenLibraries(binary):
      continue  # unix style system library
    elif re.match(r'Breakpad', line):
      continue  # Manually added by cmake.
-    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line) and not re.match(r'^\s*@loader_path/../lib', line):
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
      # Potentially already fixed library
      if '.framework' in line:
        relative_path = os.path.join(*line.split('/')[3:])
@@ -333,11 +309,6 @@ def FindFramework(path):
    if os.path.exists(abs_path):
      return abs_path

-  # replace rpath with /Library/Frameworks for Sparkle
-  abs_path = path.replace("@rpath/", "/Library/Frameworks/")
-  if os.path.exists(abs_path):
-    return abs_path
-
  raise CouldNotFindFrameworkError(path)

 def FindLibrary(path):
@@ -397,12 +368,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]
@@ -455,14 +426,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]
@@ -472,44 +436,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):
@@ -559,12 +488,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:
@@ -576,18 +499,15 @@ 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), '../lib/plugins/libsnore-qt5')
-
 try:
-  FixPlugin('%s_crash_reporter' % TARGET_NAME, '../MacOS')
+  FixPlugin('tomahawk_crash_reporter', '../MacOS')
 except:
-  print 'Failed to find %s_crash_reporter' % TARGET_NAME
+  print 'Failed to find tomahawk_crash_reporter'

 for plugin in QT_PLUGINS:
  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
--- a/admin/mac/sign_bundle.rb
+++ b/admin/mac/sign_bundle.rb
@@ -6,9 +6,9 @@ if ARGV.length < 2
  exit
 end

-tarball = "#{ARGV[0].downcase}-#{ARGV[1]}.tar.bz2"
+tarball = "tomahawk-#{ARGV[0]}.tar.bz2"
 puts "Zipping: #{tarball}..."
-`tar jcvf "#{tarball}" #{ARGV[0]}.app`
+`tar jcvf "#{tarball}" Tomahawk.app`

 puts "Signing..."
-puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[2]}" | openssl enc -base64`
+puts `openssl dgst -sha1 -binary < "#{tarball}" | openssl dgst -dss1 -sign "#{ARGV[1]}" | openssl enc -base64`
--- a/admin/unix/tomahawk.desktop
+++ b/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;
--- a/admin/unix/tomahawk.protocol
+++ b/admin/unix/tomahawk.protocol
@@ -0,0 +1,12 @@
+[Protocol]
+exec=/path/to/binary "%u"
+protocol=tomahawk
+input=none
+output=none
+helper=true
+listing=
+reading=false
+writing=false
+makedir=false
+deleting=false
+
--- a/admin/win/Toolchain-mingw32-openSUSE.cmake
+++ b/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/)
--- a/admin/win/nsi/SnoreNotify.nsh
+++ b/admin/win/nsi/SnoreNotify.nsh
@@ -1,22 +0,0 @@
-!include LogicLib.nsh
-!include WordFunc.nsh
-
-Function SnoreWinVer
-    ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-    ${VersionCompare} "6.2" $R0 $R0
-    ${If} $R0 == 1
-        Push "NotWin8"
-    ${Else}
-        Push "AtLeastWin8"
-    ${EndIf}
-FunctionEnd
-
-!macro SnoreShortcut path exe appID
-    Call SnoreWinVer
-    Pop $0
-    ${If} $0 == "AtLeastWin8"
-        nsExec::ExecToLog '"${SnoreToastExe}" -install "${path}" "${exe}" "${appID}"'
-    ${Else}
-        CreateShortCut "${path}" "${exe}"
-    ${EndIf}
-!macroend
--- a/admin/win/nsi/page_header.bmp
+++ b/admin/win/nsi/page_header.bmp
--- a/admin/win/nsi/welcome.bmp
+++ b/admin/win/nsi/welcome.bmp
--- a/admin/win/update-vlc.sh
+++ b/admin/win/update-vlc.sh
@@ -9,20 +9,19 @@ fi

 rm -rvf vlc/

-VLC_TARBALL="vlc.tar.bz2"

 echo "Download phonon archive..."
 # wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
 # wget -c "http://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
 # wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
 # wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
-wget -c "http://download.tomahawk-player.org/test/$VLC_TARBALL"
+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_TARBALL"
+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
@@ -50,38 +49,11 @@ tar xvjf "$VLC_TARBALL"
 #     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/*dash* \
-    stream_filter/*smooth* \
-    stream_filter/*record* \
-    **/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"
+
--- a/data/fonts/OFL.txt
+++ b/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.
--- a/data/fonts/Roboto-Black.ttf
+++ b/data/fonts/Roboto-Black.ttf
--- a/data/fonts/Roboto-BlackItalic.ttf
+++ b/data/fonts/Roboto-BlackItalic.ttf
--- a/data/fonts/Roboto-Bold.ttf
+++ b/data/fonts/Roboto-Bold.ttf
--- a/data/fonts/Roboto-BoldItalic.ttf
+++ b/data/fonts/Roboto-BoldItalic.ttf
--- a/data/fonts/Roboto-Italic.ttf
+++ b/data/fonts/Roboto-Italic.ttf
--- a/data/fonts/Roboto-Light.ttf
+++ b/data/fonts/Roboto-Light.ttf
--- a/data/fonts/Roboto-LightItalic.ttf
+++ b/data/fonts/Roboto-LightItalic.ttf
--- a/data/fonts/Roboto-Medium.ttf
+++ b/data/fonts/Roboto-Medium.ttf
--- a/data/fonts/Roboto-MediumItalic.ttf
+++ b/data/fonts/Roboto-MediumItalic.ttf
--- a/data/fonts/Roboto-Regular.ttf
+++ b/data/fonts/Roboto-Regular.ttf
--- a/data/fonts/Roboto-Thin.ttf
+++ b/data/fonts/Roboto-Thin.ttf
--- a/data/fonts/Roboto-ThinItalic.ttf
+++ b/data/fonts/Roboto-ThinItalic.ttf
--- a/data/fonts/RobotoCondensed-Bold.ttf
+++ b/data/fonts/RobotoCondensed-Bold.ttf
--- a/data/fonts/RobotoCondensed-BoldItalic.ttf
+++ b/data/fonts/RobotoCondensed-BoldItalic.ttf
--- a/data/fonts/RobotoCondensed-Italic.ttf
+++ b/data/fonts/RobotoCondensed-Italic.ttf
--- a/data/fonts/RobotoCondensed-Light.ttf
+++ b/data/fonts/RobotoCondensed-Light.ttf
--- a/data/fonts/RobotoCondensed-LightItalic.ttf
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
--- a/data/fonts/RobotoCondensed-Regular.ttf
+++ b/data/fonts/RobotoCondensed-Regular.ttf
--- a/data/icons/1024x1024-tomahawk-icon.png
+++ b/data/icons/1024x1024-tomahawk-icon.png
--- a/data/icons/128x128-tomahawk-grayscale-icon.png
+++ b/data/icons/128x128-tomahawk-grayscale-icon.png
--- a/data/icons/128x128-tomahawk-icon.png
+++ b/data/icons/128x128-tomahawk-icon.png
--- a/data/icons/128x128-tomahawk-white-icon.png
+++ b/data/icons/128x128-tomahawk-white-icon.png
--- a/data/icons/16x16-tomahawk-icon.png
+++ b/data/icons/16x16-tomahawk-icon.png
--- a/data/icons/256x256-tomahawk-icon.png
+++ b/data/icons/256x256-tomahawk-icon.png
--- a/data/icons/32x32-tomahawk-icon.png
+++ b/data/icons/32x32-tomahawk-icon.png
--- a/data/icons/512x512-tomahawk-icon.png
+++ b/data/icons/512x512-tomahawk-icon.png
--- a/data/icons/64x64-tomahawk-icon.png
+++ b/data/icons/64x64-tomahawk-icon.png
--- a/data/icons/tomahawk-icon-128x128-grayscale.png
+++ b/data/icons/tomahawk-icon-128x128-grayscale.png
--- a/data/icons/tomahawk-icon-128x128.png
+++ b/data/icons/tomahawk-icon-128x128.png
--- a/data/icons/tomahawk-icon-16x16.png
+++ b/data/icons/tomahawk-icon-16x16.png
--- a/data/icons/tomahawk-icon-256x256.png
+++ b/data/icons/tomahawk-icon-256x256.png
--- a/data/icons/tomahawk-icon-32x32.png
+++ b/data/icons/tomahawk-icon-32x32.png
--- a/data/icons/tomahawk-icon-512x512.png
+++ b/data/icons/tomahawk-icon-512x512.png
--- a/data/icons/tomahawk-icon-64x64.png
+++ b/data/icons/tomahawk-icon-64x64.png
--- a/data/icons/tomahawk-icon.svg
+++ b/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>
--- a/data/images/account-none.svg
+++ b/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>
--- a/data/images/account-offline.svg
+++ b/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>
--- a/data/images/account-online.svg
+++ b/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>
--- a/data/images/account-settings.png
+++ b/data/images/account-settings.png
--- a/data/images/add-contact.svg
+++ b/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>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Leo Franchi	ce76c86171	Changelog for spotify config dialog	2012-07-25 09:39:01 -04:00
Leo Franchi	64d9a0f5d2	Keep config UI in sync with resolver	2012-07-25 09:38:22 -04:00
Leo Franchi	aa0f99bcce	Some more fixes	2012-07-25 09:38:22 -04:00
Leo Franchi	5be032f39c	New spotify config	2012-07-25 09:38:22 -04:00
Christian Muehlhaeuser	272add3c3b	* Bumped to 0.5.5 and fixed ChangeLog width.	2012-07-25 14:37:42 +02:00
Leo Franchi	39e7314acf	Changelog for 0.5.5	2012-07-25 08:34:06 -04:00
Dominik Schmidt	90e238a352	Rename FindLibEchonest to FindEchonest, make it version aware and overall more state of the art :P	2012-07-25 08:28:44 -04:00
Dominik Schmidt	20b62bfba3	xmpp: check for error presences in AvatarManager	2012-07-25 08:28:36 -04:00
Leo Franchi	6fa2ad19ee	Fix osx compile	2012-07-25 08:27:34 -04:00
Leo Franchi	60f2e85965	Implement non-osx side of new search field For Compile Win	2012-07-25 08:27:26 -04:00
Leo Franchi	cbd9d4e0ce	Update Qocoa QSearchField to latest, with hatstand's fix. Now shortcuts work in the QSearchField, like c&p and select all	2012-07-25 08:27:21 -04:00
Leo Franchi	22a1f167b0	Bump libechonest required version to 2.0.0	2012-07-25 08:27:14 -04:00
Leo Franchi	44a5406a34	Adapt to new libechonest v2 api	2012-07-25 08:27:08 -04:00
Leo Franchi	611ca21ec6	Remove steering from echonest stations	2012-07-25 08:27:01 -04:00
Christian Muehlhaeuser	64274d6d39	* Added code-signing to OS X build scripts.	2012-07-25 08:26:54 -04:00
Hugo Lindström	34dc6d23ee	Send resulthint when we have it	2012-07-25 08:26:34 -04:00
Leo Franchi	70a5050443	Pointer safety	2012-07-25 08:26:09 -04:00
Leo Franchi	2a19f20914	Pointer safety (Oops #20003 )	2012-07-25 08:25:42 -04:00
Leo Franchi	33ca71a86a	TWK-968: Part Two: Allow drop helper for mixed query/result lists.	2012-07-25 08:17:34 -04:00
Leo Franchi	485447be38	TWK-985: Log into spotify on return pressed in Spotify config	2012-07-25 08:17:25 -04:00
Christian Muehlhaeuser	4f2cbb32c5	* Fixed queue auto-collapsing when playing the last track in it.	2012-07-14 05:52:13 +02:00
Leo Franchi	edc6057354	Also allow multiple infoplugins to return data for artist top tracks	2012-07-14 05:52:07 +02:00
Tomahawk CI	7beab3aea8	Automatic merge of Transifex translations	2012-07-14 05:51:25 +02:00
Leo Franchi	3e3e76b66f	Call sendMessage() with a QueuedConnection as it's cross-thread	2012-07-14 05:51:17 +02:00
Leo Franchi	c33d3c2a67	Let AlbumPlaylistInterface accept results from first good infoplugin result	2012-07-14 05:50:48 +02:00
Leo Franchi	56e997a159	Extra pointer safety	2012-07-14 05:50:41 +02:00
Leo Franchi	67d75543e6	TWK-968: Fix PlayableModel/DropJob for mixed mimetype	2012-07-14 05:50:29 +02:00
Christian Muehlhaeuser	e19423e08f	* Updated ChangeLog.	2012-07-13 11:03:21 +02:00
Christian Muehlhaeuser	e041ce87fc	* Bumped to 0.5.4.	2012-07-13 10:00:28 +02:00
Tomahawk CI	6eacdf808e	Automatic merge of Transifex translations	2012-07-13 09:58:49 +02:00
Leo Franchi	b6d5c86952	Pointer safety	2012-07-13 09:58:40 +02:00
Leo Franchi	b7fb9a03bf	Add spotify infoplugin for album lookups	2012-07-13 09:58:19 +02:00
Christian Muehlhaeuser	37fad49393	* Fixed Windows shutdown.	2012-07-13 09:50:16 +02:00
Christian Muehlhaeuser	fa83fde05e	* Try not deleting cache.	2012-07-13 09:26:02 +02:00
Christian Muehlhaeuser	b3b34cacbd	* Try not deleting the infoSystem on shutdown. Does it fix Windows crashes?	2012-07-13 08:06:59 +02:00
Christian Muehlhaeuser	d0f697cd4b	* Friend class MusicScanner.	2012-07-12 10:47:38 +02:00
Christian Muehlhaeuser	c144a0142f	* Fixed forgotten merge.	2012-07-12 10:24:19 +02:00
Christian Muehlhaeuser	318866d37a	* Fixed broken merge.	2012-07-12 10:19:40 +02:00
Christian Muehlhaeuser	70e93faa3f	* Added verbose shutdown debug output.	2012-07-12 10:17:07 +02:00
Christian Muehlhaeuser	89e21289a6	* Fixed broken merge.	2012-07-12 10:08:52 +02:00
Christian Muehlhaeuser	fe0d2d87fc	* Updated ChangeLog.	2012-07-12 10:00:21 +02:00
Christian Muehlhaeuser	8531ca2234	* Fixed broken merge.	2012-07-12 09:52:42 +02:00
Christian Muehlhaeuser	8d5082fe2c	* Really fix compiling on Windows.	2012-07-12 09:49:11 +02:00
Christian Muehlhaeuser	7672c7caec	* Try to fix compiling on mingw.	2012-07-12 09:48:26 +02:00
Christian Muehlhaeuser	bf2139824d	* Cleaned up DiagnosticsDialog.	2012-07-12 09:08:49 +02:00
Christian Muehlhaeuser	eb749b1e44	* Provide convenience openUrl( url ) method in TomahawkUtilsGui, since QDesktopServices fail to work on Windows.	2012-07-12 09:08:00 +02:00
Christian Muehlhaeuser	53226f37c2	* Expose logfile's path in Logger.	2012-07-12 09:07:52 +02:00
Christian Muehlhaeuser	20032a40b2	* Use a RAMDirectory if we can't open the regular lucene index file.	2012-07-12 09:06:58 +02:00
Tomahawk CI	a6d1bbb91e	Automatic merge of Transifex translations	2012-07-12 09:06:50 +02:00
Jeff Mitchell	f7240a5d39	Increased pointer safety (oops 19400)	2012-07-12 09:06:39 +02:00
Jeff Mitchell	2142a04fda	Increased pointer safety (oops 19336)	2012-07-12 09:05:55 +02:00
Jeff Mitchell	0406b38f1c	* Merged 4-is-not-JSON bug to stable.	2012-07-12 09:04:47 +02:00
Tomahawk CI	8e2174baf1	Automatic merge of Transifex translations	2012-07-12 09:02:05 +02:00
Tomahawk CI	7caeaddc21	Automatic merge of Transifex translations	2012-07-12 09:01:57 +02:00
Tomahawk CI	f4a01ec6aa	Automatic merge of Transifex translations	2012-07-12 09:01:42 +02:00
Christian Muehlhaeuser	ed81799294	* Merged music scanner fix.	2012-07-12 09:01:24 +02:00
Christian Muehlhaeuser	0283d534f0	* Remove overlays when filter changed.	2012-07-12 08:59:09 +02:00
Christian Muehlhaeuser	4a00ff4d24	* Fixed crash in ContextMenu.	2012-07-12 08:58:55 +02:00
Tomahawk CI	b98c535247	Automatic merge of Transifex translations	2012-07-12 08:58:38 +02:00
Christian Muehlhaeuser	fbcffed27b	* Fixed FadingPixmap isn't initialized with m_isDefault being true.	2012-07-12 08:58:16 +02:00
Christian Muehlhaeuser	e521150d33	* Hooking up to resultsChanged() is enough in PlayableItem.	2012-07-12 08:58:16 +02:00
Christian Muehlhaeuser	2a0aa602b6	* Refetch cover when underlying metadata changed in PixmapDelegateFader.	2012-07-12 08:58:16 +02:00
Christian Muehlhaeuser	cf37aae430	* Emit resultsChanged() after adding / removing results in a Query.	2012-07-12 08:57:46 +02:00
Christian Muehlhaeuser	292f395c47	* Bumped to 0.5.3.	2012-07-06 01:59:42 +02:00
Christian Muehlhaeuser	047f3cc2d4	* Updated ChangeLog.	2012-07-06 01:59:26 +02:00
Tomahawk CI	97681ace31	Automatic merge of Transifex translations	2012-07-06 01:50:04 +02:00
Tomahawk CI	6be5257bc0	Automatic merge of Transifex translations	2012-07-06 01:49:58 +02:00
Tomahawk CI	8cfbe1f38b	Automatic merge of Transifex translations	2012-07-06 01:49:48 +02:00
Christian Muehlhaeuser	8db8e42ec4	* Filter tree-model based on query, not result.	2012-07-06 01:47:19 +02:00
Christian Muehlhaeuser	9492055fc6	* Should fix crash when filtering collection.	2012-07-06 01:47:04 +02:00
Christian Muehlhaeuser	3dc624858b	* Prevent crash in ViewHeader.	2012-07-06 01:45:55 +02:00
Christian Muehlhaeuser	f154c2bbcd	* Correctly unset pause / spinner on GridView when a new track is loading.	2012-07-06 01:45:44 +02:00
Christian Muehlhaeuser	e9127ae3ec	* Fixed Last.fm history importing.	2012-07-06 01:45:27 +02:00
Leo Franchi	c7d9d8e5b7	Seed pipeline job item with query immediately	2012-07-06 01:45:17 +02:00
Christian Muehlhaeuser	e525291213	* Don't load social actions twice.	2012-07-06 01:44:55 +02:00
Tomahawk CI	44269ee8f6	Automatic merge of Transifex translations	2012-07-06 01:44:47 +02:00
Christian Muehlhaeuser	53c4a2d675	* Add a vertical spacer item to the DiagnosticsDialog, so contents don't move around.	2012-07-06 01:44:40 +02:00
Christian Muehlhaeuser	ebfc53e009	* Emit coverChanged() even when we couldn't get a cover, so the views update / trigger new requests.	2012-07-06 01:44:28 +02:00
Tomahawk CI	190845a86e	Automatic merge of Transifex translations	2012-07-06 01:44:06 +02:00
Leo Franchi	25af4f4275	Don't confuse QFileInfo	2012-07-05 16:49:48 -04:00
Jeff Mitchell	bca64a70ed	along to you -> along with you	2012-07-05 14:49:28 -04:00
Jeff Mitchell	10462ee257	Having this replace in there actually breaks notification for me. I'm guessing that this is notification-system dependent; however, we can't show & to people not using HTML-based notification renderers. The fix needs to lie with the notification renderer vendor.	2012-07-05 13:40:21 -04:00
Christian Muehlhaeuser	ba4532593b	* Bumped to 0.5.2.	2012-07-01 22:39:40 +02:00
Christian Muehlhaeuser	c84fd28dd2	* Update ChangeLog.	2012-07-01 22:37:07 +02:00
Christian Muehlhaeuser	dbbb491a81	* Indicate invalid PlaylistEntries.	2012-07-01 22:33:53 +02:00
Christian Muehlhaeuser	bab5e27673	* Fixed crashes in DbCmd_SetPlaylistRevision.	2012-07-01 22:33:53 +02:00
Christian Muehlhaeuser	17f71bd366	* Don't ever accept invalid results coming from resolvers.	2012-07-01 22:33:53 +02:00
Christian Muehlhaeuser	e96bbc11e1	* Fixed cover loading in error case.	2012-07-01 08:57:34 +02:00
Christian Muehlhaeuser	d492ba0317	* spotify -> Spotify.	2012-07-01 06:48:22 +02:00
Leo Franchi	b6466a6027	Changelogify	2012-07-01 00:43:58 -04:00
Christian Muehlhaeuser	6b5d391cde	* Remove debug output again.	2012-07-01 05:45:28 +02:00
Christian Muehlhaeuser	0680dec5df	* Set m_coverLoaded to true even when we couldn't find any image.	2012-07-01 05:45:28 +02:00
Christian Muehlhaeuser	a4e8f4216c	* Removed rc0.	2012-07-01 05:13:29 +02:00
Christian Muehlhaeuser	355c95e068	* Set m_coverLoaded to true before emitting the coverChanged signal.	2012-07-01 02:51:46 +02:00
Christian Muehlhaeuser	da07361ec0	* Bumped to 0.5.1.	2012-07-01 02:29:57 +02:00
Christian Muehlhaeuser	aafe8797ad	* Don't crash when removing page in history.	2012-07-01 02:23:31 +02:00
Tomahawk CI	95343ca024	Automatic merge of Transifex translations	2012-07-01 00:21:51 +02:00
Leo Franchi	f85bcc1c64	No more libspotify in bundle	2012-07-01 00:21:15 +02:00
Christian Muehlhaeuser	e53e51aefc	* Add 'Copy Artist/Album Link' context menu items.	2012-07-01 00:21:08 +02:00
Christian Muehlhaeuser	d22b33bc50	* Be prepared for empty query_ptrs being returned from Query::get().	2012-07-01 00:20:59 +02:00
Christian Muehlhaeuser	c36414bb4c	* Return empty query_ptr when query data is invalid.	2012-07-01 00:20:51 +02:00
Christian Muehlhaeuser	a78349f9f1	* Use 'large' album covers from Last.fm.	2012-07-01 00:20:43 +02:00
Stefan Derkits	fa41b96260	Ubuntu 11.10 needs explicit pthread, reenable finding & linking them	2012-07-01 00:17:55 +02:00
Tomahawk CI	7f2bf85663	Automatic merge of Transifex translations	2012-07-01 00:17:47 +02:00
Leo Franchi	85fe824df3	Also remove saved resolver path when uninstalling	2012-07-01 00:17:36 +02:00
Leo Franchi	c37bbb4deb	Use headerpad_max_install_names on OS X builds	2012-07-01 00:17:23 +02:00
Leo Franchi	1a9bf84ab4	Don't copy to bundle any longer when installing binary resolvers on osx	2012-07-01 00:17:17 +02:00
Leo Franchi	a283ea1ed0	Do our own attica download fetching since we send the tomahawk version as well	2012-07-01 00:17:10 +02:00
Christian Muehlhaeuser	d27dd0785a	* Use new Querylabel API.	2012-07-01 00:17:02 +02:00
Christian Muehlhaeuser	5e1f808d28	* Support setting Artist / Album on a QueryLabel directly. We need a proper 'CleverLabel' so badly.	2012-07-01 00:16:55 +02:00
Christian Muehlhaeuser	aba78c7a24	* Removed obsolete code.	2012-07-01 00:16:43 +02:00
Christian Muehlhaeuser	f45e92a24d	* No more dragsource.type.	2012-07-01 00:16:27 +02:00
Christian Muehlhaeuser	5ae04043d4	* Properly drag Artists / Albums from QueryLabel.	2012-07-01 00:16:11 +02:00
Christian Muehlhaeuser	5f521a6cf5	* Use new PlayableModel API throughout app.	2012-07-01 00:15:53 +02:00
Christian Muehlhaeuser	a4b30dcecd	* Adjust inheriting models to new PlayableModel API.	2012-07-01 00:15:44 +02:00
Christian Muehlhaeuser	700394a054	* Resolved a bunch more hidden overloaded virtual methods in PlayableModel.	2012-07-01 00:15:35 +02:00
Christian Muehlhaeuser	819ee17b74	* Use new PlayableModel API throughout app.	2012-07-01 00:15:11 +02:00
Christian Muehlhaeuser	79c55f1699	* Adjust inheriting models to new PlayableModel API.	2012-07-01 00:15:04 +02:00
Christian Muehlhaeuser	f42696de23	* Resolved a bunch of hidden overloaded virtual methods in PlayableModel.	2012-07-01 00:14:52 +02:00
Christian Muehlhaeuser	adfaf5ce53	* Fixed text-width calculation after my latest patch.	2012-07-01 00:13:08 +02:00
Christian Muehlhaeuser	32aca98a97	* Fix english translation plurals.	2012-07-01 00:12:59 +02:00
Tomahawk CI	294809debb	Automatic merge of Transifex translations	2012-07-01 00:12:45 +02:00
Christian Muehlhaeuser	e4593079f3	* Proper fix for QueryLabel's context menu.	2012-07-01 00:11:40 +02:00
Christian Muehlhaeuser	cfa4210854	* Show correct context menus for album / artist QueryLabels.	2012-07-01 00:10:42 +02:00
Tomahawk CI	91084885fb	Automatic merge of Transifex translations	2012-07-01 00:10:30 +02:00
Tomahawk CI	0b7f420bef	Automatic merge of Transifex translations	2012-07-01 00:10:21 +02:00
Jeff Mitchell	046237f009	Fix compilation	2012-06-30 17:07:01 -04:00
Jeff Mitchell	85d9755a47	Merge pull request #103 from nowrep/master FdoNotifyPlugin: Fixed showing notifications with & character	2012-06-30 17:01:35 -04:00
Jeff Mitchell	98bd7b1857	Fix another crash related to debug accessing null pointers	2012-06-29 10:06:37 -04:00
Jeff Mitchell	37510fc2d7	OK, really fix crash. Promise.	2012-06-29 10:05:08 -04:00
Jeff Mitchell	a91ad7dd5f	Actually fix crash	2012-06-29 10:02:21 -04:00
Jeff Mitchell	2cc85c8f4f	Fix accessing playlist that could be invalid inside debug	2012-06-29 10:00:07 -04:00
Christian Muehlhaeuser	19625fffd4	* Only return online results via web API.	2012-06-27 07:39:51 +02:00
Christian Muehlhaeuser	a98cab55b7	* Properly sort artists & albums in search widget.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	ec7b98e589	* Moved levenshtein method to TomahawkUtils.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	1262dcb60a	* Retry on this sql error, too.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	fc9c6e6017	* Use new spinner integration API.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	fa4463dc88	* No need to check all results for playability. Their sorted by that, so we just check the first one.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	3fb403c695	* Allow to sort by composer and origin.	2012-06-27 05:37:15 +02:00
Christian Muehlhaeuser	fdb1d1b621	* Expose composer's sortname in Query's API.	2012-06-27 05:37:15 +02:00
Leo Franchi	127da50144	Forcibly kill spotify resolver before starting out own in case it's an old one	2012-06-27 01:02:53 +02:00
Leo Franchi	5640923d51	Don't assert on quit anymore, served its debug purpose	2012-06-27 01:02:53 +02:00
Leo Franchi	4a2ef91638	Looks like paths with spaces need to be esaped everywhere with QProcess...	2012-06-27 01:02:53 +02:00
Christian Muehlhaeuser	012556ca0a	* Resolve dupe accelerator assignment.	2012-06-27 01:01:20 +02:00
Christian Muehlhaeuser	8d0a51cc64	* Updated ChangeLog.	2012-06-27 00:12:59 +02:00
Leo Franchi	253120a35c	We no longer remove accounts when uninstalling from attica	2012-06-27 00:12:59 +02:00
Leo Franchi	671bd5361b	Always re-install spotify resolver if path is no longer valid	2012-06-27 00:12:59 +02:00
Leo Franchi	3dc969a31f	Style fix	2012-06-27 00:12:59 +02:00
Christian Muehlhaeuser	64a70f5073	* Don't accept empty queries from web API.	2012-06-27 00:12:59 +02:00
Christian Muehlhaeuser	1911d4b8a0	* Assert when trying to setup a query without artist or track.	2012-06-27 00:12:59 +02:00
Christian Muehlhaeuser	92229ce3e2	* Call wipeIndex via a single-shot timer to avoid dead-locks.	2012-06-27 00:12:59 +02:00
Christian Muehlhaeuser	7df3f867ea	* Re-bind values for failed TomahawkSqlQueries.	2012-06-27 00:12:59 +02:00
Jeff Mitchell	6e66c4a192	Revert "See if this fixes lfranchi's assert" This reverts commit `e6af7b03d7`. Conflicts: src/libtomahawk/database/DatabaseImpl.cpp	2012-06-27 00:12:58 +02:00
Christian Muehlhaeuser	49fe0f945e	* Elide temporary page's text when showing the delete button.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	0d915513b9	* Spit out error messages when we couldn't resolve a track, album or artist.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	6c69edd0e7	* Remove spinner when AudioEngine stopped.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	23c2c77869	* Style cleanup.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	cd7c64ac0a	* Set m_finished when tracks are loaded in Artist- & AlbumPlaylistInterface.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	0637ee7338	* Added a isFinished and m_finished to PlaylistInterface.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	7765aa116b	* Auto re-prepare query on weird 'no query' error.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	c46ed53930	* Don't scale now playing icon decoration when expanding a playlist item.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	22105d448a	* Don't expand LovedTracksItem.	2012-06-26 05:57:25 +02:00
Christian Muehlhaeuser	4f4efdfbab	* Use new RecentlyPlayedModel API.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	686730e27c	* Use new Recently- Played/Added -Model's API.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	fdfe4d12d4	* Split up CTOR and setSource methods.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	669e7550f2	* Split up CTOR and setSource methods.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	d4a2294963	* Show loading spinner when loading charts.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	66b0ecc846	* Show a loading spinner when loading a collection.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	c3563a2449	* Remove comments.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	05efe29a67	* Don't show an info button for empty items.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	3480690479	* Automatically adjust crash-reporter's window size.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	a1fb66e024	* Don't reset current viewpage when the new page is the same as the current one.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	02e9f99ce4	* Make sure script-resolvers are executable before trying to execute them.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	95c74fe370	* Re-center play/pause buttons when resizing GridView.	2012-06-26 05:55:22 +02:00
Christian Muehlhaeuser	358226bdb1	* No need to manuall set fake query's results.	2012-06-26 05:52:54 +02:00
Christian Muehlhaeuser	a2d81d0099	* Respond to pings from external resolver.	2012-06-26 05:52:54 +02:00
Christian Muehlhaeuser	292e97fcee	* Don't show resolver errors when built with RelWithDebInfo.	2012-06-26 05:52:53 +02:00
Christian Muehlhaeuser	6dafcf3c80	* Temporary fix for compiling madness.	2012-06-26 05:52:53 +02:00
Tomahawk CI	ee1b13aee6	Automatic merge of Transifex translations	2012-06-26 05:52:53 +02:00
Christian Muehlhaeuser	ce8eecd40f	* Fixed compiling on Windows. I hope.	2012-06-26 05:52:53 +02:00
Christian Muehlhaeuser	f674b3b751	* Style cleanup.	2012-06-26 05:52:53 +02:00
Jeff Mitchell	44cd64a8b6	Add ChangeLog entries	2012-06-26 05:52:53 +02:00
Christian Muehlhaeuser	a9418fc8aa	* Fixed OSX linking.	2012-06-26 05:50:57 +02:00
Christian Muehlhaeuser	44546763b9	* Fixed Windows includes.	2012-06-26 05:50:57 +02:00
Christian Muehlhaeuser	66a74ad6e2	* Fixed compiling on OSX.	2012-06-26 05:50:57 +02:00
Christian Muehlhaeuser	6aae2dd96f	* Updated breakpad to latest version.	2012-06-26 05:50:56 +02:00
Christian Muehlhaeuser	ffd2cee2ff	* Mutex protect logging.	2012-06-26 05:50:56 +02:00
Christian Muehlhaeuser	438f8444c3	* Init Database earlier.	2012-06-26 05:50:56 +02:00
Christian Muehlhaeuser	b55be311b4	* While not a bug, this shutdown check would have never been triggered.	2012-06-26 05:50:56 +02:00
Tomahawk CI	7a4d113af6	Automatic merge of Transifex translations	2012-06-26 05:50:56 +02:00