A sad, sad commit filled with code that can never run. :`-(

.gitignore

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

.gitmodules

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

.tx/config

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

AUTHORS

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

CMakeLists.txt

@@ -1,22 +1,10 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-CMAKE_POLICY(SET CMP0017 NEW)
+SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
-CMAKE_POLICY(SET CMP0022 NEW)
 
-# TODO:
+IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
-# Update to NEW and fix things up
+  CMAKE_POLICY(SET CMP0017 NEW)
-CMAKE_POLICY(SET CMP0023 OLD)
+ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
-
-# 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
@@ -25,423 +13,164 @@ 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_MINOR 3 )
 SET( TOMAHAWK_VERSION_PATCH 99 )
-SET( TOMAHAWK_VERSION_RC 0 )
 
-SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs da de en el es es_419 fi fr hi_IN hu gl id it ja lt nl pl pt_BR pt_PT ro ru sq sv th tr uk vi zh_CN zh_TW )
+#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" )
 
 # 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_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(BUILD_TOOLS "Build Tomahawk helper tools" ${BUILD_NO_RELEASE})
-option(BUILD_HATCHET "Build the Hatchet plugin" ON)
-option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 instead of Qt5" OFF)
-
-if(UNIX AND NOT APPLE)
-       set(CRASHREPORTER_ENABLED_BY_DEFAULT OFF)
-else()
-       set(CRASHREPORTER_ENABLED_BY_DEFAULT ON)
-endif()
-option(WITH_CRASHREPORTER "Build with CrashReporter" ${CRASHREPORTER_ENABLED_BY_DEFAULT})
-option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
-option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-option(WITH_KDE4 "Build with support for KDE specific stuff" ON)
-
-# build options for development purposes
-option(SANITIZE_ADDRESS "Enable Address Sanitizer for memory error detection" OFF)
-option(TOMAHAWK_FINEGRAINED_MESSAGES "Enable even more verbose logging (will hurt performance significantly" OFF)
-
-CMAKE_DEPENDENT_OPTION(WITH_UPOWER "Build with support for UPower events" ON
-       "UNIX;NOT APPLE" OFF)
-CMAKE_DEPENDENT_OPTION(WITH_GNOMESHORTCUTHANDLER "Build with shortcut handler for GNOME" ON
-       "UNIX;NOT APPLE" OFF)
-
-IF( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt")
-    message(STATUS "Build of crashreporter disabled.")
-    SET(WITH_CRASHREPORTER OFF)
-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 ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
-SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION_TMP}" )
 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 )
+    IF( ${TOMAHAWK_VERSION_DATE} GREATER 0)
-        SET( TOMAHAWK_VERSION_TMP ${TOMAHAWK_VERSION_TMP}.${TOMAHAWK_VERSION_DATE} )
+        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}" )
 
-# make predefined install dirs available everywhere
-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_WITH_QT4 )
+IF( NOT BUILD_GUI )
-    find_package(Qt5Core QUIET)
+    ADD_DEFINITIONS( -DENABLE_HEADLESS )
-    if( Qt5Core_DIR )
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-        # CMAKE 2.8.13+/3.0.0+ requires these for IMPORTed targets
+ELSE()
-        find_package(Qt5Concurrent REQUIRED)
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
-        find_package(Qt5Svg REQUIRED)
+    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
-        find_package(Qt5UiTools REQUIRED)
-        find_package(Qt5WebKitWidgets REQUIRED)
-        find_package(Qt5Widgets REQUIRED)
-        find_package(Qt5Xml REQUIRED)
-        find_package(Qt5X11Extras NO_MODULE QUIET)
-
-        if(Qt5X11Extras_FOUND)
-            set(HAVE_X11 TRUE)
-        else()
-            set(HAVE_X11 FALSE)
-        endif()
-
-        message(STATUS "Found Qt5! Be aware that Qt5-support is still experimental and not officially supported!")
-
-        if( UNIX AND NOT APPLE )
-            # We need this to find the paths to qdbusxml2cpp and co
-            find_package(Qt5DBus REQUIRED)
-        endif()
-
-        if(APPLE)
-            find_package(Qt5MacExtras REQUIRED)
-        endif()
-
-        if(WIN32)
-            find_package(Qt5WinExtras REQUIRED)
-        endif()
-
-        macro(qt_wrap_ui)
-            qt5_wrap_ui(${ARGN})
-        endmacro()
-
-        macro(qt_add_resources)
-            qt5_add_resources(${ARGN})
-        endmacro()
-
-        find_package(Qt5LinguistTools REQUIRED)
-        macro(qt_add_translation)
-            qt5_add_translation(${ARGN})
-        endmacro()
-
-        if( UNIX AND NOT APPLE )
-            macro(qt_add_dbus_interface)
-                qt5_add_dbus_interface(${ARGN})
-            endmacro()
-
-            macro(qt_add_dbus_adaptor)
-                qt5_add_dbus_adaptor(${ARGN})
-            endmacro()
-        endif()
-
-        macro(setup_qt)
-        endmacro()
-
-        set(QT_RCC_EXECUTABLE "${Qt5Core_RCC_EXECUTABLE}")
-        #FIXME: CrashReporter depends on deprecated QHttp
-        set(WITH_KDE4 OFF)
-    endif()
-endif()
-if( NOT Qt5Core_DIR )
-    message(STATUS "Could not find Qt5, searching for Qt4 instead...")
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-    if( BUILD_GUI )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" "QtUiTools" "QtSvg")
-    endif()
-    if( BUILD_TESTS )
-        list(APPEND NEEDED_QT4_COMPONENTS "QtTest")
-    endif()
-
-    macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
-    macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
-
-    macro(qt5_use_modules)
-    endmacro()
-
-    macro(qt_wrap_ui)
-        qt4_wrap_ui(${ARGN})
-    endmacro()
-
-    macro(qt_add_resources)
-        qt4_add_resources(${ARGN})
-    endmacro()
-
-    macro(qt_add_translation)
-        qt4_add_translation(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_interface)
-      qt4_add_dbus_interface(${ARGN})
-    endmacro()
-
-    macro(qt_add_dbus_adaptor)
-        qt4_add_dbus_adaptor(${ARGN})
-    endmacro()
-
-    macro(setup_qt)
-        if( NOT BUILD_GUI )
-            set(QT_DONT_USE_QTGUI TRUE)
-        endif()
-        if( UNIX AND NOT APPLE )
-            set(QT_USE_QTDBUS TRUE)
-        endif()
-        set(QT_USE_QTSQL TRUE)
-        set(QT_USE_QTNETWORK TRUE)
-        set(QT_USE_QTXML TRUE)
-        set(QT_USE_QTWEBKIT TRUE)
-
-        include( ${QT_USE_FILE} )
-    endmacro()
-
-    # Qt5 C++11 Macros not defined within Qt4
-    # TODO: Add C++11 support
-    tomahawk_add_definitions( "-DQ_DECL_FINAL=" )
-    tomahawk_add_definitions( "-DQ_DECL_OVERRIDE=" )
-endif()
-
-if( Qt5Core_DIR )
-    set( TOMAHAWK_QT5_TMP TRUE)
-else( Qt5Core_DIR )
-    set( TOMAHAWK_QT5_TMP FALSE )
-endif( Qt5Core_DIR )
-set( TOMAHAWK_QT5 ${TOMAHAWK_QT5_TMP} CACHE BOOL "Build Tomahawk with Qt5")
-
-if( BUILD_GUI AND UNIX AND NOT APPLE )
-    macro_optional_find_package( X11 )
-    macro_log_feature(X11_FOUND "X11" "The Xorg libraries" "http://www.x.org/wiki/" TRUE "" "Xorg libraries are used by libqnetwm to bring windows to front reliably")
-endif()
-
-include(CheckCXXCompilerFlag)
-check_cxx_compiler_flag( "-std=c++11" CXX11_FOUND )
-check_cxx_compiler_flag( "-std=c++0x" CXX0X_FOUND )
-check_cxx_compiler_flag( "-stdlib=libc++" LIBCPP_FOUND )
-if(CXX11_FOUND)
-    tomahawk_add_cxx_flags( "-std=c++11" )
-elseif(CXX0X_FOUND)
-    tomahawk_add_cxx_flags( "-std=c++0x" )
-else()
-    message(STATUS "${CMAKE_CXX_COMPILER} does not support C++11, please use a
-    different compiler")
-endif()
-if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR APPLE) AND LIBCPP_FOUND)
-    tomahawk_add_cxx_flags( "-stdlib=libc++" )
-endif()
-
-macro_optional_find_package(Echonest 2.3.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.3.0 is needed for dynamic playlists and the infosystem")
-
-find_package(Boost REQUIRED COMPONENTS filesystem system)
-macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explanation
-
-macro_optional_find_package(Lucene++ 3.0.0)
-macro_log_feature(LUCENEPP_FOUND "Lucene++" "The open-source, C++ search engine" "https://github.com/luceneplusplus/LucenePlusPlus/" TRUE "" "Lucene++ is used for indexing the collection")
-
-if( NOT TOMAHAWK_QT5 )
-    macro_optional_find_package(QJSON 0.8.1)
-    macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
 ENDIF()
 
-macro_optional_find_package(Taglib 1.8.0)
+IF( BUILD_GUI AND UNIX AND NOT APPLE )
+    FIND_PACKAGE( X11 )
+ENDIF()
+
+macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n     the qtwebkit-devel package is installed as well")
+
+macro_optional_find_package(Phonon 4.5.0)
+macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
+if(PHONON_FOUND)
+    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+endif()
+
+macro_optional_find_package(LibEchonest 1.1.10)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.10 is needed for dynamic playlists and the infosystem")
+
+macro_optional_find_package(CLucene 0.9.23)
+macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
+
+macro_optional_find_package(QJSON)
+macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVariant objects" "http://qjson.sf.net" TRUE "" "libqjson is used for encoding communication between Tomahawk instances")
+
+macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 
-macro_optional_find_package(Sparsehash)
+macro_optional_find_package(Boost)
-macro_log_feature(SPARSEHASH_FOUND "Sparsehash"
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
-    "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(GnuTLS)
+macro_optional_find_package(QCA2)
-macro_log_feature(GNUTLS_FOUND "GnuTLS"
+macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions required for Grooveshark resolver" "http://delta.affinix.com/qca/" FALSE "" "")
-    "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")
 
-if( TOMAHAWK_QT5 )
+macro_optional_find_package(LibAttica)
-  macro_optional_find_package(Qca-qt5)
+macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for automatic fetching and managing of resolvers from the tomahawk website" "https://projects.kde.org/projects/kdesupport/attica" FALSE "" "")
-  if(Qca-qt5_DIR)
-      set(QCA2_FOUND ON CACHE BOOL "QCA2 was found")
-      set(QCA2_LIBRARIES "qca-qt5" CACHE STRING "QCA2 Qt5 target")
-  endif()
-else()
-  macro_optional_find_package(QCA2)
-endif()
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions necessary for some resolvers and accounts" "http://delta.affinix.com/qca/" TRUE "" "")
-
-if( TOMAHAWK_QT5 )
-    macro_optional_find_package(KF5Attica 1.0.0)
-    set(LIBATTICA_FOUND ${KF5Attica_FOUND})
-else()
-    macro_optional_find_package(LibAttica 0.4.0)
-endif()
-macro_log_feature(LIBATTICA_FOUND "libattica" "Provides support for installation of resolvers from the Tomahawk website" "http://download.kde.org/stable/attica/" TRUE "" "")
 
 macro_optional_find_package(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 autmatically. Will build internal copy instead." "http://quazip.sourceforge.net/" FALSE "" "")
 
-macro_optional_find_package(Jreen 1.0.5)
+IF( NOT QuaZip_FOUND )
-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")
+    add_subdirectory( ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip )
-if( PC_JREEN_VERSION STREQUAL "1.1.0" )
+    SET( QuaZip_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk/thirdparty/quazip )
-    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.")
+    SET( QuaZip_LIBRARY quazip )
-endif()
+    SET( QuaZip_LIBRARIES ${QuaZip_LIBRARY} )
+    SET( QuaZip_FOUND true )
 
-macro_optional_find_package(LibLastFm 1.0.0)
+    # copy headers to build/quazip so we can use proper includes inside the code
-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")
+    FILE( COPY ${CMAKE_SOURCE_DIR}/src/libtomahawk/thirdparty/quazip/quazip/ DESTINATION ${CMAKE_BINARY_DIR}/libtomahawk/thirdparty/quazip )
+ENDIF()
 
-if( NOT APPLE )
+# required
-if( TOMAHAWK_QT5 )
+#While we distribute our own liblastfm2, don't need to look for it
-    macro_optional_find_package(Qt5Keychain 0.1.0)
+#macro_optional_find_package(LibLastFm 0.3.3)
-else()
+#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
-    macro_optional_find_package(QtKeychain 0.1.0)
+set(LIBLASTFM_FOUND true)
-endif()
-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
-endif()
-
-if( UNIX AND NOT APPLE )
-    macro_optional_find_package(TelepathyQt 0.9.3)
-    if ( TOMAHAWK_QT5 )
-        macro_log_feature(TelepathyQt5_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
-    else ( TOMAHAWK_QT5)
-        macro_log_feature(TelepathyQt4_FOUND "Telepathy-Qt" "Telepathy-Qt is a Qt high-level binding for Telepathy, a D-Bus framework for unifying real time communication." FALSE "" "Telepathy-Qt is needed for sharing Jabber/GTalk accounts with Telepathy.\n")
-    endif()
-endif()
-
-# we need pthreads too
-macro_optional_find_package(Threads)
-macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
-
-### QtSparkle
-if( WIN32 )
-    macro_optional_find_package(QtSparkle)
-    macro_log_feature(QTSPARKLE_FOUND "qtsparkle" "Library for creating auto updaters written in Qt" "https://github.com/davidsansome/qtsparkle" FALSE "" "")
-endif( WIN32 )
-
-if( WIN32 OR APPLE )
-    macro_optional_find_package(LibsnoreQt5 0.5.70 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)
 
 #### submodules start
-# automatically init submodules here, don't delete this code we may add submodules again
 
 # this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_JREEN )
+    IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+        EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+        EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+    ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+ENDIF()
 
-# IF( FALSE )
+IF( INTERNAL_JREEN )
-#     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/jreen )
-#         EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
-#         EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+    SET( LIBJREEN_LIBRARY jreen )
-#     ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
+    SET( LIBJREEN_LIBRARIES ${LIBJREEN_LIBRARY} )
-# ENDIF()
+    SET( LIBJREEN_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
+ELSE( INTERNAL_JREEN )
+    macro_optional_find_package(Jreen)
+ENDIF( INTERNAL_JREEN )
+macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")
 
+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")
 #### submodules end
 
+### libportfwd
+SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
+SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
+SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
+ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
-if (WITH_KDE4)
+# we need pthreads too
-    macro_optional_find_package(KDE4)
+#macro_optional_find_package(Threads)
-    macro_optional_find_package(KDE4Installed)
+#macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
-endif(WITH_KDE4)
-macro_log_feature(KDE4_FOUND "KDE4" "Provides support for configuring Telepathy Accounts from inside Tomahawk" "https://www.kde.org" FALSE "" "")
 
-IF( KDE4_FOUND )
+macro_optional_find_package(KDE4)
+macro_optional_find_package(KDE4Installed)
+
+# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
+# for future kde integration
+
+# macro_optional_find_package(KDE4)
+IF(KDE4_FOUND)
     IF( CMAKE_C_FLAGS )
         # KDE4 adds and removes some compiler flags that we don't like
         # (only for gcc not for clang e.g.)
@@ -452,6 +181,10 @@ ELSE()
     SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
 ENDIF()
 
+IF( WIN32 )
+  find_library(QTSPARKLE_LIBRARIES qtsparkle)
+ENDIF( WIN32 )
+
 #show dep log
 macro_display_feature_log()
 
@@ -463,79 +196,21 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-# KDE4 defines an uninstall target for us automatically (and at least with Qt4 Phonon does as well no matter if kdelibs was found)
+# KDE4 defines an uninstall target for us automatically
-# IF( NOT KDE4_FOUND )
+IF( NOT KDE4_FOUND )
-#     ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-# ENDIF()
+ENDIF()
 
-IF( ( NOT APPLE ) AND ( NOT SANITIZE_ADDRESS ))
+IF( NOT APPLE )
     # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
-    #
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-    # On using Address Sanitizer, we cannot link to the ASAN lib, so
+ENDIF( NOT APPLE )
-    # --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 )
 
 ADD_SUBDIRECTORY( thirdparty )
+ADD_SUBDIRECTORY( src/libtomahawk )
+SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
+IF(BUILD_GUI)
-IF(BUILD_TESTS)
+    ADD_SUBDIRECTORY( src/breakpad/CrashReporter )
-  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}"
-)

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)

CMakeModules/COPYING-CMAKE-SCRIPTS

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

CMakeModules/FindCLucene.cmake

@@ -0,0 +1,126 @@
+#
+# This module looks for clucene (http://clucene.sf.net) support
+# It will define the following values
+#
+# 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_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)
+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_DIR 
+  CLUCENE_LIBRARY_DIR 
+  CLUCENE_LIBRARIES
+  )

CMakeModules/FindCLuceneUnstable.cmake

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

CMakeModules/FindEchonest.cmake

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

CMakeModules/FindGloox.cmake

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

CMakeModules/FindJreen.cmake

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

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

CMakeModules/FindLibEchonest.cmake

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

CMakeModules/FindLibLastFm.cmake

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

CMakeModules/FindLucene++.cmake

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

CMakeModules/FindPhonon.cmake

@@ -0,0 +1,37 @@
+# Find libphonon
+# Once done this will define
+#
+#  PHONON_FOUND    - system has Phonon Library
+#  PHONON_INCLUDES - the Phonon include directory
+#  PHONON_LIBS     - link these to use Phonon
+#  PHONON_VERSION  - the version of the Phonon Library
+
+# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro(_phonon_find_version)
+   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
+   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
+   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
+   set(PHONON_VERSION "${CMAKE_MATCH_1}")
+endmacro(_phonon_find_version)
+
+# the dirs listed with HINTS are searched before the default sets of dirs
+find_library(PHONON_LIBRARY NAMES phonon HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
+
+if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+   set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
+   _phonon_find_version()
+endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Phonon  DEFAULT_MSG  PHONON_INCLUDE_DIR PHONON_LIBRARY)
+
+mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY)

CMakeModules/FindQCA2.cmake

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

CMakeModules/FindQJSON.cmake

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

CMakeModules/FindQTweetLib.cmake

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

CMakeModules/FindQtSparkle.cmake

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

CMakeModules/FindQuaZip.cmake

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

CMakeModules/FindSparsehash.cmake

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

CMakeModules/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)
@@ -56,7 +56,7 @@ ELSE()
 	  include(FindLibraryWithDebug)
 	  include(FindPackageHandleStandardArgs)
 
-	  find_path(TAGLIB_INCLUDES
+	  find_path(TAGLIB_CFLAGS
 		NAMES
 		tag.h
 		PATH_SUFFIXES taglib

CMakeModules/FindTelepathyQt.cmake

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

CMakeModules/GNUInstallDirs.cmake

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

CMakeModules/NSIS.template.in

@@ -15,30 +15,21 @@
 ;-----------------------------------------------------------------------------
 ; Some paths.
 ;-----------------------------------------------------------------------------
-!ifndef MINGW_ROOT
+!ifndef MING_PATH
-    !define MINGW_ROOT "/usr/i686-w64-mingw32/sys-root/mingw"
+    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
 !endif
-
+!define MING_BIN "${MING_PATH}/bin"
-!define APPLICATION_NAME "Tomahawk"
+!define MING_LIB "${MING_PATH}/lib"
-!define TARGET_NAME "tomahawk"
-;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 BUILD_PATH "@CMAKE_BINARY_DIR@"
 !define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
-!define QT_DLL_PATH "${MINGW_BIN}"
+!define QT_DLL_PATH "${MING_BIN}"
-!define QT_QML_PATH "${MINGW_SHARE}/qt5/qml"
+!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
-!define SQLITE_DLL_PATH "${MINGW_LIB}/qt5/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-!define IMAGEFORMATS_DLL_PATH "${MINGW_LIB}/qt5/plugins/imageformats"
 
 ; We use official release plugins
 ; mingw32-vlc from obs misses a lot and has even broken ones probably
-!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\" ; SIC! ^
+!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^
-!define VLC_BIN "${VLC_PATH}"
+!define VLC_BIN "${VLC_PATH}\bin"
 !define VLC_PLUGIN_PATH "${VLC_BIN}\plugins"
 
 !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
@@ -61,11 +52,11 @@
 ; Initial installer setup and definitions.
 ;-----------------------------------------------------------------------------
 Name "@CPACK_NSIS_PACKAGE_NAME@"
-Caption "${APPLICATION_NAME} Installer"
+Caption "Tomahawk Installer"
-BrandingText "${APPLICATION_NAME} ${VERSION}  -- ${BUILD_TIME}"
+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
@@ -88,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}"
+!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk
-
-;-----------------------------------------------------------------------------
-; Setup macros for the creation of a shortcut supporting Windows 8 notifications.
-;-----------------------------------------------------------------------------
-!define SnoreToastExe "$INSTDIR\SnoreToast.exe"
 
 ;-----------------------------------------------------------------------------
 ; Modern User Interface (MUI) defintions and setup.
@@ -162,7 +147,7 @@ Function LaunchTomahawk
 FunctionEnd
 
 Function LaunchTomahawkAsUser
-   Exec "$INSTDIR\${APPLICATION_NAME}.exe"
+   Exec "$INSTDIR\tomahawk.exe"
 FunctionEnd
 
 ##############################################################################
@@ -172,31 +157,31 @@ FunctionEnd
 ##############################################################################
 
 !macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess "${processName}"
+   Processes::FindProcess ${processName}
-   StrCmp $R0 "0" "${gotoWhenNotFound}" "${gotoWhenFound}"
+   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"
+     IDYES process_${processName}_kill IDNO process_${processName}_ended
-   process_${processTitle}_kill:
+   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
+!macro CheckAndConfirmEndProcess processName
-   !insertmacro CheckForProcess "${processName}" 0 "no_process_${processTitle}_to_end"
+   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
-   !insertmacro ConfirmEndProcess "${processTitle}" "${processName}"
+   !insertmacro ConfirmEndProcess ${processName}
-   no_process_${processTitle}_to_end:
+   no_process_${processName}_to_end:
 !macroend
 
 Function EnsureTomahawkShutdown
-   !insertmacro CheckAndConfirmEndProcess "${TARGET_NAME}" "${APPLICATION_NAME}.exe"
+   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
 FunctionEnd
 
 ##############################################################################
@@ -206,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"
 
@@ -254,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:
@@ -275,40 +260,42 @@ 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\CrashReporter.exe"
+        File "${INSTALL_PATH}\bin\libtomahawk_breakpad.dll"
 
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}.dll"
+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-widgets.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
-        File "${INSTALL_PATH}\bin\lib${TARGET_NAME}-playdarapi.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
-
+        File "${INSTALL_PATH}\bin\libquazip.dll"
-        ; plugins
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
-        File "${INSTALL_PATH}\lib\lib${TARGET_NAME}_*_*.dll"
+        File "${INSTALL_PATH}\lib\libtomahawk_sip*.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}\CrashReporter.exe"
+        File "${BUILD_PATH}\libtomahawk_breakpad.dll"
 
-        File "${BUILD_PATH}\lib${TARGET_NAME}.dll"
+        File "${BUILD_PATH}\libtomahawklib.dll"
-        File "${BUILD_PATH}\lib${TARGET_NAME}-widgets.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
-        File "${BUILD_PATH}\lib${TARGET_NAME}-playdarapi.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
-
+        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
-        ; plugins
+        File "${BUILD_PATH}\libquazip.dll"
-        File "${BUILD_PATH}\lib${TARGET_NAME}_*_*.dll"
+        File "${BUILD_PATH}\libtomahawk_sip*.dll"
    !endif
 
    ;License & release notes.
@@ -316,139 +303,81 @@ 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}\QtCore4.dll"
-    File "${QT_DLL_PATH}\Qt5Qml.dll"
+   File "${QT_DLL_PATH}\QtGui4.dll"
-    File "${QT_DLL_PATH}\Qt5Sql.dll"
+   File "${QT_DLL_PATH}\QtNetwork4.dll"
-    File "${QT_DLL_PATH}\Qt5Xml.dll"
+   File "${QT_DLL_PATH}\QtSql4.dll"
-    File "${QT_DLL_PATH}\Qt5Core.dll"
+   File "${QT_DLL_PATH}\QtXml4.dll"
-    File "${QT_DLL_PATH}\Qt5OpenGL.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.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"
 
-    ;Qt deps
+   ;SQLite driver
-    File "${QT_DLL_PATH}\libpcre16-0.dll"
+   SetOutPath "$INSTDIR\sqldrivers"
-    File "${QT_DLL_PATH}\libxml2-2.dll"
+   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
-    File "${QT_DLL_PATH}\libxslt-1.dll"
+   SetOutPath "$INSTDIR"
-    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
+   ;Image plugins
-    SetOutPath "$INSTDIR\sqldrivers"
+   SetOutPath "$INSTDIR\imageformats"
-    File "${SQLITE_DLL_PATH}\qsqlite.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
-    SetOutPath "$INSTDIR"
+   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
-    File "${MINGW_BIN}\libsqlite3-0.dll"
+   SetOutPath "$INSTDIR"
 
-    ;Qt platform plugins
+   ;Cygwin/c++ stuff
-    SetOutPath "$INSTDIR\platforms"
+   ;File "${MING_BIN}\cygmad-0.dll"
-     File "${MINGW_LIB}/qt5/plugins/platforms/qwindows.dll"
+   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
-    SetOutPath "$INSTDIR"
+   ;File "${MING_BIN}\mingwm10.dll"
+   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
+   File "${MING_BIN}\libstdc++-6.dll"
 
-    ;Image plugins
+   ;Phonon stuff
-    SetOutPath "$INSTDIR\imageformats"
-    File "${IMAGEFORMATS_DLL_PATH}\qgif.dll"
-    File "${IMAGEFORMATS_DLL_PATH}\qjpeg.dll"
-    File "${IMAGEFORMATS_DLL_PATH}\qsvg.dll"
-    SetOutPath "$INSTDIR"
 
-    ;Qt qml plugins
+   ;Fix the phonon build to not use Dbus
-    SetOutPath "$INSTDIR\QtQuick.2"
+   File "${QT_DLL_PATH}\QtDbus4.dll"
-    File /r /x *.debug "${QT_QML_PATH}\QtQuick.2\*"
+   File "${MING_BIN}\libdbus-1-3.dll"
-    SetOutPath "$INSTDIR\QtQuick\Window.2"
+   File "${MING_BIN}\dbus-daemon.exe"
-    File /r /x *.debug "${QT_QML_PATH}\QtQuick\Window.2\*"
-    SetOutPath "$INSTDIR"
 
-    ;Cygwin/c++ stuff
+   File "${VLC_BIN}\libphonon.dll"
-    File "${MINGW_BIN}\libgcc_s_sjlj-1.dll"
+   SetOutPath "$INSTDIR\phonon_backend"
-    File "${MINGW_BIN}\libstdc++-6.dll"
+   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
+   SetOutPath "$INSTDIR"
 
-    ;VLC
+   ;VLC
-    File "${VLC_BIN}\libvlc.dll"
+   ;SetOutPath "$INSTDIR\phonon_backend"
-    File "${VLC_BIN}\libvlccore.dll"
+   File "${VLC_BIN}\libvlc.dll"
-    SetOutPath "$INSTDIR\plugins"
+   File "${VLC_BIN}\libvlccore.dll"
-    File /r "${VLC_PLUGIN_PATH}\*.dll"
+   SetOutPath "$INSTDIR\plugins"
-    SetOutPath "$INSTDIR"
+   File /r "${VLC_PLUGIN_PATH}\*.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libmad-0.dll" ; MP3
+   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
+   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
+   File "${MING_BIN}\libvorbis-0.dll" ; OGG
+   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
 
-    ; Other
-    File "${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
+   ; Other
-    File "${MINGW_BIN}\D3DCompiler_43.dll"
+   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"
 
-    File "${MINGW_BIN}\libechonest5.dll"
+   File "${MING_BIN}\libechonest.dll"
-    File "${MINGW_BIN}\liblastfm5.dll"
+   File "${MING_BIN}\libQTweetLib.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"
 
    ; Jabber
-    File "${MINGW_BIN}\libjreen-qt5.dll"
+   File "${MING_BIN}\libjreen.dll"
-    File "${MINGW_BIN}\libidn-11.dll"
+   File "${MING_BIN}\libqca.dll"
-    File "${MINGW_BIN}\libgsasl-7.dll"
+   SetOutPath "$INSTDIR\crypto"
-    File "${MINGW_BIN}\libqca-qt5.dll"
+   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
-    SetOutPath "$INSTDIR\crypto"
+   SetOutPath "$INSTDIR"
-    File "${MINGW_LIB}\qca-qt5\crypto\libqca-ossl.dll"
+   File "${MING_BIN}\libssl-8.dll"
-    SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libcrypto-8.dll"
-    File "${MINGW_BIN}\libssl-10.dll"
-    File "${MINGW_BIN}\libcrypto-10.dll"
 
-    ; LucenePlusPlus
+   File "${MING_LIB}\libclucene-core.dll"
-    File "${MINGW_BIN}\liblucene++.dll"
+   File "${MING_LIB}\libclucene-shared.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 "${MINGW_BIN}\libqtsparkle-qt5.dll"
+   File "${MING_BIN}\libqtsparkle.dll"
-    File "${MINGW_BIN}\libKF5Attica.dll"
+   File "${MING_BIN}\libattica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"
@@ -457,16 +386,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}"
+      RMDir /r "$SMPROGRAMS\Tomahawk"
-      CreateDirectory "$SMPROGRAMS\${APPLICATION_NAME}"
+      CreateDirectory "$SMPROGRAMS\Tomahawk"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Notification Settings.lnk" "$INSTDIR\snoresettings.exe" "-a ${APPLICATION_NAME}"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-      !insertmacro SnoreShortcut "$SMPROGRAMS\${APPLICATION_NAME}\${APPLICATION_NAME}.lnk" "$INSTDIR\${APPLICATION_NAME}.exe" "${AppUserModelId}"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-      CreateShortCut "$SMPROGRAMS\${APPLICATION_NAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
       SetShellVarContext current
    ${MementoSectionEnd}
 !endif
@@ -477,7 +405,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
 
@@ -487,7 +415,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
 
@@ -498,10 +426,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_TOMAHAWK_PLAYER} "Tomahawk player essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "${APPLICATION_NAME} program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "Tomahawk program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for ${APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for Tomahawk."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for ${APPLICATION_NAME}."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for Tomahawk."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 Section -post
@@ -518,98 +446,31 @@ Section -post
    SetDetailsPrint listonly
 
    ;Version numbers used to detect existing installation version for comparisson.
-   WriteRegStr HKLM "Software\${APPLICATION_NAME}" "" $INSTDIR
+   WriteRegStr HKLM "Software\Tomahawk" "" $INSTDIR
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMinor" "${VER_MINOR}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionRevision" "${REVISION}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionRevision" "${REVISION}"
-   WriteRegDWORD HKLM "Software\${APPLICATION_NAME}" "VersionBuild" "${VER_BUILD}"
+   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\Tomahawk" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "InstallLocation" "$INSTDIR"
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation" "$INSTDIR"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayName" "${APPLICATION_NAME}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayName" "Tomahawk"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "Publisher" "@TOMAHAWK_ORGANIZATION_DOMAIN@"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "Publisher" "Tomahawk-player.org"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "DisplayVersion" "${VERSION}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayVersion" "${VERSION}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "VersionMinor" "${VER_MINOR}.${REVISION}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "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\Tomahawk" "URLInfoAbout" "http://tomahawk-player.org/"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "HelpLink" "http://@TOMAHAWK_ORGANIZATION_DOMAIN@/"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "HelpLink" "http://tomahawk-player.org/"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoModify" "1"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPLICATION_NAME}" "NoRepair" "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: Tomahawk Protocol"
-   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
+   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR "tomahawk\DefaultIcon" "" "$INSTDIR\${APPLICATION_NAME}.exe,1"
    WriteRegStr HKCR "tomahawk\shell" "" "open"
-   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\${APPLICATION_NAME}.exe" "%1"'
+   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   ; Register file associations
-   WriteRegStr HKCR ".mp3" "" "MPEG Audio Layer 3"
-   WriteRegStr HKCR ".mp3\DefaultIcon" "" "$INSTDIR\${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"'
 
    SetDetailsPrint textonly
    DetailPrint "Finsihed."
@@ -627,7 +488,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
 
@@ -635,10 +496,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
 
@@ -656,41 +517,39 @@ Function un.UnPageUserAppDataLeave
 FunctionEnd
 
 Section Uninstall
-   IfFileExists "$INSTDIR\${APPLICATION_NAME}.exe" tomahawk_installed
+   IfFileExists "$INSTDIR\tomahawk.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
+      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}"
+   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionBuild"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionBuild"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMajor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMajor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionMinor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMinor"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" "VersionRevision"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
-   DeleteRegValue HKLM "Software\${APPLICATION_NAME}" ""
+   DeleteRegValue HKLM "Software\Tomahawk" ""
-   DeleteRegKey HKLM "Software\${APPLICATION_NAME}"
+   DeleteRegKey HKLM "Software\Tomahawk"
 
-   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}"
+   DeleteRegKey HKCR "tomahawk"
-   ;DeleteRegKey HKCR "Software\${APPLICATION_NAME}Spotify"
-   DeleteRegKey HKCR "${APPLICATION_NAME}"
 
    ;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
+      IfFileExists "$DESKTOP\Tomahawk.lnk" 0 +2
-         Delete "$DESKTOP\${APPLICATION_NAME}.lnk"
+         Delete "$DESKTOP\Tomahawk.lnk"
    !endif
 
    ;Quick Launch shortcut.
    !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-      IfFileExists "$QUICKLAUNCH\${APPLICATION_NAME}.lnk" 0 +2
+      IfFileExists "$QUICKLAUNCH\Tomahawk.lnk" 0 +2
-         Delete "$QUICKLAUNCH\${APPLICATION_NAME}.lnk"
+         Delete "$QUICKLAUNCH\Tomahawk.lnk"
    !endif
 
    ;Remove all the Program Files.
@@ -698,7 +557,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
@@ -752,7 +611,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:

ChangeLog

@@ -1,305 +1,3 @@
-Version 0.9.0:
-    * Resolved various playback issues by switching to a new audio engine.
-    * Fixed collection sorting.
-
-Version 0.8.4:
-    * Fixed drag & drop issues on sidebar.
-    * Fixed starting Tomahawk with a filename as parameter.
-    * Update column view when collection changes.
-    * (Linux) Don't crash on environments with invalid locales.
-
-Version 0.8.3:
-    * Performance improvements for collection browsing.
-    * Improved memory footprint.
-    * Show cloud collections above your friends in the sidebar.
-    * Keep looking for alternative sources even when we found a perfect match.
-    * Fixed crash in network code.
-    * Fixed repeat one/all icons.
-    * Be more lenient about accepting JSPF and M3U playlists.
-    * Improved support for compilation albums.
-    * (Windows) Fixed support for Windows XP.
-    * (OS X) Fixed settings dialog appearance on Yosemite.
-    * (OS X) Fixed SSL errors on Yosemite.
-
-Version 0.8.2:
-    * Show error message if saving tags failed.
-    * Fixed painting issue on search page.
-    * (OS X & Windows) Fixed crash during collection scan.
-
-Version 0.8.1:
-    * Disabled sorting for stations.
-    * Fixed drag & drop behavior in combination with certain resolvers.
-    * Fixed infinite scanning recursion.
-    * Prevented adding dupes to the collection when scanning.
-    * When playing an artist or album, don't give up when the first track
-      in list isn't playable.
-    * Fixed importing M3U playlists.
-    * Sort album grids by artist name.
-    * Fixed painting issue on 'More Albums' grid.
-    * Fixed crash when editing/saving track tags.
-
-Version 0.8.0:
-    * Redesigned - Shiny new interface. Simplified. New icons.
-    * Added Friend Feed.
-    * Now Playing notifications (OS X & Windows) - support for OS-level
-      notification systems (e.g. Notification Center) with fallback to its own
-      native notification system.
-    * Many actions now available in context menu - including Favorite and Send
-      to a Friend.
-    * Drag and drop support for iTunes, Deezer, Beats Music, Rdio, Spotify,
-      SoundCloud links (into Tomahawk) for playlists/tracks/artists/album urls.
-    * Support for clicking source icon for currently playing track in audio
-      controls to take user to associated page on source's site.
-    * Added Hatchet plug-in.
-    * Added Google Play Music and Beats Music support.
-    * Add links to Support site, Bug Reports and Translations to Help menu.
-    * Add "What's New" page to display on first launch (or until dismissed).
-      Also available from Help menu.
-    * Changed label from "Resolvers" and "Services" to more generic "Plug-Ins".
-    * Clarified some labels, help text and status messages.
-    * Changed icon color a bit.
-    * Added "Acoustic" and "Electric" songtypes to Stations options.
-    * Removed some stale Chart sources.
-    * Playback Queue now saves its state across sessions.
-    * Queue now moved to sidebar.
-    * Added "Inbox" feature, showing incoming song recommendations. Dropping
-      a track on a user in the sidebar sends a recommendation to them.
-    * You will now be asked whether you want to trust invalid SSL certificates.
-    * Improved connecting between Tomahawk peers and support multiple IPs
-      (including IPv6).
-    * Removed Top Loved from sidebar.
-    * Removed Spotify playlist syncing (will return in future versions).
-    * HTTP(S) streaming is now done by Tomahawk instead of the Phonon backend
-      (fixed HTTPS streaming on MacOS).
-    * Heavily reduced memory footprint during and after indexing the database.
-    * Retina display and DPI scaling fixes.
-    * New Collection views. Re-added support for tracklist view of Collection.
-    * Added Telepathy support.
-    * Plugin refactoring (and .AXE resolver binaries).
-    * Removed Twitter due to change in Twitter's API.
-    * Removed auto-playlists.
-    * Improved error messages.
-    * Added basic remote control API.
-    * Add support for Opus codec (requires TagLib 1.9).
-    * Support rtmp:// streams.
-    * Support custom headers in CustomUrlHandler.
-    * Fuzzy search indices for JS Resolvers.
-    * Add metadata retrieval of HTTP(S) streams in JavaScript resolvers.
-
-Version 0.7.0:
-    * JavaScript Resolvers can now expose collections.
-    * Introduced bundle system for JavaScript Resolvers, called "axes".
-    * Fixed playback-loop caused by duplicate tracks in a playlist.
-    * Improved peer handling and removed connection support through Twitter.
-    * Taking an account offline now also disconnects associated peers.
-    * Improved spotify protocol handling.
-    * Added "Append to Playlist" context menu item.
-    * User-friendlier collection handling: added info-buttons for artists and
-      albums. Double-clicking an item expands it now.
-    * Charts only load on-demand now.
-    * Fixed Diagnostics information not correctly updating.
-    * Fixed issue with hidden sidebar and panels.
-    * Fixed issues with some color schemes.
-    * Fixed playing files with special characters in the filename.
-    * Improved stability.
-    * Added translations for Catalan, Czech, Galician, Greek, Italian and
-      Chinese.
-    * (Windows) Smoother and more responsive audio playback.
-    * (Linux) Fixed grid issues with GTK-styles.
-
-Version 0.6.1:
-    * Improved stability.
-    * Improved UPnP detection and port-forwarding.
-    * Fixed scrolling behaviour of grid-views.
-    * Lots of small design tweaks and fixes.
-
-Version 0.6.0:
-    * Improved icon theme with vector graphics.
-    * Higher resolution artist and album images.
-    * You can now click artists, albums and tracks mentioned in artists'
-      biographies.
-    * New AudioControl logic - only enable Prev/Skip buttons if available.
-    * Added more options to right-click/context menus.
-    * Resolver source icon in Audiocontrols now supports being a link-back URL
-      to original source.
-    * Make friends' currently playing song (in sidebar) clickable.
-    * Improve MusicBrainz plugin to use normalized artist names and avoid
-      duplicate tracks.
-    * Access Control queries now stay on the bottom of the job view, removing
-      the tendency to jump away from the mouse.
-    * Improved random mode, preventing songs from being played in too rapid
-      succession.
-    * You can now choose between various view modes for your playlists.
-    * Nicer layout for the Artist, Album & Track pages.
-    * Follow HTTP redirects when fetching Playlists.
-    * Main menu can now be hidden and instead be shown as a toolbar button.
-    * Connectivity controls in the toolbar.
-    * Cleaned up settings dialog.
-    * Ability to sync Spotify Starred Tracks with Tomahawk's Loved Tracks.
-    * Remove YouTube resolver from plug-in directory on request of YouTube.
-    * Fixed iTunes m3u playlist support.
-    * Support dropping of new Soundcloud user, track, set & likes URLs.
-    * Added HotNewHipHop as available chart.
-    * Added iTunes as available source for New Releases.
-    * Updates and additions to translations including: Japanese, Bulgarian, 
-      Finnish, Russian, Arabic, Chinese, Swedish, Czech and more.
-    * (Windows) Added thumb buttons to Windows 7's taskbar.
-    * (Linux) Allow disabling of playback notifications.
-
-Version 0.5.5:
-    * Changed the Spotify config dialog to indicate when the user
-      is logged in.
-    * Fixed bug where the wrong avatar could be shown for a user.
-    * Fixed shortcuts not working in the global search field on OS X.
-    * Fixed The Echo Nest stations.
-    * Code-signed executable on OS X for GateKeeper.
-    * Fixed logging in to Spotify when pressing return in the config dialog.
-    * Fixed queue not auto-collapsing when playing the last track.
-    * Fixed bug where album listings would fail to show up.
-    * Improved stability.
-    * Fixed bug where it was not possible to drop a mixture of resolved
-      and unresolved tracks onto a playlist.
-
-Version 0.5.4:
-    * Improved stability.
-    * Added support for Spotify album lookups.
-    * Fixed not always updating the database index after scanning.
-    * Fixed connection issue between Tomahawk peers.
-
-Version 0.5.3:
-    * Fixed broken artist names when importing Last.fm playback history.
-    * Fixed crash when filtering collections.
-
-Version 0.5.2:
-    * Fixed a crash when invalid results are coming back from a resolver or
-      are found in a playlist.
-
-Version 0.5.1:
-    * Fixed a few issues with automatic downloading and launching
-      of the Spotify account.
-    * Show an error message when not able to resolve a requested song.
-    * Fixed a few crash and freeze issues.
-    * Better detection of local networks for the Local Network connector.
-    * Don't prompt for access permission for your own accounts.
-    * (OS X) Fixed not being able to connect to Last.fm.
-
-Version 0.5.0:
-    * SOCKS5 proxy support improvements for resolvers and more.
-    * Initial Access Control support, allowing users to define who is able to
-      access and stream from their collection.
-    * Priortize resolution of a track on double-click.
-    * Spotify Resolver can now be easily installed on-demand from the settings.
-    * You can now sync selected playlists (and updates) with Spotify.
-    * Support .aiff (AIFF mimetype) files.
-    * Cleaned up Diagnostics window.
-    * You can tell Tomahawk to stop playback after a certain track finished.
-    * Double-clicking a playlist name (in the sidebar) will start the playlist.
-    * You can now import your entire Last.fm playback history into Tomahawk.
-    * Fixed sorting of related artists.
-    * Support for multimedia keys (Play, Pause, Next etc.) on Windows & Linux.
-    * When listening privately scrobbling to Last.fm and Adium is now disabled.
-    * Added a toolbar with page back / forward buttons and the global search.
-    * New grid-like view with direct playback controls.
-    * You can now browse new releases (by genre).
-    * Added social sharing widget, which allows you to tweet about a song.
-    * Added a track page showing a song's similar tracks and statistics.
-    * Separate Loved Tracks and Recently Played views per source.
-    * Combine an artist's albums into a single aggregated view.
-    * Added translations for Arabic, French, Bulgarian, Spanish and more.
-    * Fixed XSPF auto-updating.
-    * New Tomahawk logo and icon.
-
-Version 0.4.2:
-    * Fix ZeroConf protocol showing IP addresses instead of host names.
-    * Updated translations for various languages.
-    * Resuming playback restores correct volume settings.
-    * Reduced CPU usage during playback.
-    * Fixed not starting up due to case sensitivity issue on OS X.
-    * Fixed volume issue (too quiet) on Windows.
-
-Version 0.4.1:
-    * Fixed various crashes.
-    * Fixed issues with auto-updating XSPF playlists.
-    * Double-clicking a playlist starts playing it.
-    * Resolvers can now return disc number and album position for results.
-    * Fixed sorting playlists by track number.
-    * Fixed issues with changing proxy.
-    * Fixed Twitter authentication issues.
-    * Fixed Grooveshark support on Windows.
-
-Version 0.4.0:
-    * Added visual notification for database indexing job.
-    * Fixed icons not appearing in resolvers list.
-    * Fixed various UI glitches and stray error messages in stations.
-    * Fixed bug where album page would resolve bottom-to-top.
-    * Fixed bug where Footnotes would not update when changing selected album.
-    * Fixed dragging albums and artists from charts, album, and artist views.
-    * Fixed bug where filter text would be one step behind filter value.
-    * Fixed bug where resolvers would enable themselves after auto-updating.
-    * Fixed occasional crash when dropping tracks onto New Station item.
-    * Added jump-to-current-track support for search results page.
-    * Fixed non-resolving tracks when dragging from album view.
-    * Fixed fetching album covers for albums with special characters.
-    * Show errors and continue gracefully when resolved audio is not available.
-    * Fixed various crashes on exit.
-    * Added basic command-line options for playback control.
-    * Bumped up web api timeouts to allow web clients to finish resolving.
-    * Added filename suggestion when exporting a playlist.
-    * Cleaned up highlighting of artist names in album view.
-    * Cleaned up alignment of playlist items.
-    * Fixed potential crash when searching.
-    * Added support for disc number.
-    * Added SoundCloudWall.com charts.
-    * Added ability to "lock on" to a user when listening along, to skip along.
-    * Fixed bug where loved tracks would be refreshed much too often.
-    * Fixed some font size issues.
-    * Sped up Tomahawk startup by moving chart loading into a separate thread.
-    * Added support for parsing Grooveshark and Tinysong tracks and playlists.
-    * Reorganized sidebar to follow more logical item groupings.
-    * Added artist and album results to global searches.
-    * Fixed style and contrast issues when using GTK styles.
-    * Fixed paths to artwork when using MPRIS2 interface.
-    * Fixed out of sync Show/Hide menu items on OS X when hidden with cmd-h.
-    * Fixed /Volumes directory not showing up on OS X.
-    * Fixed startup crash on OS X.
-
-Version 0.3.3:
-    * Automatically load Super Collection tracks when no official release
-      information is available.
-    * Fixed stations not fetching new tracks under certain circumstances.
-    * Fixed Footnotes not always updating when selecting a new track.
-    * Added support for ow.ly, fb.me, itun.es and tinyurl.com URL shorteners.
-    * Fixed playback issues with non-latin filenames on Windows.
-    * Fixed tomahawk:// protocol not working properly on Windows.
-    * Fixed dupe menu entry appearing on OS X.
-    * Fixed invisible sidebar items on Linux.
-
-Version 0.3.2:
-    * Improved syncing process, it's faster and more reliable now.
-    * Fixed UPnP issues.
-    * Fixed not updating collections and views after a collection changes.
-    * Fixed not showing a source's proper name at all times.
-    * Improved music scanner reliability.
-    * Fixed various labels not being painted in the right color when selected.
-    * Support .oga (ogg mimetype) files.
-    * Fixed stuck Now Playing indicator icon.
-    * Fixed sidebar width of settings dialog on Windows.
-    * Fixed not always showing delete icon on hovered temporary pages.
-    * Fixed inability to select externally mounted drives.
-    * Fixed bug where speaker would be stuck next to a playlist.
-    * Fixed bug where first startup would show a loading spinner in the
-      Dashboard's "Recent Additions" forever.
-    * Automatically upgrade resolvers when an update is found.
-    * Fixed last played track of a friend never expiring.
-    * Fixed parsing of rdio tracks.
-    * Changed steering mechanism in stations to be user-friendlier.
-    * Fixed loading biographies of artist names with special characters.
-    * Fixed behaviour of dropping Spotify playlists on the sidebar.
-    * Fixed hard to read source-name in the audio control area on OS X.
-    * Fixed crashes when playing Grooveshark tracks.
-    * Fixed bug where clicking the latch button would flicker and unlatch.
-    * Fixed Jabber accounts not connecting properly when proxy is in use.
-
 Version 0.3.1:
     * Fixed not resolving to local files.
     * Fixed shutdown crash on Windows.
@@ -328,7 +26,7 @@ Version 0.3.0:
     * Added YouTube resolver.
     * Fixed bug where going offline then online would not re-connect to many
       peers.
-    * Added support for auto-updating live XSPF playlists.
+    * Added support for auto-updating live XSPF playlists. 
     * Don't show an age of 41 years for tracks that have no age information.
     * Show config UI for resolvers that have them as soon as you add them.
     * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize
@@ -344,7 +42,7 @@ Version 0.3.0:
     * Added new job status view in the bottom of the source list that displays
       current jobs such as resolving, parsing playlists, and loading from
       database.
-    * Parse and convert a Spotify playlist URL when dropped anywhere on the
+    * Parse and convert a Spotify playlist url when dropped anywhere on the
       sidebar.
     * Convert resolvers to use asynchronous calls to avoid blocking Tomahawk's
       UI, greatly increasing responsiveness of Tomahawk while resolving.

PACKAGING.md

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

README

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

README.md

@@ -1,144 +0,0 @@
-# WHAT TOMAHAWK IS
-
-Tomahawk is a free multi-source and cross-platform music player. An application that can play not only your local files, but also stream from services like Spotify, Beats, SoundCloud, Google Music, YouTube and many others. You can even connect with your friends' Tomahawks, share your musical gems or listen along with them. Let the music play!
-
-![Tomahawk Screenshot](/data/screenshots/tomahawk-screenshot.png?raw=true)
-
-## HOW TOMAHAWK WORKS
-
-Tomahawk is basically a **player for music metadata**. At its core it decouples the metadata about a song from the source and reassembles it for each user based on their individual music accessibility and rights. In short, given the name of a song and artist, Tomahawk will find the right source, for the right user at the right time.  This fundamentally different approach to music enables a range of new music consumption and sharing experiences previously not possible.
-
-## MUSIC SOURCES
-
-* Local music library (MP3, Ogg, FLAC and many other formats)
-* Networked music libraries (other connected computers)
-
-### Subscription Music Services
-
-* Spotify
-* Beats Music
-* Google Play Music (on-demand streaming and music locker)
-* 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/)
-* [libechonest 2.3.1](http://projects.kde.org/projects/playground/libs/libechonest/)
-* [Attica 5.6.0](http://ftp.kde.org/stable/attica/)
-* [QuaZip 0.4.3](http://quazip.sourceforge.net/)
-* [liblastfm 1.0.9](https://github.com/lastfm/liblastfm/)
-* [QtKeychain 0.1](https://github.com/frankosterfeld/qtkeychain/)
-* [Sparsehash](https://code.google.com/p/sparsehash/)
-* [GnuTLS](http://gnutls.org/)
-
-The following dependencies are optional (but *recommended*):
-
-* [Jreen 1.1.1](http://qutim.org/jreen/)
-* [Snorenotify 0.5.2](https://github.com/Snorenotify/Snorenotify/)
-
-Third party libraries that we ship with our source:
-
-* [MiniUPnP 1.6](http://miniupnp.free.fr/)
-* [Qocoa](https://github.com/mikemcquaid/Qocoa/)
-* [libqnetwm](https://code.google.com/p/libqnetwm/)
-* [libqxt](http://libqxt.org/) (QxtWeb module)
-* [SPMediaKeyTap](https://github.com/nevyn/SPMediaKeyTap/)
-* [kdSingleApplicationGuard](http://www.kdab.com/)
-
-## SUPPORT TOMAHAWK
-
-* [Bug / Issue Tracker](https://bugs.tomahawk-player.org/secure/Dashboard.jspa)
-* [Translations](https://www.transifex.com/projects/p/tomahawk/)
-* [Donations](https://flattr.com/thing/169312/Tomahawk)
-
-## GET HELP
-
-* [Support & Feedback](https://tomahawk.uservoice.com)
-* Chat with us in IRC: **#tomahawk** on Freenode, and [Scrollback.io](https://scrollback.io/tomahawk)
-* [Twitter](https://twitter.com/tomahawk)
-* [Facebook](https://facebook.com/tomahawkplayer)
-* [Developer API Documentation](http://dev.tomahawk-player.org/api/classes.html)
-
-## SCREENSHOTS
-
-BROWSE FRIENDS' MUSIC & LISTEN ALONG
-
-![Browse](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998050088_listen-along.jpg)
-
-INBOX - RECEIVED & FORWARDING
-
-![Inbox](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997751044_inbox.jpg)
-
-CHARTS - BILLBOARD'S TASTEMAKER ALBUMS
-
-![Charts](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410997901969_charts.jpg)
-
-FRIEND FEED
-
-![Feed](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410971283885_heroshot.png)
-
-DYNAMIC (AUTO-UPDATING) PLAYLIST
-
-![Xspf](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998362549_dynamic-playlist-1.jpg)
-
-PLUG-INS / RESOLVER SETTINGS
-
-![Settings](https://dchtm6r471mui.cloudfront.net/hackpad.com_ZRZMJDdxrVe_p.242147_1410998587408_prefs.jpg)
-
-##Enjoy!

TomahawkAddLibrary.cmake

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

TomahawkAddPlugin.cmake

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

TomahawkBuildTreeSettings.cmake.in

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

TomahawkCPack.cmake

@@ -2,12 +2,12 @@ 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
@@ -22,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

TomahawkConfig.cmake.in

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

TomahawkConfigVersion.cmake.in

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

TomahawkUse.cmake.in

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

admin/mac/Info.plist

@@ -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>
+	<string>10.5.0</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<true />
 	<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>

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,40 @@ function die {
 }
 ################################################################################
 
-if [ -z "$2" ]
+if [ -z $1 ]
 then
-    echo This script expects the version number and cert-signer as parameters, e.g. "1.0.0 John Doe"
+    echo This script expects the version number as a parameter, e.g. 1.0.0
     exit 1
 fi
 
 ROOT=`pwd`
 VERSION=$1
-CERT_SIGNER=$2
 
 ################################################################################
 
+    mv tomahawk.app Tomahawk.app
+    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
+
     header "Fixing and copying libraries"
-    $ROOT/../admin/mac/macdeploy.py "${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"
+    header "Copying Sparkle framework"
-    mkdir "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
+    cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    cp -R $ROOT/../data/fonts/*.ttf "${ROOT}/${TARGET_NAME}.app/Contents/Resources/Fonts"
+    
-
-    header "Signing bundle"
-    cd ..
-    if [ -f ~/sign_step.sh ];
-    then
-        ~/sign_step.sh "$CERT_SIGNER" "${TARGET_NAME}.app" || true
-    fi
-
     header "Creating DMG"
-    $ROOT/../admin/mac/create-dmg.sh "${TARGET_NAME}.app"
+    cd ..
-    mv "${TARGET_NAME}.dmg" "${TARGET_NAME}-$VERSION.dmg"
 
+    $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!"

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

admin/mac/macdeploy.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
-#  This file is part of Tomahawk.
+
-#  It was inspired in large part by the macdeploy script in Clementine.
+#  This file is part of Clementine.
 #
 #  Clementine is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,222 +18,198 @@
 import os
 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',
+  'access/libaccess_attachment_plugin.dylib',
-  #'libaccess_avio_plugin.dylib',
+  #'access/libaccess_avio_plugin.dylib',
-  #'libaccess_fake_plugin.dylib',
+  'access/libaccess_fake_plugin.dylib',
-  'libftp_plugin.dylib',
+  'access/libaccess_ftp_plugin.dylib',
-  'libhttp_plugin.dylib',
+  'access/libaccess_http_plugin.dylib',
-  'libhttplive_plugin.dylib',
+  'access/libaccess_imem_plugin.dylib',
-  'libimem_plugin.dylib',
+  'access/libaccess_mmap_plugin.dylib',
-  #'libaccess_mmap_plugin.dylib',
+  'access/libaccess_mms_plugin.dylib',
-  'libaccess_mms_plugin.dylib',
+  'access/libaccess_realrtsp_plugin.dylib',
-  'libaccess_realrtsp_plugin.dylib',
+  'access/libaccess_tcp_plugin.dylib',
-  'libtcp_plugin.dylib',
+  'access/libaccess_udp_plugin.dylib',
-  'libudp_plugin.dylib',
+  'access/libcdda_plugin.dylib',
-  'libcdda_plugin.dylib',
+  'access/libfilesystem_plugin.dylib',
-  'libfilesystem_plugin.dylib',
+  'access/libqtcapture_plugin.dylib',
-  'libqtcapture_plugin.dylib',
+  'access/librtp_plugin.dylib',
-  'librtp_plugin.dylib',
+  'access/libzip_plugin.dylib',
-  'libzip_plugin.dylib',
+  'access_output/libaccess_output_dummy_plugin.dylib',
-  'liba52tofloat32_plugin.dylib',
+  'access_output/libaccess_output_file_plugin.dylib',
-  'liba52tospdif_plugin.dylib',
+  'access_output/libaccess_output_http_plugin.dylib',
-  'libaudio_format_plugin.dylib',
+  'access_output/libaccess_output_shout_plugin.dylib',
-  'libaudiobargraph_a_plugin.dylib',
+  'access_output/libaccess_output_udp_plugin.dylib',
-  'libchorus_flanger_plugin.dylib',
+  'audio_filter/liba52tofloat32_plugin.dylib',
-  #'libconverter_fixed_plugin.dylib',
+  'audio_filter/liba52tospdif_plugin.dylib',
-  'libdolby_surround_decoder_plugin.dylib',
+  'audio_filter/libaudio_format_plugin.dylib',
-  'libdtstofloat32_plugin.dylib',
+  'audio_filter/libaudiobargraph_a_plugin.dylib',
-  'libdtstospdif_plugin.dylib',
+  'audio_filter/libchorus_flanger_plugin.dylib',
-  'libequalizer_plugin.dylib',
+  'audio_filter/libconverter_fixed_plugin.dylib',
-  'libheadphone_channel_mixer_plugin.dylib',
+  'audio_filter/libdolby_surround_decoder_plugin.dylib',
-  'libmono_plugin.dylib',
+  'audio_filter/libdtstofloat32_plugin.dylib',
-  'libmpgatofixed32_plugin.dylib',
+  'audio_filter/libdtstospdif_plugin.dylib',
-  'libnormvol_plugin.dylib',
+  'audio_filter/libequalizer_plugin.dylib',
-  'libparam_eq_plugin.dylib',
+  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
-  'libscaletempo_plugin.dylib',
+  'audio_filter/libmono_plugin.dylib',
-  'libsimple_channel_mixer_plugin.dylib',
+  'audio_filter/libmpgatofixed32_plugin.dylib',
-  'libspatializer_plugin.dylib',
+  'audio_filter/libnormvol_plugin.dylib',
-  'libtrivial_channel_mixer_plugin.dylib',
+  'audio_filter/libparam_eq_plugin.dylib',
-  'libugly_resampler_plugin.dylib',
+  'audio_filter/libscaletempo_plugin.dylib',
-  'libfloat_mixer_plugin.dylib',
+  'audio_filter/libsimple_channel_mixer_plugin.dylib',
-  #'libspdif_mixer_plugin.dylib',
+  'audio_filter/libspatializer_plugin.dylib',
-  #'libtrivial_mixer_plugin.dylib',
+  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
-  #'libaout_file_plugin.dylib',
+  'audio_filter/libugly_resampler_plugin.dylib',
-  'libauhal_plugin.dylib',
+  'audio_mixer/libfloat32_mixer_plugin.dylib',
-  'liba52_plugin.dylib',
+  'audio_mixer/libspdif_mixer_plugin.dylib',
-  'libadpcm_plugin.dylib',
+  'audio_mixer/libtrivial_mixer_plugin.dylib',
-  'libaes3_plugin.dylib',
+  'audio_output/libaout_file_plugin.dylib',
-  'libaraw_plugin.dylib',
+  'audio_output/libauhal_plugin.dylib',
-  'libavcodec_plugin.dylib',
+  'codec/liba52_plugin.dylib',
-  'libcc_plugin.dylib',
+  'codec/libadpcm_plugin.dylib',
-  'libcdg_plugin.dylib',
+  'codec/libaes3_plugin.dylib',
-  'libdts_plugin.dylib',
+  'codec/libaraw_plugin.dylib',
-  'libfaad_plugin.dylib',
+  'codec/libavcodec_plugin.dylib',
-  #'libfake_plugin.dylib',
+  'codec/libcc_plugin.dylib',
-  'libflac_plugin.dylib',
+  'codec/libcdg_plugin.dylib',
-  #'libfluidsynth_plugin.dylib',
+  'codec/libdts_plugin.dylib',
-  #'libinvmem_plugin.dylib',
+  'codec/libfaad_plugin.dylib',
-  'liblpcm_plugin.dylib',
+  'codec/libfake_plugin.dylib',
-  'libmpeg_audio_plugin.dylib',
+  'codec/libflac_plugin.dylib',
-  'libpng_plugin.dylib',
+  'codec/libfluidsynth_plugin.dylib',
-  'librawvideo_plugin.dylib',
+  'codec/libinvmem_plugin.dylib',
-  'libspeex_plugin.dylib',
+  'codec/liblpcm_plugin.dylib',
-  'libspudec_plugin.dylib',
+  'codec/libmpeg_audio_plugin.dylib',
-  'libtheora_plugin.dylib',
+  'codec/libpng_plugin.dylib',
-  'libtwolame_plugin.dylib',
+  'codec/librawvideo_plugin.dylib',
-  'libvorbis_plugin.dylib',
+  'codec/libspeex_plugin.dylib',
-  #'libgestures_plugin.dylib',
+  'codec/libspudec_plugin.dylib',
-  #'libhotkeys_plugin.dylib',
+  'codec/libtheora_plugin.dylib',
-  #'libmotion_plugin.dylib',
+  'codec/libtwolame_plugin.dylib',
-  #'libnetsync_plugin.dylib',
+  'codec/libvorbis_plugin.dylib',
-  #'libsignals_plugin.dylib',
+  'control/libgestures_plugin.dylib',
-  'libaiff_plugin.dylib',
+  'control/libhotkeys_plugin.dylib',
-  'libasf_plugin.dylib',
+  'control/libmotion_plugin.dylib',
-  'libau_plugin.dylib',
+  'control/libnetsync_plugin.dylib',
-  #'libavformat_plugin.dylib',
+  'control/libsignals_plugin.dylib',
-  'libavi_plugin.dylib',
+  'demux/libaiff_plugin.dylib',
-  'libdemux_cdg_plugin.dylib',
+  'demux/libasf_plugin.dylib',
-  'libdemuxdump_plugin.dylib',
+  'demux/libau_plugin.dylib',
-  'libdiracsys_plugin.dylib',
+  #'demux/libavformat_plugin.dylib',
-  'libes_plugin.dylib',
+  'demux/libavi_plugin.dylib',
-  'libflacsys_plugin.dylib',
+  'demux/libdemux_cdg_plugin.dylib',
-  'liblive555_plugin.dylib',
+  'demux/libdemuxdump_plugin.dylib',
-  'libmkv_plugin.dylib',
+  'demux/libdirac_plugin.dylib',
-  'libmod_plugin.dylib',
+  'demux/libes_plugin.dylib',
-  'libmp4_plugin.dylib',
+  'demux/libflacsys_plugin.dylib',
-  'libmpc_plugin.dylib',
+  'demux/liblive555_plugin.dylib',
-  'libmpgv_plugin.dylib',
+  'demux/libmkv_plugin.dylib',
-  'libnsc_plugin.dylib',
+  'demux/libmod_plugin.dylib',
-  'libnsv_plugin.dylib',
+  'demux/libmp4_plugin.dylib',
-  'libnuv_plugin.dylib',
+  'demux/libmpc_plugin.dylib',
-  'libogg_plugin.dylib',
+  'demux/libmpgv_plugin.dylib',
-  'libplaylist_plugin.dylib',
+  'demux/libnsc_plugin.dylib',
-  'libps_plugin.dylib',
+  'demux/libnsv_plugin.dylib',
-  'libpva_plugin.dylib',
+  'demux/libnuv_plugin.dylib',
-  'librawaud_plugin.dylib',
+  'demux/libogg_plugin.dylib',
-  'librawdv_plugin.dylib',
+  'demux/libplaylist_plugin.dylib',
-  'librawvid_plugin.dylib',
+  'demux/libps_plugin.dylib',
-  'libreal_plugin.dylib',
+  'demux/libpva_plugin.dylib',
-  'libsmf_plugin.dylib',
+  'demux/librawaud_plugin.dylib',
-  'libts_plugin.dylib',
+  'demux/librawdv_plugin.dylib',
-  'libtta_plugin.dylib',
+  'demux/librawvid_plugin.dylib',
-  'libty_plugin.dylib',
+  'demux/libreal_plugin.dylib',
-  'libvc1_plugin.dylib',
+  'demux/libsmf_plugin.dylib',
-  'libvoc_plugin.dylib',
+  'demux/libts_plugin.dylib',
-  'libwav_plugin.dylib',
+  'demux/libtta_plugin.dylib',
-  'libxa_plugin.dylib',
+  'demux/libty_plugin.dylib',
-  'libfolder_plugin.dylib',
+  'demux/libvc1_plugin.dylib',
-  'libtaglib_plugin.dylib',
+  'demux/libvoc_plugin.dylib',
-  #'libaudioscrobbler_plugin.dylib',
+  'demux/libwav_plugin.dylib',
-  'libdummy_plugin.dylib',
+  'demux/libxa_plugin.dylib',
-  'libexport_plugin.dylib',
+  'meta_engine/libfolder_plugin.dylib',
-  #'libfreetype_plugin.dylib',
+  'meta_engine/libtaglib_plugin.dylib',
-  #'libgnutls_plugin.dylib',
+  'misc/libaudioscrobbler_plugin.dylib',
-  'liblogger_plugin.dylib',
+  'misc/libdummy_plugin.dylib',
-  'liblua_plugin.dylib',
+  'misc/libexport_plugin.dylib',
-  #'libosd_parser_plugin.dylib',
+  'misc/libfreetype_plugin.dylib',
-  #'libquartztext_plugin.dylib',
+  'misc/libgnutls_plugin.dylib',
-  #'libstats_plugin.dylib',
+  'misc/liblogger_plugin.dylib',
-  'libvod_rtsp_plugin.dylib',
+  'misc/liblua_plugin.dylib',
-  'libxml_plugin.dylib',
+  'misc/libosd_parser_plugin.dylib',
-  #'libxtag_plugin.dylib',
+  'misc/libquartztext_plugin.dylib',
-  'libi420_rgb_mmx_plugin.dylib',
+  'misc/libstats_plugin.dylib',
-  'libi420_yuy2_mmx_plugin.dylib',
+  'misc/libvod_rtsp_plugin.dylib',
-  'libi422_yuy2_mmx_plugin.dylib',
+  'misc/libxml_plugin.dylib',
-  #'libmemcpymmx_plugin.dylib',
+  'misc/libxtag_plugin.dylib',
-  #'libmemcpymmxext_plugin.dylib',
+  'mmx/libi420_rgb_mmx_plugin.dylib',
-  'libmux_asf_plugin.dylib',
+  'mmx/libi420_yuy2_mmx_plugin.dylib',
-  'libmux_avi_plugin.dylib',
+  'mmx/libi422_yuy2_mmx_plugin.dylib',
-  'libmux_dummy_plugin.dylib',
+  'mmx/libmemcpymmx_plugin.dylib',
-  'libmux_mp4_plugin.dylib',
+  'mmxext/libmemcpymmxext_plugin.dylib',
-  'libmux_mpjpeg_plugin.dylib',
+  'mux/libmux_asf_plugin.dylib',
-  'libmux_ogg_plugin.dylib',
+  'mux/libmux_avi_plugin.dylib',
-  'libmux_ps_plugin.dylib',
+  'mux/libmux_dummy_plugin.dylib',
-  'libmux_ts_plugin.dylib',
+  'mux/libmux_mp4_plugin.dylib',
-  'libmux_wav_plugin.dylib',
+  'mux/libmux_mpjpeg_plugin.dylib',
-  'libpacketizer_copy_plugin.dylib',
+  'mux/libmux_ogg_plugin.dylib',
-  'libpacketizer_dirac_plugin.dylib',
+  'mux/libmux_ps_plugin.dylib',
-  'libpacketizer_flac_plugin.dylib',
+  'mux/libmux_ts_plugin.dylib',
-  'libpacketizer_h264_plugin.dylib',
+  'mux/libmux_wav_plugin.dylib',
-  'libpacketizer_mlp_plugin.dylib',
+  'packetizer/libpacketizer_copy_plugin.dylib',
-  'libpacketizer_mpeg4audio_plugin.dylib',
+  'packetizer/libpacketizer_dirac_plugin.dylib',
-  'libpacketizer_mpeg4video_plugin.dylib',
+  'packetizer/libpacketizer_flac_plugin.dylib',
-  'libpacketizer_mpegvideo_plugin.dylib',
+  'packetizer/libpacketizer_h264_plugin.dylib',
-  'libpacketizer_vc1_plugin.dylib',
+  'packetizer/libpacketizer_mlp_plugin.dylib',
-  'libi420_rgb_sse2_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
-  'libi420_yuy2_sse2_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
-  'libi422_yuy2_sse2_plugin.dylib',
+  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
-  'libdecomp_plugin.dylib',
+  'packetizer/libpacketizer_vc1_plugin.dylib',
-  #'libstream_filter_rar_plugin.dylib',
+  'sse2/libi420_rgb_sse2_plugin.dylib',
-  'librecord_plugin.dylib',
+  'sse2/libi420_yuy2_sse2_plugin.dylib',
-  #'libvisual_plugin.dylib',
+  'sse2/libi422_yuy2_sse2_plugin.dylib',
-  'libsecuretransport_plugin.dylib'
+  'stream_filter/libdecomp_plugin.dylib',
+  'stream_filter/libstream_filter_rar_plugin.dylib',
+  'stream_filter/libstream_filter_record_plugin.dylib',
+  'visualization/libvisual_plugin.dylib',
 ]
 
 VLC_SEARCH_PATH=[
-    '/usr/local/opt/vlc/lib/vlc/plugins/',
+    '/usr/local/lib/vlc/plugins/',
 ]
 
 QT_PLUGINS = [
-#    'crypto/libqca-ossl.dylib',
+    'crypto/libqca-ossl.dylib',
-    'platforms/libqcocoa.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,
+  'libtomahawk_sipjabber.dylib',
-  'lib%s_account_google.so' % TARGET_NAME,
+  'libtomahawk_sipgoogle.dylib',
-  'lib%s_account_zeroconf.so' % TARGET_NAME,
+  'libtomahawk_siptwitter.dylib',
-  'lib%s_account_hatchet.so' % TARGET_NAME,
+  'libtomahawk_sipzeroconf.dylib',
-  'lib%s_infoplugin_adium.so' % TARGET_NAME,
+  'libtomahawk_qtweetlib.dylib',
-  '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,
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/qt5/plugins',
+    '/usr/local/Cellar/qt/4.7.4/plugins',
 ]
 
-SNORE_PLUGINS_SEARCH_PATH=[
-    '/usr/local/opt/snorenotify/lib/plugins/libsnore-qt5',
-]
 
 class Error(Exception):
   pass
@@ -246,17 +222,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,25 +235,22 @@ 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')
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
 
 fixed_libraries = []
@@ -309,7 +276,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 +300,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 +359,13 @@ 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))
+  plugindir = abs_path.split('/')[-2]
+  new_path = os.path.join(plugins_dir, subdir, plugindir, 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 +418,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 +428,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 +480,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 +491,20 @@ def FindVLCPlugin(name):
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin))
+  FixVLCPlugin(FindVLCPlugin(plugin), '.')
 
 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('spotify_tomahawkresolver', '../MacOS')
 except:
-  print 'Failed to find %s_crash_reporter' % TARGET_NAME
+  print 'Failed to find spotify resolver'
+  
+try:
+  FixPlugin('CrashReporter', '../MacOS')
+except:
+  print 'Failed to find CrashReporter'
 
 for plugin in QT_PLUGINS:
   FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))

admin/mac/qt.conf

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

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`

admin/unix/tomahawk.desktop

@@ -3,19 +3,9 @@ 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
+Exec=tomahawk
-Comment=Tomahawk — Multi Source Music Player
+Comment=Tomahawk - Social 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
 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;

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -3,13 +3,10 @@ SET(MINGW_PREFIX  "i686-w64-mingw32")
 # this one is important
 SET(CMAKE_SYSTEM_NAME Windows)
 
-
 # specify the cross compiler
-SET(CMAKE_C_COMPILER ${MINGW_PREFIX}-gcc)
+SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
-SET(CMAKE_CXX_COMPILER ${MINGW_PREFIX}-g++)
+SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
-SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres CACHE FILEPATH "windres")
+SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
-SET(CMAKE_AR /usr/bin/${MINGW_PREFIX}-ar CACHE FILEPATH "ar")
-
 
 # where is the target environment containing libraries
 SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -18,21 +15,13 @@ 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
+# libs with broken find modules
-SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
+SET(TAGLIB_FOUND true)
-SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
+SET(TAGLIB_LIBRARIES  ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
-SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
+SET(TAGLIB_INCLUDES   ${CMAKE_FIND_ROOT_PATH}/include/taglib)
-SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)
 
-SET(QT_QMAKE_EXECUTABLE     /usr/bin/${MINGW_PREFIX}-qmake CACHE FILEPATH "qmake" )
+SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
-SET(QT_MOC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-moc CACHE FILEPATH "moc")
+SET(QT_QTUITOOLS_LIBRARY_RELEASE  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
-SET(QT_RCC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-rcc CACHE FILEPATH "rcc")
+SET(QT_QTUITOOLS_LIBRARY_DEBUG  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)
-SET(QT_UIC_EXECUTABLE       /usr/bin/${MINGW_PREFIX}-uic CACHE FILEPATH "uic")
+SET(QT_QTUITOOLS_LIBRARY  ${QT_QTUITOOLS_LIBRARY_RELEASE})
-SET(QT_LRELEASE_EXECUTABLE  /usr/bin/${MINGW_PREFIX}-lrelease CACHE FILEPATH "lrelease")
-
-# phonon -_-
-SET(Automoc4_DIR	    "/usr/lib64/automoc4/")

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

admin/win/update-vlc.sh

@@ -1,84 +1,49 @@
 #!/bin/bash
+echo "Remove old vlc dir..."
 
-if [ "$1" = "-c" ] ; then
+mkdir -p vlc/
-echo "Continuing last download.."
+cd vlc/
-rm -rvf vlc/
-else
-echo "Update archive..."
-fi
 
-rm -rvf vlc/
+#rm -vf vlc-*.7z
+#rm -rf vlc/
 
-
+echo "Download specified binary..."
-echo "Download phonon archive..."
+#wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
-# wget -c "http://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://download.tomahawk-player.org/tomahawk-vlc-0.1.zip"
+wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
-# wget -c http://people.videolan.org/~jb/phonon/phonon-vlc-last.7z
-# wget -c http://people.videolan.org/~jb/phonon/phonon_phonon-vlc_20111128.7z
-wget -c http://download.tomahawk-player.org/test/vlc.tar.bz2
 
 echo "Extract binary..."
-# 7z x phonon*.7z
+7z x phonon-vlc-last.7z
-# mv -v vlc-*/ vlc/
+#mv -v vlc-*/ vlc/
-# unzip tomahawk-vlc-0.1.zip
+#unzip tomahawk-vlc-0.1.zip
-tar xvjf vlc.tar.bz2
 
-# echo "Download phonon_vlc_no_video.dll..."
+echo "Strip unneeded plugins from vlc/plugins..."
-# wget -c http://people.videolan.org/~jb/phonon/phonon_vlc_no_video.dll
+cd prefix/bin/plugins
-# cp -v phonon_vlc_no_video.dll prefix/bin/phonon_backend/phonon_vlc.dll
+rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
-
+    libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
-# echo "Strip unneeded plugins from vlc/plugins..."
+    *qt4* *skins2* libaccess_bd_plugin.dll \
-# cd prefix/bin/plugins
+    libaudiobargraph_* libball_plugin.dll \
-# rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
+    libdirac_plugin.dll \
-#     libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
+    libgnutls_plugin.dll \
-#     *qt4* *skins2* libaccess_bd_plugin.dll \
+    libcaca_plugin.dll \
-#     libaudiobargraph_* libball_plugin.dll \
+    libfreetype_plugin.dll \
-#     libdirac_plugin.dll \
+    libaccess_output_shout_plugin.dll \
-#     libgnutls_plugin.dll \
+    libremoteosd_plugin.dll \
-#     libcaca_plugin.dll \
+    libsdl_image_plugin.dll \
-#     libfreetype_plugin.dll \
+    libvout_sdl_plugin.dll \
-#     libaccess_output_shout_plugin.dll \
+    libpng_plugin.dll \
-#     libremoteosd_plugin.dll \
+    libgoom_plugin.dll \
-#     libsdl_image_plugin.dll \
+    libatmo_plugin.dll \
-#     libvout_sdl_plugin.dll \
+    libmux_ts_plugin.dll \
-#     libpng_plugin.dll \
+    libkate_plugin.dll \
-#     libgoom_plugin.dll \
+    libtaglib_plugin.dll
-#     libatmo_plugin.dll \
-#     libmux_ts_plugin.dll \
-#     libkate_plugin.dll \
-#     libtaglib_plugin.dll
 
 
-# this is for vlc-2.x
+# this is for vlc-1.2
-cd vlc/plugins
+# rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
-rm -rvf \
+#      */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub* \
-    video_*/ \
+#      services_discover/ visualization/ control/ misc/
-    gui/ \
-    **/libold* \
-    **/libvcd* \
-    **/libdvd* \
-    **/liblibass* \
-    **/libx264* \
-    **/libschroe* \
-    **/liblibmpeg2* \
-    **/libstream_out_* \
-    **/libmjpeg_plugin* \
-    **/libh264_plugin* \
-    **/libzvbi_plugin* \
-    **/lib*sub* \
-    services_discovery/ \
-    visualization/ \
-    control/ \
-    **/libi420* \
-    **/libi422* \
-    mux/ \
-    stream_filter/ \
-    **/libtheora_plugin* \
-    **/liblibbluray_plugin* \
-    **/libdtv_plugin* \
-    **/*.dll.a \
-    **/*.la \
-    misc/liblogger_plugin*
 
 
 echo "Downloaded and stripped VLC"
+

data/fonts/OFL.txt

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

data/icons/tomahawk-icon.svg

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

data/images/account-none.svg

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

data/images/account-offline.svg

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

data/images/account-online.svg

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

data/images/add-contact.svg

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

data/images/add.svg

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

data/images/advanced-settings.svg

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

data/images/album-icon.svg

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

data/images/album-placeholder-grid.svg

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

data/images/apply-check.svg

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