Edited ChangeLog via GitHub

(cherry picked from commit 498d7052de)

.gitignore

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

.gitmodules

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

.tx/config

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

AUTHORS

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

CMakeLists.txt

@@ -1,17 +1,10 @@
 PROJECT( tomahawk )
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8.6 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
-CMAKE_POLICY(SET CMP0017 NEW)
 
-IF ( CMAKE_VERSION VERSION_EQUAL 2.8.12 OR CMAKE_VERSION VERSION_GREATER 2.8.12 )
-CMAKE_POLICY(SET CMP0022 NEW)
-
-# TODO:
-# Update to NEW and fix things up when we can depend on 2.8.12
-CMAKE_POLICY(SET CMP0023 OLD)
-ENDIF()
-
-INCLUDE(CMakeDependentOption)
+IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+  CMAKE_POLICY(SET CMP0017 NEW)
+ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
 
 ###
 ### Tomahawk application info
@@ -21,65 +14,30 @@ SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
 SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
-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 7 )
-SET( TOMAHAWK_VERSION_PATCH 100 )
+SET( TOMAHAWK_VERSION_MINOR 2 )
+SET( TOMAHAWK_VERSION_PATCH 2 )
+
 #SET( TOMAHAWK_VERSION_RC 0 )
 
-SET( TOMAHAWK_TRANSLATION_LANGUAGES ar bg bn_IN ca cs de en el es fi fr hi_IN hu gl it ja lt pl pt_BR ro ru sv tr zh_CN zh_TW )
-
-# enforce proper symbol exporting on all platforms
-add_definitions( "-fvisibility=hidden" )
-# enforce using constBegin, constEnd for const-iterators
-add_definitions( "-DQT_STRICT_ITERATORS" )
 
 # build options
 option(BUILD_GUI "Build Tomahawk with GUI" ON)
 option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
-option(BUILD_TESTS "Build Tomahawk with unit tests" ON)
-option(BUILD_HATCHET "Build the Hatchet plugin" OFF)
-option(BUILD_WITH_QT4 "Build Tomahawk with Qt4 no matter if Qt5 was found" ON)
-
-option(WITH_CRASHREPORTER "Build with CrashReporter" ON)
-option(WITH_BINARY_ATTICA "Enable support for downloading binary resolvers automatically" ON)
-option(LEGACY_KDE_INTEGRATION "Install tomahawk.protocol file, deprecated since 4.6.0" OFF)
-option(WITH_KDE4 "Build with support for KDE specific stuff" ON)
-
-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 ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
-SET( TOMAHAWK_VERSION_SHORT "${TOMAHAWK_VERSION}" )
 IF( 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 ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
     ENDIF()
 
@@ -90,259 +48,122 @@ IF( NOT BUILD_RELEASE AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git/" )
 ENDIF()
 
 
+
 # set paths
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
 SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
-# make predefined install dirs available everywhere
-INCLUDE( GNUInstallDirs )
-
 # installer creation
 INCLUDE( TomahawkCPack.cmake )
 
-# deps
+#deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-# headless mode
-if( NOT BUILD_GUI )
-    add_definitions( -DENABLE_HEADLESS )
-    message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
-else()
-    message( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
+# Check if we need qtgui:
+SET(NEEDED_QT4_COMPONENTS QtCore QtXml QtNetwork )
+IF( NOT BUILD_GUI )
+    ADD_DEFINITIONS( -DENABLE_HEADLESS )
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} in HEADLESS mode ***" )
+ELSE()
+    MESSAGE( STATUS "Building Tomahawk ${TOMAHAWK_VERSION} full GUI version ***" )
+    LIST(APPEND NEEDED_QT4_COMPONENTS "QtGui" "QtWebkit" )
+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()
 
-if( NOT BUILD_WITH_QT4 )
-    find_package(Qt5Core QUIET)
-    if( Qt5Core_DIR )
-        find_package(Qt5Widgets QUIET)
-        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(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()
-
-        macro(qt_add_dbus_interface)
-            qt5_add_dbus_interface(${ARGN})
-        endmacro()
-
-        macro(qt_add_dbus_adaptor)
-            qt5_add_dbus_adaptor(${ARGN})
-        endmacro()
-
-        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.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n     qtwebkit-devel package and whatever contains QtUiTools is installed too")
-
-    macro(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()
-endif()
-
-if( Qt5Core_DIR )
-    set( TOMAHAWK_QT5 TRUE )
-else( Qt5Core_DIR )
-    set( TOMAHAWK_QT5 FALSE )
-endif( Qt5Core_DIR )
-
-if( BUILD_GUI AND UNIX AND NOT APPLE )
-    find_package( X11 )
-endif()
-
-macro_optional_find_package(Echonest 2.2.0)
-macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem")
+macro_optional_find_package(LibEchonest 1.1.7)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.8 is needed for dynamic playlists and the infosystem")
 
 macro_optional_find_package(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
 
-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(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 )
 
-find_package(Boost REQUIRED)
-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(Boost)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
 
-macro_optional_find_package(QCA2)
-macro_log_feature(QCA2_FOUND "QCA2" "Provides encryption and signing functions 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" "https://projects.kde.org/projects/kdesupport/attica" TRUE "" "")
 
-macro_optional_find_package(QuaZip)
-macro_log_feature(QuaZip_FOUND "QuaZip" "Provides support for extracting downloaded resolvers automatically." "http://quazip.sourceforge.net/" TRUE "" "")
+# required
+#While we distribute our own liblastfm2, don't need to look for it
+#macro_optional_find_package(LibLastFm 0.3.3)
+#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+set(LIBLASTFM_FOUND true)
 
-macro_optional_find_package(Jreen 1.0.5)
-macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP Library" "http://qutim.org/jreen / https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin.\n")
-if( PC_JREEN_VERSION STREQUAL "1.1.0" )
-    message(FATAL_ERROR "Jreen 1.1.0 has a very annoying bug that breaks accepting auth requests in Tomahawk. Please upgrade to 1.1.1 or downgrade to 1.0.5.")
-endif()
 
-macro_optional_find_package(LibLastFm 1.0.0)
-macro_log_feature(LIBLASTFM_FOUND "liblastfm" "Qt library for the Last.fm webservices" "https://github.com/lastfm/liblastfm" TRUE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+# this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_JREEN )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/jreen )
+    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
+    SET( LIBJREEN_LIBRARY jreen )
+    SET( LIBJREEN_LIBRARIES ${LIBJREEN_LIBRARY} )
+    SET( LIBJREEN_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
+ELSE( INTERNAL_JREEN )
+    macro_optional_find_package(Jreen)
+ENDIF( INTERNAL_JREEN )
+macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "https://github.com/euroelessar/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")
 
-if( NOT APPLE )
-if( TOMAHAWK_QT5 )
-    macro_optional_find_package(Qt5Keychain 0.1.0)
-else()
-    macro_optional_find_package(QtKeychain 0.1.0)
-endif()
-macro_log_feature(QTKEYCHAIN_FOUND "QtKeychain" "Provides support for secure credentials storage" "https://github.com/frankosterfeld/qtkeychain" TRUE "" "")
-endif()
+# this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_QTWEETLIB )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/qtweetlib )
+    # copy headers to build/QTweetLib so we can use proper includes inside the code
+    FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
+    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_BINARY_DIR} )
+    SET( QTWEETLIB_LIBRARY  tomahawk_qtweetlib )
+    SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
+    SET( QTWEETLIB_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libQTweetLib: ${QTWEETLIB_INCLUDE_DIR}, ${QTWEETLIB_LIBRARY}")
+ELSE( INTERNAL_QTWEETLIB )
+    macro_optional_find_package(QTweetLib)
+ENDIF( INTERNAL_QTWEETLIB )
+macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin. \n\n     Use -DINTERNAL_QTWEETLIB=ON to build the git submodule inside Tomahawk \n")
 
-if( 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()
+### libportfwd
+SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
+SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
+SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
+ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
 # we need pthreads too
 macro_optional_find_package(Threads)
 macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
 
-### 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 )
+macro_optional_find_package(KDE4)
+macro_optional_find_package(KDE4Installed)
 
-#TODO: support external qxt
-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})
+# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
+# for future kde integration
 
-### 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( FALSE )
-#     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-#         EXECUTE_PROCESS(COMMAND git submodule init WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-#         EXECUTE_PROCESS(COMMAND git submodule update WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-#     ENDIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-# ENDIF()
-
-#### submodules end
-
-
-if (WITH_KDE4)
-    macro_optional_find_package(KDE4)
-    macro_optional_find_package(KDE4Installed)
-endif(WITH_KDE4)
-macro_log_feature(KDE4_FOUND "KDE4" "Provides support for configuring Telepathy Accounts from inside Tomahawk" "https://www.kde.org" FALSE "" "")
-
-if(NOT Phonon_FOUND)
-  macro_optional_find_package(Phonon 4.5.0)
-endif()
-macro_log_feature(Phonon_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
-
-if(Phonon_FOUND)
-    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
-endif()
-
-IF( KDE4_FOUND OR Phonon_FOUND )
-    IF( CMAKE_C_FLAGS )
-        # KDE4 adds and removes some compiler flags that we don't like
-        # (only for gcc not for clang e.g.)
-        STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
-        SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
-    ENDIF()
+# macro_optional_find_package(KDE4)
+IF(KDE4_FOUND)
+    #KDE4 adds and removes some compiler flags that we don't like
+    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
 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()
 
@@ -354,64 +175,18 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-# KDE4 defines an uninstall target for us automatically (and at least with Qt4 Phonon does as well no matter if kdelibs was found)
-# IF( NOT KDE4_FOUND )
-#     ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-# ENDIF()
+# KDE4 defines an uninstall target for us automatically
+IF( NOT KDE4_FOUND )
+    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ENDIF()
 
 IF( NOT APPLE )
     # 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" )
 ENDIF( NOT APPLE )
 
-# Early configure these files as we need them later on
-configure_file(TomahawkUse.cmake.in "${PROJECT_BINARY_DIR}/TomahawkUse.cmake" @ONLY)
-file(COPY TomahawkAddPlugin.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-file(COPY TomahawkAddLibrary.cmake DESTINATION "${PROJECT_BINARY_DIR}")
-
-SET( TOMAHAWK_LIBRARIES tomahawklib )
-SET( TOMAHAWK_WIDGETS_LIBRARIES tomahawk-widgets )
-SET( TOMAHAWK_PLAYDARAPI_LIBRARIES tomahawk-playdarapi )
-
 ADD_SUBDIRECTORY( thirdparty )
+ADD_SUBDIRECTORY( src/libtomahawk )
+SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )
-
-# Add all targets to the build-tree export set
-set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH  "Installation directory for CMake files")
-set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
-export(TARGETS tomahawklib
-  FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
-
-# Export the package for use from the build-tree
-# (this registers the build-tree with a global CMake-registry)
-export(PACKAGE Tomahawk)
-
-# Create a TomahawkBuildTreeSettings.cmake file for the use from the build tree
-configure_file(TomahawkBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/TomahawkBuildTreeSettings.cmake" @ONLY)
-
-# Create the TomahawkConfig.cmake and TomahawkConfigVersion files
-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${CMAKE_INSTALL_FULL_CMAKEDIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
-
-configure_file(TomahawkConfig.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake" @ONLY)
-configure_file(TomahawkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake" @ONLY)
-
-# Install the cmake files
-install(
-    FILES
-        "${PROJECT_BINARY_DIR}/TomahawkConfig.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkConfigVersion.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkUse.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkAddPlugin.cmake"
-        "${PROJECT_BINARY_DIR}/TomahawkAddLibrary.cmake"
-    DESTINATION
-        "${CMAKE_INSTALL_CMAKEDIR}"
-)
-
-# Install the export set for use with the install-tree
-install(
-    EXPORT
-        TomahawkLibraryDepends
-    DESTINATION
-        "${CMAKE_INSTALL_CMAKEDIR}"
-)

CMakeModules/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

@@ -2,7 +2,6 @@
 # This module looks for clucene (http://clucene.sf.net) support
 # It will define the following values
 #
-# CLUCENE_INCLUDE_DIRS = CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR
 # CLUCENE_INCLUDE_DIR  = where CLucene/StdHeader.h can be found
 # CLUCENE_LIBRARY_DIR  = where CLucene/clucene-config.h can be found
 # CLUCENE_LIBRARIES    = the libraries to link against CLucene
@@ -13,16 +12,7 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)
 
-# try to locate a patched unstable version (for comp's sake *sigh*) first
-FIND_PACKAGE(CLuceneUnstable QUIET)
-IF(CLUCENEUNSTABLE_FOUND)
-    SET(CLucene_FOUND TRUE)
-    SET(CLUCENE_INCLUDE_DIR ${CLUCENE_UNSTABLE_INCLUDE_DIRS})
-    SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_INCLUDE_DIR})
-    SET(CLUCENE_LIBRARIES ${CLUCENE_UNSTABLE_LIBS})
 
-    #MESSAGE(FATAL_ERROR NARF)
-ELSE(CLUCENEUNSTABLE_FOUND)
 IF(CLucene_FIND_VERSION)
   SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
 ELSEIF()
@@ -41,7 +31,6 @@ SET(TRIAL_LIBRARY_PATHS
   /sw/lib${LIB_SUFFIX}
   /usr/pkg/lib${LIB_SUFFIX}
   /usr/lib64
-  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   )
 SET(TRIAL_INCLUDE_PATHS
   $ENV{CLUCENE_HOME}/include
@@ -109,11 +98,8 @@ ENDIF (CLUCENE_LIBRARY_DIR)
 
 IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
   SET(CLucene_FOUND TRUE)
-  SET(CLUCENE_INCLUDE_DIRS ${CLUCENE_LIBRARY_DIR} ${CLUCENE_INCLUDE_DIR})
 ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARIES AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION)
 
-ENDIF(CLUCENEUNSTABLE_FOUND)
-
 IF(CLucene_FOUND)
   IF(NOT CLucene_FIND_QUIETLY)
     MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARIES} version ${CLUCENE_VERSION}")
@@ -125,8 +111,7 @@ ELSE(CLucene_FOUND)
 ENDIF(CLucene_FOUND)
 
 MARK_AS_ADVANCED(
-  CLUCENE_INCLUDE_DIRS
-  CLUCENE_INCLUDE_DIR
-  CLUCENE_LIBRARY_DIR
+  CLUCENE_INCLUDE_DIR 
+  CLUCENE_LIBRARY_DIR 
   CLUCENE_LIBRARIES
   )

CMakeModules/FindCLuceneUnstable.cmake

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

CMakeModules/FindEchonest.cmake

@@ -1,36 +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)
-PKG_CHECK_MODULES(PC_ECHONEST QUIET libechonest)
-
-FIND_PATH(ECHONEST_INCLUDE_DIR NAMES echonest/Track.h
-    HINTS
-        ${PC_ECHONEST_INCLUDEDIR}
-        ${PC_ECHONEST_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(ECHONEST_LIBRARIES NAMES echonest
-    HINTS
-        ${PC_ECHONEST_LIBDIR}
-        ${PC_ECHONEST_LIBRARY_DIRS}
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
-)
-
-IF(ECHONEST_LIBRARIES AND ECHONEST_INCLUDE_DIR AND NOT PC_ECHONEST_VERSION)
-    MESSAGE(WARNING "You don't have pkg-config and so the libechonest version check does not work!")
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Echonest
-                                  REQUIRED_VARS ECHONEST_LIBRARIES ECHONEST_INCLUDE_DIR
-                                  VERSION_VAR PC_ECHONEST_VERSION)
-
-MARK_AS_ADVANCED(ECHONEST_INCLUDE_DIR ECHONEST_LIBRARIES)

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,31 +5,40 @@
 # LIBJREEN_LIBRARY, the path to libjreen
 # LIBJREEN_FOUND, whether libjreen was found
 
-FIND_PACKAGE(PkgConfig QUIET)
-PKG_CHECK_MODULES(PC_JREEN QUIET libjreen)
 
-FIND_PATH(JREEN_INCLUDE_DIR NAMES jreen/jreen.h
-    HINTS
-        ${PC_JREEN_INCLUDEDIR}
-        ${PC_JREEN_INCLUDE_DIRS}
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
+find_path(LIBJREEN_INCLUDE_DIR NAMES jreen/jreen.h
+   HINTS
+   ~/usr/include
+   /opt/local/include
+   /usr/include
+   /usr/local/include
+   /opt/kde4/include
+   ${CMAKE_INSTALL_PREFIX}/include
+   ${KDE4_INCLUDE_DIR}
 )
 
-FIND_LIBRARY(JREEN_LIBRARIES NAMES jreen
-    HINTS
-        ${PC_JREEN_LIBDIR}
-        ${PC_JREEN_LIBRARY_DIRS}
-        ${CMAKE_INSTALL_LIBDIR}
-        ${KDE4_LIB_DIR}
+find_library( LIBJREEN_LIBRARY NAMES jreen
+    PATHS
+    ~/usr/lib
+   /opt/local/lib
+   /usr/lib
+   /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)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Jreen
-                                  REQUIRED_VARS JREEN_LIBRARIES JREEN_INCLUDE_DIR)
+if(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
+   set(LIBJREEN_FOUND TRUE)
+   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/FindLibAttica.cmake

@@ -1,63 +0,0 @@
-# Try to find the Attica library
-# Once done this will define
-#
-#   LIBATTICA_FOUND          Indicates that Attica was found
-#   LIBATTICA_LIBRARIES      Libraries needed to use Attica
-#   LIBATTICA_LIBRARY_DIRS   Paths needed for linking against Attica
-#   LIBATTICA_INCLUDE_DIR    Path needed for finding Attica include files
-#
-# The minimum required version of LibAttica can be specified using the
-# standard syntax, e.g. find_package(LibAttica 0.20)
-
-# Copyright (c) 2009 Frederik Gladhorn <gladhorn@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-
-# Support LIBATTICA_MIN_VERSION for compatibility:
-IF(NOT LibAttica_FIND_VERSION)
-  SET(LibAttica_FIND_VERSION "${LIBATTICA_MIN_VERSION}")
-ENDIF(NOT LibAttica_FIND_VERSION)
-
-# the minimum version of LibAttica we require
-IF(NOT LibAttica_FIND_VERSION)
-  SET(LibAttica_FIND_VERSION "0.1.0")
-ENDIF(NOT LibAttica_FIND_VERSION)
-
-
-IF (NOT WIN32)
-   # use pkg-config to get the directories and then use these values
-   # in the FIND_PATH() and FIND_LIBRARY() calls
-   FIND_PACKAGE(PkgConfig)
-   PKG_CHECK_MODULES(PC_LIBATTICA QUIET libattica)
-   SET(LIBATTICA_DEFINITIONS ${PC_ATTICA_CFLAGS_OTHER})
-ENDIF (NOT WIN32)
-
-FIND_PATH(LIBATTICA_INCLUDE_DIR attica/provider.h
-   HINTS
-   ${PC_LIBATTICA_INCLUDEDIR}
-   ${PC_LIBATTICA_INCLUDE_DIRS}
-   PATH_SUFFIXES attica
-   )
-
-# Store the version number in the cache, so we don't have to search everytime:
-IF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
-  FILE(READ ${LIBATTICA_INCLUDE_DIR}/attica/version.h LIBATTICA_VERSION_CONTENT)
-  STRING (REGEX MATCH "LIBATTICA_VERSION_STRING \".*\"\n" LIBATTICA_VERSION_MATCH "${LIBATTICA_VERSION_CONTENT}")
-  IF(LIBATTICA_VERSION_MATCH)
-    STRING(REGEX REPLACE "LIBATTICA_VERSION_STRING \"(.*)\"\n" "\\1" _LIBATTICA_VERSION ${LIBATTICA_VERSION_MATCH})
-  ENDIF(LIBATTICA_VERSION_MATCH)
-  SET(LIBATTICA_VERSION "${_LIBATTICA_VERSION}" CACHE STRING "Version number of LibAttica" FORCE)
-ENDIF(LIBATTICA_INCLUDE_DIR  AND NOT  LIBATTICA_VERSION)
-
-
-FIND_LIBRARY(LIBATTICA_LIBRARIES NAMES attica libattica
-   HINTS
-   ${PC_LIBATTICA_LIBDIR}
-   ${PC_LIBATTICA_LIBRARY_DIRS}
-   )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibAttica  REQUIRED_VARS LIBATTICA_LIBRARIES LIBATTICA_INCLUDE_DIR
-                                             VERSION_VAR LIBATTICA_VERSION)
-
-MARK_AS_ADVANCED(LIBATTICA_INCLUDE_DIR LIBATTICA_LIBRARIES)

CMakeModules/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,29 +1,42 @@
-# - Try to find LibLastFm
-#
-#  LIBLASTFM_FOUND - system has liblastfm
-#  LIBLASTFM_INCLUDE_DIRS - the liblastfm include directories
-#  LIBLASTFM_LIBRARIES - link these to use liblastfm
-#
-# (c) Dominik Schmidt <dev@dominik-schmidt.de>
-#
+# - Find LibLastFM
+# Find the liblastfm includes and the liblastfm libraries
+# This module defines
+# LIBLASTFM_INCLUDE_DIR, root lastfm include dir
+# LIBLASTFM_LIBRARY, the path to liblastfm
+# LIBLASTFM_FOUND, whether liblastfm was found
 
-# Include dir
-find_path(LIBLASTFM_INCLUDE_DIR
-  # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then
-  NAMES lastfm/Track.h
-  PATHS ${KDE4_INCLUDE_DIR}
+
+find_path(LIBLASTFM_INCLUDE_DIR NAMES Audioscrobbler
+   HINTS
+   ~/usr/include
+   /opt/local/include
+   /usr/local/include
+   /usr/include
+   /opt/kde4/include
+   ${KDE4_INCLUDE_DIR}
+   PATH_SUFFIXES lastfm
 )
 
-# Finally the library itself
-find_library(LIBLASTFM_LIBRARY
-  NAMES lastfm
-  PATHS ${KDE4_LIB_DIR}
+find_library( LIBLASTFM_LIBRARY NAMES lastfm
+    PATHS
+    ~/usr/lib
+   /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)
-find_package_handle_standard_args(LibLastFm DEFAULT_MSG LIBLASTFM_LIBRARIES LIBLASTFM_INCLUDE_DIRS)
+if(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
+   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/FindPhonon.cmake

@@ -11,14 +11,61 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-include(FindPackageHandleStandardArgs)
+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}")
+   message(STATUS "Phonon Version: ${PHONON_VERSION}")
+endmacro(_phonon_find_version)
 
-if( TOMAHAWK_QT5 )
-    find_package(Phonon4Qt5 NO_MODULE)
-    set(Phonon_FOUND ${Phonon4Qt5_FOUND})
-    set(Phonon_DIR ${Phonon4Qt5_DIR})
-else()
-    find_package(Phonon NO_MODULE)
-endif()
+if(PHONON_FOUND)
+   # Already found, nothing more to do except figuring out the version
+   _phonon_find_version()
+else(PHONON_FOUND)
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FIND_QUIETLY TRUE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
 
-find_package_handle_standard_args(Phonon DEFAULT_MSG  Phonon_DIR )
+   # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4)
+
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
+
+   _phonon_find_version()
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
+      set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+      set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
+      set(PHONON_FOUND TRUE)
+   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
+      set(PHONON_FOUND FALSE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
+
+   if(PHONON_FOUND)
+      if(NOT PHONON_FIND_QUIETLY)
+         message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
+         message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
+      endif(NOT PHONON_FIND_QUIETLY)
+   else(PHONON_FOUND)
+      if(Phonon_FIND_REQUIRED)
+         if(NOT PHONON_INCLUDE_DIR)
+            message(STATUS "Phonon includes NOT found!")
+         endif(NOT PHONON_INCLUDE_DIR)
+         if(NOT PHONON_LIBRARY)
+            message(STATUS "Phonon library NOT found!")
+         endif(NOT PHONON_LIBRARY)
+         message(FATAL_ERROR "Phonon library or includes NOT found!")
+      else(Phonon_FIND_REQUIRED)
+         message(STATUS "Unable to find Phonon")
+      endif(Phonon_FIND_REQUIRED)
+   endif(PHONON_FOUND)
+
+
+   mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
+endif(PHONON_FOUND)

CMakeModules/FindQCA2.cmake

@@ -1,50 +0,0 @@
-# - Try to find QCA2 (Qt Cryptography Architecture 2)
-# Once done this will define
-#
-#  QCA2_FOUND - system has QCA2
-#  QCA2_INCLUDE_DIR - the QCA2 include directory
-#  QCA2_LIBRARIES - the libraries needed to use QCA2
-#  QCA2_DEFINITIONS - Compiler switches required for using QCA2
-#
-# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
-
-# Copyright (c) 2006, Michael Larouche, <michael.larouche@kdemail.net>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-include(FindLibraryWithDebug)
-
-if (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-
-  # in cache already
-  set(QCA2_FOUND TRUE)
-
-else (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)
-
-
-  if (NOT WIN32)
-    find_package(PkgConfig)
-    pkg_check_modules(PC_QCA2 qca2)
-    set(QCA2_DEFINITIONS ${PC_QCA2_CFLAGS_OTHER})
-  endif (NOT WIN32)
-
-  find_library_with_debug(QCA2_LIBRARIES
-                  WIN32_DEBUG_POSTFIX d
-                  NAMES qca
-                  HINTS ${PC_QCA2_LIBDIR} ${PC_QCA2_LIBRARY_DIRS}
-                  )
-
-  find_path(QCA2_INCLUDE_DIR qca.h
-            HINTS ${PC_QCA2_INCLUDEDIR} ${PC_QCA2_INCLUDE_DIRS}
-            PATH_SUFFIXES QtCrypto
-            PATHS /usr/local/lib/qca.framework/Headers/
-)
-
-  include(FindPackageHandleStandardArgs)
-  find_package_handle_standard_args(QCA2  DEFAULT_MSG  QCA2_LIBRARIES QCA2_INCLUDE_DIR)
-
-  mark_as_advanced(QCA2_INCLUDE_DIR QCA2_LIBRARIES)
-
-endif (QCA2_INCLUDE_DIR AND QCA2_LIBRARIES)

CMakeModules/FindQJSON.cmake

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

CMakeModules/FindQTweetLib.cmake

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

CMakeModules/FindQtSparkle.cmake

@@ -1,24 +0,0 @@
-# - Find qtsparkle
-# Find the qtsparkle includes and the qtsparkle libraries
-# This module defines
-# QTSPARKLE_INCLUDE_DIR, root qtsparkle include dir. Include qtsparkle includes with qtsparkle/foo.h
-# QTSPARKLE_LIBRARY, the path to qtsparkle
-# QTSPARKLE_FOUND, whether qtsparkle was found
-
-FIND_PATH(QTSPARKLE_INCLUDE_DIR NAMES qtsparkle/Updater
-    HINTS
-        ${CMAKE_INSTALL_INCLUDEDIR}
-        ${KDE4_INCLUDE_DIR}
-)
-
-FIND_LIBRARY(QTSPARKLE_LIBRARIES NAMES qtsparkle
-    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,10 +0,0 @@
-find_path(QuaZip_INCLUDE_DIR quazip/quazip.h ${CMAKE_INSTALL_PREFIX}/include/quazip ${CMAKE_INSTALL_PREFIX}/include /usr/include/quazip /usr/local/include/quazip ${QT_INCLUDE_DIR}/quazip ${QT_INCLUDE_DIR} ${QUAZIP_DIR}/include/quazip ${QUAZIP_DIR}/quazip ${QUAZIP_DIR}/include)
-find_library(QuaZip_LIBRARY NAMES quazip PATHS ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib ${CMAKE_INSTALL_PREFIX}/Library/Frameworks ${QUAZIP_DIR}/lib64 ${QUAZIP_DIR}/lib ${QUAZIP_DIR}/quazip ${QUAZIP_DIR})
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(quazip DEFAULT_MSG QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-set(QuaZip_LIBRARIES ${QuaZip_LIBRARY})
-mark_as_advanced(QuaZip_LIBRARY QuaZip_INCLUDE_DIR)
-
-if(QuaZip_LIBRARY AND QuaZip_INCLUDE_DIR)
-   set(QuaZip_FOUND TRUE)
-endif()

CMakeModules/FindTaglib.cmake

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

CMakeModules/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

@@ -28,8 +28,8 @@
 
 ; We use official release plugins
 ; mingw32-vlc from obs misses a lot and has even broken ones probably
-!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\" ; SIC! ^
-!define VLC_BIN "${VLC_PATH}"
+!define VLC_PATH "${SOURCE_PATH}\admin\win\vlc\prefix" ; SIC! ^
+!define VLC_BIN "${VLC_PATH}\bin"
 !define VLC_PLUGIN_PATH "${VLC_BIN}\plugins"
 
 !define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
@@ -273,27 +273,21 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         ;Main executable.
         File "${INSTALL_PATH}\bin\tomahawk.exe"
 
-        File "${INSTALL_PATH}\bin\tomahawk_crash_reporter.exe"
-
-        File "${INSTALL_PATH}\bin\libtomahawk.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk-widgets.dll"
-        File "${INSTALL_PATH}\bin\libtomahawk-playdarapi.dll"
-
-        ; plugins
-        File "${INSTALL_PATH}\lib\libtomahawk_*_*.dll"
+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
+        File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
    !endif
    !ifndef INSTALL_PATH
         ;Main executable.
         File "${BUILD_PATH}\tomahawk.exe"
 
-        File "${BUILD_PATH}\tomahawk_crash_reporter.exe"
-
-        File "${BUILD_PATH}\libtomahawk.dll"
-        File "${BUILD_PATH}\libtomahawk-widgets.dll"
-        File "${BUILD_PATH}\libtomahawk-playdarapi.dll"
-
-        ; plugins
-        File "${BUILD_PATH}\libtomahawk_*_*.dll"
+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
+        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
+        File "${BUILD_PATH}\libtomahawk_sip*.dll"
    !endif
 
    ;License & release notes.
@@ -305,11 +299,8 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${QT_DLL_PATH}\QtGui4.dll"
    File "${QT_DLL_PATH}\QtNetwork4.dll"
    File "${QT_DLL_PATH}\QtSql4.dll"
-   File "${QT_DLL_PATH}\QtScript4.dll"
-   File "${QT_DLL_PATH}\QtUiTools4.dll"
-   File "${QT_DLL_PATH}\QtWebKit4.dll"
    File "${QT_DLL_PATH}\QtXml4.dll"
-   File "${QT_DLL_PATH}\QtSvg4.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.dll"
 
    ;SQLite driver
    SetOutPath "$INSTDIR\sqldrivers"
@@ -320,7 +311,6 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    SetOutPath "$INSTDIR\imageformats"
    File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
    File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qsvg4.dll"
    SetOutPath "$INSTDIR"
 
    ;Cygwin/c++ stuff
@@ -331,17 +321,31 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\libstdc++-6.dll"
 
    ;Phonon stuff
-   File "${MING_BIN}\libphonon.dll"
+
+   ;Fix the phonon build to not use Dbus
+   File "${QT_DLL_PATH}\QtDbus4.dll"
+   File "${MING_BIN}\libdbus-1-3.dll"
+   File "${MING_BIN}\dbus-daemon.exe"
+
+   File "${VLC_BIN}\libphonon.dll"
    SetOutPath "$INSTDIR\phonon_backend"
    File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
    SetOutPath "$INSTDIR"
 
    ;VLC
+   ;SetOutPath "$INSTDIR\phonon_backend"
    File "${VLC_BIN}\libvlc.dll"
    File "${VLC_BIN}\libvlccore.dll"
    SetOutPath "$INSTDIR\plugins"
    File /r "${VLC_PLUGIN_PATH}\*.dll"
    SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libmad-0.dll" ; MP3
+   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
+   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
+   File "${MING_BIN}\libvorbis-0.dll" ; OGG
+   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
+
+
 
    ; Other
    File "${MING_BIN}\libqjson.dll"
@@ -351,9 +355,7 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\zlib1.dll"
 
    File "${MING_BIN}\libechonest.dll"
-   File "${MING_BIN}\liblastfm.dll"
-   File "${MING_BIN}\libquazip.dll"
-   File "${MING_BIN}\libqtkeychain.dll"
+   File "${MING_BIN}\libQTweetLib.dll"
 
    ; Jabber
    File "${MING_BIN}\libjreen.dll"
@@ -361,14 +363,13 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    SetOutPath "$INSTDIR\crypto"
    File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
    SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libssl-10.dll"
-   File "${MING_BIN}\libcrypto-10.dll"
+   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
 
-   File "${MING_BIN}\libclucene-core.dll"
-   File "${MING_BIN}\libclucene-shared.dll"
+   File "${MING_LIB}\libclucene-core.dll"
+   File "${MING_LIB}\libclucene-shared.dll"
 
    File "${MING_BIN}\libqtsparkle.dll"
-   File "${MING_BIN}\libattica.dll"
 SectionEnd
 
 SectionGroup "Shortcuts"
@@ -458,8 +459,7 @@ Section -post
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
 
    ; Register tomahawk:// protocol handler
-   WriteRegStr HKCR "tomahawk" "" "URL:Tomahawk Protocol"
-   WriteRegStr HKCR "tomahawk" "URL Protocol" ""
+   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
    WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
    WriteRegStr HKCR "tomahawk\shell" "" "open"
    WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'

ChangeLog

@@ -1,349 +1,11 @@
-Version 0.8.0:
-    * Playback Queue now saves its state across sessions.
-    * 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 having multiple IPs
-      (including IPv6).
-    * Added Trending page, showing you the most played tracks of your friends recently,
-      trending songs and playlists.
-    * Removed Top Loved from sidebar.
-    * JavaScript-Resolver can now handle URLs (e.g. when dropped from a browser)
-      and resolve them to Playlists/Tracks/Artists/Albums.
-    * 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.
-    * New Loved widget shows what friends have loved tracks throughout the app.
-    * New Artist, Album and Track page design - new fonts, colors, layout.
-    * Retina display and DPI scaling fixes.
-    * New Dashboard layout.
-    * New Stats widget.
-    * New Collection views.
-    * Added Telepathy support.
-    * Plugin refactoring (and .AXE resolver binaries).
-    * Removed Twitter due to change in Twitter's API.
-    * Improved error messages.
-    * Support drag & drop of items from Artist and Album page headers.
-    * Added basic remote control API
-    * Add support for Opus codec in local files (requires TagLib 1.9)
-    * Support rtmp:// streams
-
-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.
-    * Support more widget types in Javascript resolver configs.
-    * Fixed bug where red headphone would be visible on My Collection
-      when listened along to source went offline.
-    * Draw author name as well as avatar in recently played playlists.
-    * Fixed Tomahawk integration in Unity.
-    * Fixed incorrect item selected in source tree when deleting temporary
-      pages.
-    * Fixed currently played label disappearing after 10 minutes regardless
-      of length of track.
-    * Fixed crash on Sparkle upgrade on OS X.
-
-Version 0.3.0:
-    * Make artist names in the album view clickable.
-    * Don't start playing if a tomahawk:// link was clicked while Tomahawk
-      is paused.
-    * Make artist name clickable in header of Album pages.
-    * Added a drop shadow to cover images, and put placeholder in jewel case.
-    * Added shuffle and repeat support to tree view.
-    * Draw a speaker next to the currently playing playlist.
-    * Refresh station previews whenever a filter is changed.
-    * Support and show official releases on album and track pages.
-    * Filter out duplicates from station previews and upcoming tracks.
-    * Added YouTube resolver.
-    * Fixed bug where going offline then online would not re-connect to many
-      peers.
-    * Added support for auto-updating live XSPF playlists.
-    * Don't show an age of 41 years for tracks that have no age information.
-    * Show config UI for resolvers that have them as soon as you add them.
-    * Add support for Echo Nest Personal Catalogs and User Radio. Synchronize
-      your catalog with The Echo Nest and enable personal recommendations
-      from you and your friends.
-    * Added support for Grooveshark resolver (requires Grooveshark Anywhere).
-    * Fixed re-resolving when resolvers or sources go off- / online.
-    * Correctly sort recently played tracks on the Dashboard.
-    * Show a Lion full-screen toggle button if running on Lion.
-    * Show a list of users who are currently listening along to you.
-    * Show headphone icon in source item to allow users to listen along; paint
-      headphones red on a source if you are currently listening along to it.
-    * Added new job status view in the bottom of the source list that displays
-      current jobs such as resolving, parsing playlists, and loading from
-      database.
-    * Parse and convert a Spotify playlist URL when dropped anywhere on the
-      sidebar.
-    * Convert resolvers to use asynchronous calls to avoid blocking Tomahawk's
-      UI, greatly increasing responsiveness of Tomahawk while resolving.
-    * Fixed no playlists overlay not disappearing when playlists were added.
-    * Add support for parsing itunes track, artist and album links.
-    * Fixed crash when syncing playlists with peers.
-    * Add support for browsing, downloading and rating resolvers from within
-      Tomahawk directly.
-    * Support multi-folder selection and scanning.
-    * Fixed handling of special characters in tomahawk:// links
-    * Improve sidebar performance by caching pixmaps and shrinking them.
-    * Send updated playlists to peers when tracks are moved/copied.
-    * Remove splitter handles in sidebar.
-    * Fixed Tomahawk preventing system shutdown / logout.
-    * Ignore leading 'The' when sorting artists.
-    * Added Charts page, which shows various sources' top hits & artists.
-    * The Collection tree-views can now be filtered.
-    * Fixed crash when pressing enter in an empty playlist.
-    * Moved the song queue to the bottom of the sidebar.
-    * Added Footnotes, a contextual view that you can slide it.
-    * Show recently added playlists in dashboard rather than recently opened
-      playlists.
-    * Fixed seek slider and give it some smooth animation between ticks.
-    * Fixed Twitter issue where it would repeatedly send DMs to friends.
-    * Add a new drag and drop menu when dropping items onto playlists,
-      allowing users to drop the dragged tracks, the whole album, or
-      the whole artists's tracks.
-    * Bring Tomahawk window to the front when clicking a Tomahawk link.
-    * Fixed crash in source list when initially syncing with remote sources.
-    * Open temporary artist, album, and search playlists as temporary items
-      in the sidebar.
-    * Fixed sorting of playlists and items in the artist view.
-    * Allow dragging and dropping albums and artists to playlists.
-    * Added MPRIS 2.1 support.
-
-Version 0.2.3:
-    * Fixed opening Rdio and Spotify links.
-    * Fixed potential crash in sidebar during syncing of sources.
-    * When Listening Along, the last song a peer plays is no longer duplicated.
-    * Fixed an issue where the Twitter plugin could get out of sync if the
-      database was cleared, leading to eventual crashes when re-connecting.
-    * Fixed duplicate albums showing up on Dashboard.
-    * Automatically sort search results by score.
-    * Fixed stations being stuck not fetching more songs.
-    * Fixed issue where artist bio could be referring to a different artist.
-    * Opening a "tomahawk" URL (or other URL with Tomahawk) brings the Tomahawk
-      window to the foreground.
-
 Version 0.2.2:
-    * Fixed crash pressing previous and next when playing a song from the Queue.
-    * Fixed issue where wrench for newly added resolvers would not show up.
+    * Fixed crash when pressing previous and next when playing a song from the Queue.
+    * Fixed issue where wrench for newly added resolvers would not show up immediately.
     * Fixed sidebar statistics not updating after collection scan finished.
     * Fixed omitting a few tracks in the Collection tree-view.
     * Fixed sidebar & track sorting issues.
     * Seek- & volume sliders now directly jump to the position you clicked on.
-    * Added ability to drag artists and albums within Tomahawk.
-    * (OS X) Fixed Ogg Vorbis support.
+    * Added ability to drag artists and albums within Tomahawk (to playlists, queue, etc.).
 
 Version 0.2.1:
     * Fixed crashing trying to play an unavailable track.

README

@@ -0,0 +1,44 @@
+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.3x http://www.boost.org/
+  CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
+  libechonest 1.1.8 http://projects.kde.org/projects/playground/libs/libechonest/
+
+ Third party libraries that we ship with our source:
+
+  MiniUPnP http://miniupnp.free.fr/
+  liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
+
+Enjoy!

README.md

@@ -1,66 +0,0 @@
-Tomahawk
-========
-
-Compiling and running Tomahawk
-------------------------------
-
-Compile:
-
-    $ 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/index.php/Building_Binary_on_Ubuntu_Precise_(12.04)
-
-Detailed building instructions for OS X
----------------------------------------
-See: http://wiki.tomahawk-player.org/index.php/Building_OS_X_Application_Bundle
-
-Doxygen Documentation
----------------------
-See: http://dev.tomahawk-player.org/api/classes.html
-
-Dependencies
-------------
-
-Required dependencies:
-
-* CMake 2.8.6 - http://www.cmake.org/
-* Qt 4.7.0 - http://qt-project.org/
-* Phonon 4.6.0 - http://phonon.kde.org/
-* QJson 0.8.1 - http://qjson.sourceforge.net/
-* SQLite 3.6.22 - http://www.sqlite.org/
-* TagLib 1.6.2 - http://developer.kde.org/~wheeler/taglib.html
-* Boost 1.3 - http://www.boost.org/
-* CLucene 0.9.23 (0.9.21 will fail) - http://clucene.sourceforge.net/download.shtml
-* libechonest 2.2.0 - http://projects.kde.org/projects/playground/libs/libechonest/
-* Attica 0.4.0 - ftp://ftp.kde.org/pub/kde/stable/attica/
-* QuaZip 0.4.3 - http://quazip.sourceforge.net/
-* liblastfm 1.0.1 - https://github.com/lastfm/liblastfm/
-* QtKeychain 0.1 - https://github.com/frankosterfeld/qtkeychain/
-
-The following dependencies are optional, but recommended:
-
-* Jreen 1.0.5 (1.1.0 will fail, 1.1.1 is fine) - http://qutim.org/jreen/
-
-Third party libraries that we ship with our source:
-
-* MiniUPnP 1.6 - http://miniupnp.free.fr/
-* Qocoa - https://github.com/mikemcquaid/Qocoa/
-* libqnetwm - http://code.google.com/p/libqnetwm/
-* libqxt (QxtWeb module) - http://libqxt.org/
-* SPMediaKeyTap - https://github.com/nevyn/SPMediaKeyTap/
-* kdSingleApplicationGuard - http://www.kdab.com/
-
-Enjoy!

TomahawkAddLibrary.cmake

@@ -1,112 +0,0 @@
-include( CMakeParseArguments )
-
-function(tomahawk_add_library)
-    # parse arguments (name needs to be saved before passing ARGN into the macro)
-    set(NAME ${ARGV0})
-    set(options NO_INSTALL NO_VERSION)
-    set(oneValueArgs NAME TYPE EXPORT_MACRO TARGET TARGET_TYPE EXPORT VERSION SOVERSION INSTALL_BINDIR)
-    set(multiValueArgs SOURCES UI LINK_LIBRARIES LINK_PRIVATE_LIBRARIES COMPILE_DEFINITIONS QT5_MODULES)
-    cmake_parse_arguments(LIBRARY "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    set(LIBRARY_NAME ${NAME})
-
-
-#     message("*** Arguments for ${LIBRARY_NAME}")
-#     message("Sources: ${LIBRARY_SOURCES}")
-#     message("Link libraries: ${LIBRARY_LINK_LIBRARIES}")
-#     message("UI: ${LIBRARY_UI}")
-#     message("TARGET_TYPE: ${LIBRARY_TARGET_TYPE}")
-#     message("EXPORT_MACRO: ${LIBRARY_EXPORT_MACRO}")
-#     message("NO_INSTALL: ${LIBRARY_NO_INSTALL}")
-
-    set(target ${LIBRARY_NAME})
-
-    # qt stuff
-    include_directories(${CMAKE_CURRENT_LIST_DIR})
-    include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-    if(LIBRARY_UI)
-        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 DBus ${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
-        add_definitions( "-D${LIBRARY_EXPORT_MACRO}" )
-
-        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS ${LIBRARY_COMPILE_DEFINITIONS})
-    endif()
-
-    # add link targets
-    target_link_libraries(${target} ${TOMAHAWK_LIBRARIES})
-    if(LIBRARY_LINK_LIBRARIES)
-        target_link_libraries(${target} ${LIBRARY_LINK_LIBRARIES})
-    endif()
-    if(LIBRARY_LINK_PRIVATE_LIBRARIES)
-        target_link_libraries(${target} LINK_PRIVATE ${LIBRARY_LINK_PRIVATE_LIBRARIES})
-    endif()
-
-    # add soversion
-    if(NOT LIBRARY_NO_VERSION)
-        set_target_properties(${target} PROPERTIES VERSION ${LIBRARY_VERSION})
-
-        if(NOT LIBRARY_SOVERSION)
-            set(LIBRARY_SOVERSION ${LIBRARY_VERSION})
-        endif()
-
-        set_target_properties(${target} PROPERTIES SOVERSION ${LIBRARY_SOVERSION})
-    endif()
-
-
-    if(NOT LIBRARY_INSTALL_BINDIR)
-        set(LIBRARY_INSTALL_BINDIR "${CMAKE_INSTALL_BINDIR}")
-    endif()
-
-    # make installation optional, maybe useful for dummy plugins one day
-    if(NOT LIBRARY_NO_INSTALL)
-        include(GNUInstallDirs)
-        if(NOT LIBRARY_EXPORT)
-            install( TARGETS ${target}
-                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            )
-        else()
-            install( TARGETS ${target}
-                EXPORT ${LIBRARY_EXPORT}
-                RUNTIME DESTINATION ${LIBRARY_INSTALL_BINDIR}
-                LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-                ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-            )
-        endif()
-    endif()
-endfunction()

TomahawkAddPlugin.cmake

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

TomahawkBuildTreeSettings.cmake.in

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

TomahawkCPack.cmake

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

TomahawkConfig.cmake.in

@@ -1,21 +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")

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,63 +0,0 @@
-#FIXME: this duplicates top level cmakelists: how can we reduce code duplication?
-
-set( TOMAHAWK_QT5 @TOMAHAWK_QT5@ )
-
-if(TOMAHAWK_QT5)
-    find_package(Qt5Core)
-    find_package(Qt5Network)
-    find_package(Qt5Gui)
-    find_package(Qt5Sql)
-
-    set(NEEDED_QT4_COMPONENTS "QtCore" "QtXml" "QtNetwork")
-    if(BUILD_GUI OR NOT DEFINED BUILD_GUI)
-        find_package(Qt5Widgets)
-        find_package(Qt5Svg)
-    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()
-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" )

admin/CMakeLists.txt

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

admin/copy_syms.sh

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

admin/mac/Info.plist

@@ -24,10 +24,6 @@
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.5.0</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-	<key>NSHighResolutionCapable</key>
-	<true />
 	<key>SUFeedURL</key>
 	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
 	<key>SUPublicDSAKeyFile</key>

admin/mac/build-release-osx.sh

@@ -41,13 +41,10 @@ VERSION=$1
 
     header "Copying Sparkle framework"
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    
+
     header "Creating DMG"
     cd ..
 
-    header "Signing bundle"
-    codesign -s "Developer ID Application: Leonardo Franchi" -f -v ./Tomahawk.app
-
     $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
     mv Tomahawk.dmg Tomahawk-$VERSION.dmg
     

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,7 +18,6 @@
 import os
 import re
 import subprocess
-import commands
 import sys
 
 FRAMEWORK_SEARCH_PATH=[
@@ -26,16 +25,17 @@ FRAMEWORK_SEARCH_PATH=[
     os.path.join(os.environ['HOME'], 'Library/Frameworks')
 ]
 
-LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.3.2/lib', '.']
+LIBRARY_SEARCH_PATH=['/usr/local/lib', '/usr/local/Cellar/gettext/0.18.1.1/lib', '.']
+
 
 VLC_PLUGINS=[
   'access/libaccess_attachment_plugin.dylib',
   #'access/libaccess_avio_plugin.dylib',
-  #'access/libaccess_fake_plugin.dylib',
+  'access/libaccess_fake_plugin.dylib',
   'access/libaccess_ftp_plugin.dylib',
   'access/libaccess_http_plugin.dylib',
   'access/libaccess_imem_plugin.dylib',
-  #'access/libaccess_mmap_plugin.dylib',
+  'access/libaccess_mmap_plugin.dylib',
   'access/libaccess_mms_plugin.dylib',
   'access/libaccess_realrtsp_plugin.dylib',
   'access/libaccess_tcp_plugin.dylib',
@@ -55,7 +55,7 @@ VLC_PLUGINS=[
   'audio_filter/libaudio_format_plugin.dylib',
   'audio_filter/libaudiobargraph_a_plugin.dylib',
   'audio_filter/libchorus_flanger_plugin.dylib',
-  #'libconverter_fixed_plugin.dylib',
+  'audio_filter/libconverter_fixed_plugin.dylib',
   'audio_filter/libdolby_surround_decoder_plugin.dylib',
   'audio_filter/libdtstofloat32_plugin.dylib',
   'audio_filter/libdtstospdif_plugin.dylib',
@@ -70,10 +70,10 @@ VLC_PLUGINS=[
   'audio_filter/libspatializer_plugin.dylib',
   'audio_filter/libtrivial_channel_mixer_plugin.dylib',
   'audio_filter/libugly_resampler_plugin.dylib',
-  'audio_mixer/libfloat_mixer_plugin.dylib',
-  #'libspdif_mixer_plugin.dylib',
-  #'libtrivial_mixer_plugin.dylib',
-  #'libaout_file_plugin.dylib',
+  'audio_mixer/libfloat32_mixer_plugin.dylib',
+  'audio_mixer/libspdif_mixer_plugin.dylib',
+  'audio_mixer/libtrivial_mixer_plugin.dylib',
+  'audio_output/libaout_file_plugin.dylib',
   'audio_output/libauhal_plugin.dylib',
   'codec/liba52_plugin.dylib',
   'codec/libadpcm_plugin.dylib',
@@ -84,10 +84,10 @@ VLC_PLUGINS=[
   'codec/libcdg_plugin.dylib',
   'codec/libdts_plugin.dylib',
   'codec/libfaad_plugin.dylib',
-  #'libfake_plugin.dylib',
+  'codec/libfake_plugin.dylib',
   'codec/libflac_plugin.dylib',
-  #'libfluidsynth_plugin.dylib',
-  #'libinvmem_plugin.dylib',
+  'codec/libfluidsynth_plugin.dylib',
+  'codec/libinvmem_plugin.dylib',
   'codec/liblpcm_plugin.dylib',
   'codec/libmpeg_audio_plugin.dylib',
   'codec/libpng_plugin.dylib',
@@ -97,22 +97,22 @@ VLC_PLUGINS=[
   'codec/libtheora_plugin.dylib',
   'codec/libtwolame_plugin.dylib',
   'codec/libvorbis_plugin.dylib',
-  #'control/libgestures_plugin.dylib',
-  #'libhotkeys_plugin.dylib',
-  #'libmotion_plugin.dylib',
-  #'libnetsync_plugin.dylib',
-  #'libsignals_plugin.dylib',
+  'control/libgestures_plugin.dylib',
+  'control/libhotkeys_plugin.dylib',
+  'control/libmotion_plugin.dylib',
+  'control/libnetsync_plugin.dylib',
+  'control/libsignals_plugin.dylib',
   'demux/libaiff_plugin.dylib',
   'demux/libasf_plugin.dylib',
   'demux/libau_plugin.dylib',
-  #'libavformat_plugin.dylib',
+  #'demux/libavformat_plugin.dylib',
   'demux/libavi_plugin.dylib',
   'demux/libdemux_cdg_plugin.dylib',
   'demux/libdemuxdump_plugin.dylib',
   'demux/libdirac_plugin.dylib',
   'demux/libes_plugin.dylib',
   'demux/libflacsys_plugin.dylib',
-  'access/liblive555_plugin.dylib',
+  'demux/liblive555_plugin.dylib',
   'demux/libmkv_plugin.dylib',
   'demux/libmod_plugin.dylib',
   'demux/libmp4_plugin.dylib',
@@ -139,24 +139,24 @@ VLC_PLUGINS=[
   'demux/libxa_plugin.dylib',
   'meta_engine/libfolder_plugin.dylib',
   'meta_engine/libtaglib_plugin.dylib',
-  #'libaudioscrobbler_plugin.dylib',
-  'control/libdummy_plugin.dylib',
+  'misc/libaudioscrobbler_plugin.dylib',
+  'misc/libdummy_plugin.dylib',
   'misc/libexport_plugin.dylib',
-  #'libfreetype_plugin.dylib',
-  #'libgnutls_plugin.dylib',
-  #'liblogger_plugin.dylib',
-  'lua/liblua_plugin.dylib',
-  #'libosd_parser_plugin.dylib',
-  #'libquartztext_plugin.dylib',
-  #'libstats_plugin.dylib',
+  'misc/libfreetype_plugin.dylib',
+  'misc/libgnutls_plugin.dylib',
+  'misc/liblogger_plugin.dylib',
+  'misc/liblua_plugin.dylib',
+  'misc/libosd_parser_plugin.dylib',
+  'misc/libquartztext_plugin.dylib',
+  'misc/libstats_plugin.dylib',
   'misc/libvod_rtsp_plugin.dylib',
   'misc/libxml_plugin.dylib',
-  #'libxtag_plugin.dylib',
+  'misc/libxtag_plugin.dylib',
   'mmx/libi420_rgb_mmx_plugin.dylib',
   'mmx/libi420_yuy2_mmx_plugin.dylib',
   'mmx/libi422_yuy2_mmx_plugin.dylib',
-  #'libmemcpymmx_plugin.dylib',
-  #'libmemcpymmxext_plugin.dylib',
+  'mmx/libmemcpymmx_plugin.dylib',
+  'mmxext/libmemcpymmxext_plugin.dylib',
   'mux/libmux_asf_plugin.dylib',
   'mux/libmux_avi_plugin.dylib',
   'mux/libmux_dummy_plugin.dylib',
@@ -179,9 +179,9 @@ VLC_PLUGINS=[
   'sse2/libi420_yuy2_sse2_plugin.dylib',
   'sse2/libi422_yuy2_sse2_plugin.dylib',
   'stream_filter/libdecomp_plugin.dylib',
-  'access/libstream_filter_rar_plugin.dylib',
-  'stream_filter/librecord_plugin.dylib',
-  #'libvisual_plugin.dylib',
+  'stream_filter/libstream_filter_rar_plugin.dylib',
+  'stream_filter/libstream_filter_record_plugin.dylib',
+  'visualization/libvisual_plugin.dylib',
 ]
 
 VLC_SEARCH_PATH=[
@@ -195,30 +195,19 @@ QT_PLUGINS = [
     'imageformats/libqgif.dylib',
     'imageformats/libqico.dylib',
     'imageformats/libqjpeg.dylib',
-    'imageformats/libqsvg.dylib',
     'imageformats/libqmng.dylib',
 ]
 
 TOMAHAWK_PLUGINS = [
-  'libtomahawk_account_xmpp.dylib',
-  'libtomahawk_account_google.so',
-  'libtomahawk_account_zeroconf.so',
-  'libtomahawk_infoplugin_adium.so',
-  'libtomahawk_infoplugin_charts.so',
-  'libtomahawk_infoplugin_discogs.so',
-  'libtomahawk_infoplugin_echonest.so',
-  'libtomahawk_infoplugin_hypem.so',
-  'libtomahawk_infoplugin_musicbrainz.so',
-  'libtomahawk_infoplugin_musixmatch.so',
-  'libtomahawk_infoplugin_newreleases.so',
-  'libtomahawk_infoplugin_rovi.so',
-  'libtomahawk_infoplugin_spotify.so',
-  'libtomahawk_viewpage_dashboard.so',
-  'libtomahawk_viewpage_networkactivity.so',
+  'libtomahawk_sipjabber.dylib',
+  'libtomahawk_sipgoogle.dylib',
+  'libtomahawk_siptwitter.dylib',
+  'libtomahawk_sipzeroconf.dylib',
+  'libtomahawk_qtweetlib.dylib',
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.8.5/plugins',
+    '/usr/local/Cellar/qt/4.7.3/plugins',
 ]
 
 
@@ -261,7 +250,7 @@ frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
 commands.append(['mkdir', '-p', frameworks_dir])
 resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
 commands.append(['mkdir', '-p', resources_dir])
-plugins_dir = os.path.join(bundle_dir, 'Contents', 'qt-plugins')
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
 binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
 
 fixed_libraries = []
@@ -375,7 +364,8 @@ def FixVLCPlugin(abs_path, subdir):
   FixAllLibraries(broken_libs)
 
   #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
-  new_path = os.path.join(plugins_dir, subdir, 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]
@@ -501,15 +491,15 @@ def FindVLCPlugin(name):
 FixBinary(binary)
 
 for plugin in VLC_PLUGINS:
-  FixVLCPlugin(FindVLCPlugin(plugin), '../plugins')
+  FixVLCPlugin(FindVLCPlugin(plugin), '.')
 
 for plugin in TOMAHAWK_PLUGINS:
   FixPlugin(plugin, '../MacOS')
 
 try:
-  FixPlugin('tomahawk_crash_reporter', '../MacOS')
+  FixPlugin('spotify_tomahawkresolver', '../MacOS')
 except:
-  print 'Failed to find tomahawk_crash_reporter'
+  print 'Failed to find spotify resolver'
 
 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/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
-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
+Exec=tomahawk
+Comment=Tomahawk - Social Music Player
 Icon=tomahawk
 Terminal=false
 Categories=Qt;AudioVideo;Audio;Player;
-MimeType=x-scheme-handler/tomahawk;x-scheme-handler/spotify;

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -3,11 +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_CXX_COMPILER ${MINGW_PREFIX}-g++)
-SET(CMAKE_RC_COMPILER ${MINGW_PREFIX}-windres)
+SET(CMAKE_C_COMPILER ccache ${MINGW_PREFIX}-gcc)
+SET(CMAKE_CXX_COMPILER ccache ${MINGW_PREFIX}-g++)
+SET(CMAKE_RC_COMPILER /usr/bin/${MINGW_PREFIX}-windres)
 
 # where is the target environment containing libraries
 SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
@@ -16,22 +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
-SET(QT_LIBRARY_DIR          /usr/${MINGW_PREFIX}/bin)
-SET(QT_PLUGINS_DIR          ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins)
-SET(QT_MKSPECS_DIR          ${CMAKE_FIND_ROOT_PATH}/share/qt4/mkspecs)
-SET(QT_QT_INCLUDE_DIR       ${CMAKE_FIND_ROOT_PATH}/include)
+# libs with broken find modules
+SET(TAGLIB_FOUND true)
+SET(TAGLIB_LIBRARIES  ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
+SET(TAGLIB_INCLUDES   ${CMAKE_FIND_ROOT_PATH}/include/taglib)
 
-# qt tools
-SET(QT_QMAKE_EXECUTABLE     ${MINGW_PREFIX}-qmake )
-SET(QT_MOC_EXECUTABLE       ${MINGW_PREFIX}-moc)
-SET(QT_RCC_EXECUTABLE       ${MINGW_PREFIX}-rcc)
-SET(QT_UIC_EXECUTABLE       ${MINGW_PREFIX}-uic)
-SET(QT_LRELEASE_EXECUTABLE  ${MINGW_PREFIX}-lrelease)
-
-# phonon -_-
-SET(Automoc4_DIR	    "/usr/lib64/automoc4/")
+SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
+SET(QT_QTUITOOLS_LIBRARY_RELEASE  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
+SET(QT_QTUITOOLS_LIBRARY_DEBUG  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)
+SET(QT_QTUITOOLS_LIBRARY  ${QT_QTUITOOLS_LIBRARY_RELEASE})

admin/win/update-vlc.sh

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

data/fonts/OFL.txt

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

data/icons/tomahawk-icon.svg

@@ -1,23 +1,302 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="3100px" height="3100px" viewBox="0 0 3100 3100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>tomahawk-icon</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-1">
-            <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
-            <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.7 0" in="shadowBlurOuter1" type="matrix" result="shadowMatrixOuter1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"></feMergeNode>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle d="M1546,3051 C2374.42717,3051 3046,2379.42717 3046,1551 C3046,722.572834 2374.42717,51 1546,51 C717.572834,51 46,722.572834 46,1551 C46,2379.42717 717.572834,3051 1546,3051 Z M1546,3051" id="Oval 1" stroke="#979797" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="1546" cy="1551" r="1500"></circle>
-        <g id="Group" sketch:type="MSLayerGroup" transform="translate(46.000000, 48.000000)">
-            <path d="M1500.00026,326.562245 C852.333832,326.562245 325.623384,853.409757 325.623384,1501.14467 C325.623384,2148.84339 852.297589,2675.87184 1500.00026,2675.87184 C1592.85982,2675.87184 1682.97119,2664.36909 1769.71967,2643.75096 L1769.71967,1630.53256 L961.97175,2202.26973 C954.812018,2207.15297 945.916593,2209.9744 937.346612,2209.9744 C930.693123,2209.9744 923.894994,2208.56369 917.783909,2205.05499 C903.464446,2197.74821 894.56902,2183.06231 894.56902,2167.32742 L894.56902,827.040286 C894.56902,811.305396 903.464445,796.474809 917.783909,788.951001 C932.103373,781.969774 949.026377,783.199628 961.97175,792.27884 L1769.71967,1364.0522 L1769.71967,784.284802 L1804.10807,784.284802 L2127.56161,784.284802 L2127.56161,2492.84071 C2455.75216,2284.34437 2674.34095,1918.13743 2674.34095,1501.10857 C2674.34087,853.446289 2147.48558,326.562245 1500.00026,326.562245 L1500.00026,326.562245 L1500.00026,326.562245" id="Shape" sketch:type="MSShapeGroup"></path>
-            <path d="M1500.00026,0.904613118 C672.870406,0.904613118 0.0726019231,673.923876 0.0726019231,1501.14494 C0.0726019231,2328.4023 672.870475,3001.38527 1500.00026,3001.38527 C2326.94928,3001.38527 2999.78337,2328.40223 2999.78337,1501.14494 C2999.74681,673.923394 2326.94887,0.904613118 1500.00026,0.904613118 L1500.00026,0.904613118 L1500.00026,0.904613118 M2127.56146,2492.87708 L2127.56146,784.321176 L1804.10793,784.321176 L1769.71952,784.321176 L1769.71952,1364.08857 L961.971604,792.315213 C949.06239,783.236001 932.103228,782.006148 917.783763,788.987375 C903.464299,796.511184 894.568874,811.341769 894.568874,827.076659 L894.568874,2167.3638 C894.568874,2183.09869 903.464299,2197.78459 917.783763,2205.09136 C923.894847,2208.60006 930.692976,2210.01078 937.346465,2210.01078 C945.880287,2210.01078 954.775711,2207.18935 961.971604,2202.30611 L1769.71952,1630.56893 L1769.71952,2643.78733 C1682.97105,2664.36929 1592.85968,2675.90821 1500.00012,2675.90821 C852.333686,2675.90821 325.623237,2148.87983 325.623237,1501.18104 C325.623237,853.482317 852.297442,326.598618 1500.00012,326.598618 C2147.48578,326.598618 2674.377,853.44613 2674.377,1501.18104 C2674.34087,1918.17376 2455.75215,2284.38047 2127.56146,2492.87708 L2072.56159,399.051282" id="Shape" fill="#E63E30" filter="url(#filter-1)" sketch:type="MSShapeGroup"></path>
-        </g>
-    </g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="841.89px" height="595.28px" viewBox="0 0 841.89 595.28" enable-background="new 0 0 841.89 595.28" xml:space="preserve">
+<path fill="#010101" d="M543.773,253.359c0-49.962-19.305-86.572-54.194-104.54C477.838,71.133,405.027,13.418,316.568,13.418
+	c-86.917,0-159.483,56.481-172.605,132.58c-38.049,16.818-59.889,55.24-59.889,107.361c0,27.029,7.186,51.825,20.321,71.748
+	c-1.816,1.566-3.444,3.283-4.768,5.24c0,0,2.582,2.36,3.689,3.374c-4.262,2.123-8.22,4.322-11.555,6.669
+	c0,0,3.022,7.355,5.898,14.352c-11.991,9.687-21.314,18.92-27.553,27.51c0,0,1.612,1.789,2.011,2.224
+	c-12.355,9.158-22.133,18.206-28.528,27.021c0,0,6.925,7.351,12.408,13.167c-17.824,28.759-43.348,74.85-43.348,102.987
+	c0,3.281,0.346,6.318,1.093,9.054c1.764,6.442,5.752,11.437,11.229,14.058c15.255,7.311,39.648-6.364,72.589-40.434
+	c-0.828,8.288-1.457,16.663-1.457,24.737c0,16.804,2.266,32.07,8.77,41.249c4.886,6.895,10.898,9.07,15.084,9.683
+	c6.721,0.989,26.375,3.796,57.992-61.296c2.678,0.705,5.421,1.179,8.235,1.179c8.798,0,17.067-3.425,23.287-9.639
+	c4.286-4.288,7.133-9.584,8.562-15.313c7.516-2.129,14.555-6.702,20.779-13.191c19.563,24.861,44.78,37.643,75.38,37.643
+	c7.318,0,14.474-0.755,21.281-2.243c0.392-0.075,2.555-0.622,2.555-0.622l0.62-0.167c23.05-5.824,42.463-20.41,58-43.254
+	c7.2,9.231,15.733,15.994,24.849,19.458c1.139,6.658,4.224,12.806,9.1,17.69c6.22,6.214,14.488,9.639,23.288,9.639
+	c8.798,0,17.065-3.425,23.285-9.639c6.221-6.228,9.649-14.494,9.649-23.292s-3.429-17.066-9.649-23.294
+	c-2.988-2.988-6.476-5.296-10.248-6.923c0.277-2.947,0.613-5.848,0.613-9.007c0-10.031-1.4-20.982-4.192-31.9
+	c-1.196-4.672-2.757-8.745-4.511-12.567c2.838-6.467,4.805-13.268,4.805-20.426c0-7.317-1.74-14.422-4.706-21.011
+	C509.263,358.346,543.773,313.068,543.773,253.359z M451.232,150.998c-33.395-54.619-88.048-93.359-134.569-85.472
+	c-49.024-7.864-102.777,30.64-135.326,85.018c-2.648,0.208-5.278,0.497-7.875,0.88c8.694-54.414,69.429-111.108,143.107-111.108
+	c74.113,0,135.141,57.197,143.269,112.08C457.013,151.799,454.137,151.348,451.232,150.998z"/>
+<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M110.937,367.38c-72.03,93.07-97.843,163.348-81.865,170.997
+	c15.97,7.654,74.912-46.056,139.701-143.288c45.751-68.648,60.797-94.429,45.68-95.922l20.614-43.357l-10.685-6.644l-33.912,33.371
+	C179.323,272.615,166.073,296.146,110.937,367.38z"/>
+<path fill="#010101" stroke="#FFFFFF" stroke-width="4.8437" d="M140.932,379.755c-39.099,113.042-39.738,189.89-20.813,192.654
+	c18.912,2.787,59.039-67.616,89.306-182.6c21.381-81.178,27.255-111.03,11.438-108.001l5.133-48.806l-13.207-3.354l-22.194,42.936
+	C175.736,266.142,170.865,293.244,140.932,379.755z"/>
+<circle fill="none" stroke="#010101" stroke-width="4.8437" cx="410.28" cy="388.831" r="37.801"/>
+<path fill="#ED2224" stroke="#010101" stroke-width="4.8437" d="M475.237,157.792c-7.115-73.197-76.231-130.645-160.495-130.645
+	c-83.402,0-152.009,56.27-160.306,128.393c-39.809,13.607-58.455,52.219-58.455,97.818c0,56.947,34.681,103.109,89.925,103.109
+	c35.784,0,67.089-19.432,84.771-48.551c14.01,3.533,28.778,5.463,44.066,5.463c13.16,0,25.932-1.438,38.173-4.077
+	c17.966,28.357,49.108,47.165,84.604,47.165c55.665,0,90.696-46.162,90.696-103.109
+	C528.216,210.073,512.208,173.073,475.237,157.792z M314.742,274.908c-10.501,0-20.723-0.878-30.584-2.506
+	c1.125-6.177,1.778-12.527,1.778-19.043c0-56.941-44.786-103.104-100.03-103.104c-4.858,0-9.597,0.478-14.271,1.169
+	c8.694-54.414,69.43-111.108,143.107-111.108c74.113,0,135.142,57.197,143.268,112.08c-6.617-1.398-13.471-2.141-20.49-2.141
+	c-55.675,0-100.801,46.163-100.801,103.104c0,6.852,0.687,13.536,1.931,20.013C330.872,274.364,322.888,274.908,314.742,274.908z"/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-55.6953" y1="95.2363" x2="39.7773" y2="95.2363" gradientTransform="matrix(-0.3782 -0.8348 1.083 -0.4907 70.5233 338.0542)">
+	<stop  offset="0" style="stop-color:#010101"/>
+	<stop  offset="0.2606" style="stop-color:#3E221C"/>
+	<stop  offset="0.7732" style="stop-color:#B03126"/>
+	<stop  offset="1" style="stop-color:#ED2224"/>
+</linearGradient>
+<path fill="url(#SVGID_1_)" d="M153.69,260.35c31.322-14.19,65.739-18.887,77.129,6.254c11.391,25.14-4.763,57.027-36.091,71.213
+	c-31.323,14.194-65.948,5.312-77.338-19.829C106,292.849,122.366,274.543,153.69,260.35z"/>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-180.8516" y1="181.2642" x2="-85.3789" y2="181.2642" gradientTransform="matrix(-0.9008 -0.3607 0.555 -1.386 252.7537 479.2919)">
+	<stop  offset="0" style="stop-color:#B11F24"/>
+	<stop  offset="0.1017" style="stop-color:#B62024"/>
+	<stop  offset="1" style="stop-color:#ED2224"/>
+</linearGradient>
+<path fill="url(#SVGID_2_)" d="M427.738,265.165c16.043-40.085,41.342-74.985,68.473-64.122
+	c27.122,10.86,36.111,52.165,20.056,92.248c-16.053,40.089-51.062,63.772-78.189,52.911
+	C410.95,335.343,411.683,305.253,427.738,265.165z"/>
+<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M448.219,425.226c7.776,30.397,3.982,62.358-14.521,62.358
+	c-16.301,0-34.904-17.333-42.675-47.733c-7.777-30.4,4.243-75.016,14.521-62.365C423.583,399.707,440.442,394.825,448.219,425.226z"
+	/>
+<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="217.0322" y1="557.499" x2="165.1699" y2="467.6709" gradientTransform="matrix(0.9868 0.0515 0.0515 0.7987 -5.5217 21.3475)">
+	<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.881-9.153-57.129-24.947-61.17C200.537,387.275,190.178,413.973,184.076,437.859
+	z"/>
+<path fill="#010101" stroke="#010101" stroke-width="4.8437" d="M314.837,65.525c72.755-12.333,165.503,89.311,165.503,187.528
+	c0,98.215-74.305,162.834-165.707,162.834"/>
+<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="194.4072" y1="374.3564" x2="358.2427" y2="90.5851">
+	<stop  offset="0" style="stop-color:#000000"/>
+	<stop  offset="1" style="stop-color:#5B3E1D"/>
+</linearGradient>
+<path fill="url(#SVGID_4_)" stroke="#010101" stroke-width="4.8437" d="M314.634,415.888c-91.402,0-165.297-64.619-165.297-162.834
+	c0-98.218,88.615-199.862,165.5-187.528"/>
+<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="297.3164" y1="139.4717" x2="418.2684" y2="-70.0234" gradientTransform="matrix(-0.6092 0.7802 -0.4118 -0.3216 476.7253 -96.4624)">
+	<stop  offset="0" style="stop-color:#8B654B"/>
+	<stop  offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path fill="url(#SVGID_5_)" d="M169.611,266.578c-27.578-21.539-16.863-81.354,23.935-133.604
+	c40.802-52.245,93.808-72.894,126.21-59.689c26.67,10.864,14.474,85.434-26.328,137.681
+	C252.63,263.215,197.193,288.112,169.611,266.578z"/>
+<circle fill="#010101" cx="214.367" cy="388.831" r="34.682"/>
+<g>
+	<path fill="#F4DFED" d="M131.831,427.709c-23.973,79.733-18.741,132.267-9.011,135.459c10.855,3.563,43.561-47.223,60.839-128.324
+		c12.189-57.265,11.727-83.75,0.009-81.625l3.505-31.111l-8.901-2.432l-14.271,32.445
+		C152.554,347.564,150.184,366.689,131.831,427.709z"/>
+	<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="148.1519" y1="319.6758" x2="148.1518" y2="563.168">
+		<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.098-26.758-24.228,14.713
+		c16.962-56.432,32.317-62.998,32.317-62.998l11.404-46.658l-4.725-1.131l-14.702,30.23c-11.429-4.588-13.859,14.521-32.392,75.485
+		c-24.224,79.655-20.501,124.085-8.358,137.776L146.41,479.117z"/>
+	
+		<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="75.7998" y1="402.9658" x2="43.9086" y2="490.7602" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
+		<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.4c0,0,6.608,60.692-7.474,93.405
+		c1.438-44.878-2.328-36.951-9.176-25.254C159.71,482.03,147.332,501.478,147.332,501.478z"/>
+	
+		<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="100.2559" y1="370.0205" x2="67.8228" y2="459.3065" gradientTransform="matrix(0.9399 -0.3414 0.3414 0.9399 -44.7892 56.207)">
+		<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.952c0,0,2.251,62.278-11.831,94.991
+		c-0.298-44.249-5.388-28.089-8.538-23.508C165.662,454.416,156.286,463.716,156.286,463.716z"/>
+	
+		<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="19.1768" y1="337.1123" x2="-32.4432" y2="389.2988" gradientTransform="matrix(0.711 -0.7032 0.7032 0.711 -56.5767 131.5096)">
+		<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.425
+		c-11.773-30.423-13.671-21.048-17.578-14.96C187.396,417.538,180.916,431.115,180.916,431.115z"/>
+	<path fill="#1E3D73" d="M174.914,335.556L158.76,362.31l-23.24,76.647c0,0,1.211-8.173,1.788-15.883l-18.783,50.773
+		c0,0,8.386-31.226,3.609-28.382c-4.777,2.84,4.225-21.91-23.102,13.729c5.316-18.514,20.495-39.508,33.324-54.9
+		c-2.172,0.474-7.1,4.788-18.387,18.374c4.38-15.232,14.957-32.934,25.358-47.898c-1.159-2.683-5.151-3.889-21.234,5.221
+		C134.366,356.719,174.914,335.556,174.914,335.556z"/>
+</g>
+<g>
+	<path fill="#F4DFED" d="M94.453,401.163c-49.752,66.752-62.779,117.913-54.719,124.242c8.987,7.059,57.064-29.51,100.989-99.844
+		c31.011-49.657,39.62-74.709,27.879-76.714l13.916-28.052l-7.539-5.319L150.496,341.1
+		C141.291,332.911,132.531,350.072,94.453,401.163z"/>
+	<path fill="#656B84" d="M90.603,454.464L62.515,464.67l55.456-49.201l10.331-14.731c0,0,12.047-24.096-27.794,5.558
+		c35.211-47.255,51.89-48.182,51.89-48.182l26.641-39.956l-4.058-2.681l-24.133,23.399c-9.177-8.222-17.989,8.911-56.224,59.885
+		c-49.96,66.6-61.634,109.635-54.889,126.645L90.603,454.464z"/>
+	<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="106.2383" y1="485.0312" x2="121.9901" y2="395.6984">
+		<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.474-75.981c0,0-14.507,59.304-38.916,85.248
+		c16.678-41.696,12.058-33.368,0-26.873C101.491,460.821,83.829,475.791,83.829,475.791z"/>
+	<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="130.9844" y1="453.7012" x2="146.8758" y2="363.5764">
+		<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.356l68.564-75.05c0,0-19.143,59.297-43.551,85.248
+		c14.824-41.701,10.567-27.993,0-25.023C124.802,430.041,105.143,443.356,105.143,443.356z"/>
+	<path fill="#656B84" d="M139.423,421.124l34.26-65.654c0,0,2.748,46.867-8.945,72.74c-0.676-32.615-3.041-28.432-11.413-20.06
+		C150.5,410.974,139.423,421.124,139.423,421.124z"/>
+	<path fill="#656B84" d="M166.408,329.256l-24.322,19.63l-48.011,64.112c0,0,3.931-7.274,7.104-14.322l-34.994,41.313
+		c0,0,18.552-26.484,13.089-25.448c-5.464,1.04,11.451-19.148-26.399,5.019c11.313-15.587,32.751-30.137,50.064-40.227
+		c-2.205-0.298-8.316,2.077-23.552,10.989c9.313-12.818,25.302-25.842,40.183-36.357c-0.175-2.919-3.515-5.416-21.74-2.346
+		C121.065,335.3,166.408,329.256,166.408,329.256z"/>
+</g>
+<g>
+	<path fill="#D9AF82" enable-background="new    " d="M315.05,115.063c-50.514,0-83.218,15.021-109.641,64.839
+		c-2.502,4.713-0.232,14.337-2.796,19.152c-13.845,26.007-37.089,48.236-37.089,71.707c0,34.337,19.1,65.637,42.505,89.297
+		c12.185,71.644,34.7,151.593,104.339,151.593"/>
+	<path fill="#010101" d="M203.271,178.766c-1.519,2.855-1.59,6.774-1.656,10.562c-0.062,3.283-0.123,6.677-1.14,8.588
+		c-4.537,8.519-10.146,16.707-15.577,24.624c-11.21,16.353-21.797,31.798-21.797,48.221c0,30.307,15.166,62.382,42.666,90.413
+		c12.578,73.606,36.115,150.477,106.6,150.477v-1.546c-67.084,0-89.722-78.554-101.95-150.453l-0.127-0.748l-0.54-0.549
+		c-26.957-27.255-41.805-58.361-41.805-87.594c0-14.923,10.174-29.766,20.949-45.482c5.501-8.027,11.192-16.327,15.857-25.087
+		c1.56-2.935,1.636-6.92,1.707-10.773c0.057-3.221,0.118-6.551,1.088-8.381c24.256-45.734,54.398-65.974,107.503-65.974v-2.422
+		C259.849,112.641,228.506,131.181,203.271,178.766z"/>
+</g>
+<path fill="#8B654B" d="M312.368,511.65c72.045,0,92.163-79.949,104.338-151.593c23.405-23.66,42.512-54.96,42.512-89.297
+	c0-37.004-22.588-49.51-38.609-77.154c-5.681-9.798-1.496-24.634-8.084-33.382c-26.905-35.728-53.772-45.162-97.475-45.162"/>
+<ellipse fill="#D9AF82" cx="313.792" cy="343.947" rx="21.906" ry="68.144"/>
+<path fill="#8B654B" d="M342.916,373.454c0,7.813-14.98,12.535-27.275,12.535c-12.293,0-27.808-4.735-27.808-12.549
+	c3.43-3.43,15.246,4.886,27.544,4.886C334.789,378.326,342.916,312.495,342.916,373.454z"/>
+<path fill="#D9AF82" d="M335.697,435.217c0,37.637-9.81,68.831-21.91,68.831c-12.096,0-21.901-31.194-21.901-68.831
+	c0-37.639,9.882-50.259,21.977-50.259C325.962,384.958,335.697,397.578,335.697,435.217z"/>
+<path opacity="0.36" fill="#8A644B" d="M328.365,281.605c-1.826,24.681-14.186-7.573-34.757,20.974
+	c-8.672,12.026-23.23,10.877-38.845,10.877c-39.61,0-66.544-26.03-67.859-38.868c-2.517-24.557,29.024-39.586,71.464-39.586
+	C297.028,235.002,329.255,269.622,328.365,281.605z"/>
+<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="214.7554" y1="341.0537" x2="290.4385" y2="341.0537">
+	<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_)" d="M272.246,361.529c-28.722,19.46-56.346-24.299-57.491-43.314
+	c15.913,13.821,62.032,18.457,75.683-2.517L272.246,361.529z"/>
+<path opacity="0.36" fill="#8A644B" d="M313.706,461.213c-38.167,0-61.231-13.681-61.231-31.63c0-6.048,15.651-24.078,37.32-49.365
+	c5.952-3.699,7.464,10.038,14.958,4.731C331.61,392.044,328.318,461.213,313.706,461.213z"/>
+<g>
+	<path fill="#8A644B" d="M260.464,472.116c8.339,23.94,32.817,36.466,52.688,36.466v-4.845
+		C294.99,503.737,268.056,493.921,260.464,472.116L260.464,472.116z"/>
+</g>
+<g>
+	<path fill="#8A644B" d="M180.954,271.658c0,21.359,5.388,36.679,27.099,48.222c0.587,1.121,7.021,13.387,7.021,13.387
+		c8.916,16.375,19.02,34.94,19.02,54.406h4.844c0-20.699-10.416-39.839-19.612-56.725l-7.586-14.455l-0.709-0.426
+		C190.509,305.4,180.954,291.289,180.954,271.658L180.954,271.658z"/>
+</g>
+<g>
+	<path fill="#010101" d="M208.814,230.649l-0.104-0.97c-3.108-15.25-3.226-33.651-0.312-49.217l-4.764-0.889
+		C200.613,195.722,205.583,214.815,208.814,230.649z"/>
+</g>
+<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="191.0591" y1="310.5205" x2="451.5771" y2="310.5205">
+	<stop  offset="0" style="stop-color:#5B3E1D"/>
+	<stop  offset="1" style="stop-color:#010101"/>
+</linearGradient>
+<path fill="url(#SVGID_13_)" d="M423.943,199.054c-3.983-11.059-0.737-20.853-8.061-31.231
+	c-19.885-28.185-51.072-56.27-108.998-52.618l5.212,140.363c0,0-122.733-25.589-121.021,15.935c0.227,5.387,40.188,2.88,63.46,4.428
+	c-26.092,4.566-32.185,5.898-32.185,8.838c0,6.206,21.863,0.683,25.108,2.467c4.976,2.739-43.139,7.052-34.351,8.757
+	c10.057,1.951,44.474,3.086,57.444,3.086c28.929,0,41.077-25.412,41.077-4.485c7.346,27.893,14.739,59.24,13.972,69.882
+	c-1.475,20.662-19.62,20.188-19.62,20.188l5.089,24.285c-8.557,0.439-6.245-1.324-13.85-0.549
+	c-14.427,0-32.354,13.032-32.354,16.054l39.989,0.435c0,0-29.081,13.771-22.975,22.928c4.763,7.143,20.316,13.378,31.091,13.424
+	c0,0,3.273,8.55,3.273,22.352c0,13.811-4.035,22.565-4.035,22.565c46.171,0,67.49-49.036,80.324-118.446
+	c6.083-32.876,20.018-58.106,36.034-71.657c15.742-13.321,23.008-26.641,23.008-52.071
+	C451.577,249.847,443.574,230.354,423.943,199.054z"/>
+<path fill="#D9AF82" d="M325.395,252.416l-13.297,4.328c0,0-65.848-96.356-46.493-121.312
+	c12.682-16.357,24.611-18.136,40.046-19.238c13.519-0.965,21.294,16.525,27.302,24.271
+	C350.375,162.927,325.395,252.416,325.395,252.416z"/>
+<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="260.7119" y1="113.4033" x2="349.5527" y2="113.4033" gradientTransform="matrix(0.676 0.6564 -0.9247 0.9523 168.3961 -132.5865)">
+	<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.283,24.357
+	c-14.513-22.972-12.896-47.545,13.854-75.082c26.74-27.547,64.922-33.847,85.28-14.081
+	C343.464,154.233,332.003,171.726,305.253,199.27z"/>
+<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="241.0796" y1="401.8057" x2="241.0796" y2="318.2148">
+	<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.274-35.419,42.799-45.106,36.896c0-45.751-17.227-80.21-17.227-80.21
+	S249.882,354.221,272.246,361.529z"/>
+<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="175.4648" y1="345.0176" x2="128.5757" y2="362.0838" gradientTransform="matrix(-1 0 0 1 538.9277 0)">
+	<stop  offset="0" style="stop-color:#382815"/>
+	<stop  offset="0.4081" style="stop-color:#553E2B"/>
+	<stop  offset="1" style="stop-color:#8B654B"/>
+</linearGradient>
+<path fill="url(#SVGID_16_)" d="M359.338,356.35c0,46.27,21.504,44.032,31.073,44.032c7.488-45.135,35.671-81.515,35.671-81.515
+	S381.703,349.045,359.338,356.35z"/>
+<path fill="none" stroke="#010101" stroke-width="4.8437" d="M173.934,294.978"/>
+<g>
+	<path fill="#010101" d="M311.507,115.089c53.106,0,83.247,20.214,107.503,65.948c0.904,1.702,0.904,4.883,0.904,7.96
+		c-0.005,4.146-0.005,8.432,2.029,11.419c16.157,23.757,31.933,48.809,31.933,70.969c0,32.381-12.818,62.458-37.074,86.969
+		l-0.541,0.549l-0.128,0.748c-12.222,71.899-36.672,150.453-103.765,150.453v1.517c70.499,0,95.847-76.845,108.416-150.456
+		c24.801-25.335,37.935-56.354,37.935-89.78c0-23.537-16.19-49.311-32.774-73.694c-1.153-1.698-1.192-5.061-1.192-8.37
+		c0-0.109,0.004-0.537,0.004-0.646c0-3.567-0.041-7.221-1.469-9.91c-25.237-47.585-56.579-66.125-111.78-66.125V115.089z"/>
+</g>
+<polygon fill="#010101" points="339.974,84.79 334.59,115.675 300.608,113.719 312.435,66.413 "/>
+<circle fill="#010101" stroke="#010101" stroke-width="4.8437" cx="452.06" cy="492.948" r="19.204"/>
+<g>
+	<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="109.1782" y1="336.3027" x2="170.7935" y2="336.3027">
+		<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.034c9.592-7.823,34.696,4.862,34.833,4.862l26.782-8.396
+		C170.211,334.501,120.246,321.648,109.178,338.034z"/>
+</g>
+<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="-102.0645" y1="221.0444" x2="-84.4219" y2="221.0444" gradientTransform="matrix(-0.0113 -0.7169 1.2476 -0.0198 36.6184 302.7065)">
+	<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_)" d="M313.352,358.852c6.074-0.1,11.045,2.653,11.102,6.149
+	c0.058,3.49-4.829,6.399-10.907,6.498c-6.078,0.101-11.045-2.657-11.107-6.153C302.388,361.854,307.269,358.946,313.352,358.852z"/>
+<path fill="#483218" d="M397.109,309.378c15.699-3.759,26.445-18.402,20.099-27.063c-38.74,19.354-75.295,11.369-85.531,9.147
+	C368.014,309.492,371.117,315.595,397.109,309.378z"/>
+<path fill="#B4B4B4" d="M310.92,73.714c-38.372,0-93.118,22.758-117.549,74.944c-6.089,12.999-6.656,32.87,0.638,45.014
+	c0,0,18.604-81.43,108.231-86.494"/>
+</svg>

data/images/account-none.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" 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>account-none</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="42.571189%" fx="50%" fy="42.571189%" r="57.428813%" id="radialGradient-1">
-            <stop stop-color="rgb(113,114,112)" offset="0%"></stop>
-            <stop stop-color="rgb(60,60,60)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(0,0,0)">
-            <path d="M6.25636752,11.5187741 C4.20816486,14.5775092 3,18.3321999 3,22.3856982 C3,31.7567891 9.30999994,39.4618424 17.6929998,40.778919 L17.6929998,49.303531 C17.6929998,50.1410367 18.2039998,50.8957889 18.9839998,51.2088565 C19.2339998,51.3085596 19.4939998,51.356417 19.7519999,51.356417 C20.3029999,51.356417 20.8429998,51.1360733 21.2399999,50.7242996 L22.9542104,48.9393602 L30.5949994,40.98331 L35.5949994,40.98331 C45.0989991,40.98331 52.8309995,32.6411552 52.8309995,22.385698 C52.8319998,12.131227 45.0989981,3.78908268 35.5950003,3.78908268 L20.2360001,3.78908268 C14.488848,3.78908268 9.3896678,6.83958098 6.25636752,11.5187741 Z M6.25636752,11.5187741" id="path432" fill="url(#radialGradient-1)"></path>
-        </g>
-    </g>
-</svg>

data/images/account-offline.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" 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>account-offline</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="40.9965298%" fx="50%" fy="40.9965298%" r="132.924116%" id="radialGradient-1">
-            <stop stop-color="rgb(254,255,254)" offset="0%"></stop>
-            <stop stop-color="rgb(178,177,177)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(0,0,0)">
-            <path d="M6.25636752,11.5187741 C4.20816486,14.5775092 3,18.3321999 3,22.3856982 C3,31.7567891 9.30999994,39.4618424 17.6929998,40.778919 L17.6929998,49.303531 C17.6929998,50.1410367 18.2039998,50.8957889 18.9839998,51.2088565 C19.2339998,51.3085596 19.4939998,51.356417 19.7519999,51.356417 C20.3029999,51.356417 20.8429998,51.1360733 21.2399999,50.7242996 L22.9542104,48.9393602 L30.5949994,40.98331 L35.5949994,40.98331 C45.0989991,40.98331 52.8309995,32.6411552 52.8309995,22.385698 C52.8319998,12.131227 45.0989981,3.78908268 35.5950003,3.78908268 L20.2360001,3.78908268 C14.488848,3.78908268 9.3896678,6.83958098 6.25636752,11.5187741 Z M6.25636752,11.5187741" id="path432" stroke="rgb(0,0,0)" stroke-width="0.25" fill="url(#radialGradient-1)"></path>
-        </g>
-    </g>
-</svg>

data/images/account-online.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="55px" height="55px" 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>account-online</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g430" fill="rgb(113,175,250)">
-            <path d="M5.25636752,11.5187741 C3.20816486,14.5775092 2,18.3321999 2,22.3856982 C2,31.7567891 8.30999994,39.4618424 16.6929998,40.778919 L16.6929998,49.303531 C16.6929998,50.1410367 17.2039998,50.8957889 17.9839998,51.2088565 C18.2339998,51.3085596 18.4939998,51.356417 18.7519999,51.356417 C19.3029999,51.356417 19.8429998,51.1360733 20.2399999,50.7242996 L21.9542104,48.9393602 L29.5949994,40.98331 L34.5949994,40.98331 C44.0989991,40.98331 51.8309995,32.6411552 51.8309995,22.385698 C51.8319998,12.131227 44.0989981,3.78908268 34.5950003,3.78908268 L19.2360001,3.78908268 C13.488848,3.78908268 8.3896678,6.83958098 5.25636752,11.5187741 Z M5.25636752,11.5187741" id="path432"></path>
-        </g>
-    </g>
-</svg>

data/images/account-settings.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="51px" 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>account-settings</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-1">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M42.6990051,13.3120117 L34.1450043,21.8679199 L31.2910004,19.3811035 L40.029007,10.6398926 L41.1909943,7.73510742 L44.7319946,5.10107422 L48.2409973,8.60595703 L45.6109924,12.1420898 Z M47.8320007,37.1010742 C50.8619995,40.1311035 50.8609924,45.0620117 47.830001,48.094075 C46.3610006,49.5630749 44.4080008,50.3710749 42.3320008,50.3710749 C40.2560008,50.3710749 38.3050009,49.563075 36.8050009,48.061075 L18.6350008,27.2010744 C16.945001,27.5510744 15.2170009,27.7350744 13.6140009,27.7350744 L13.6130009,27.7350744 C9.79200126,27.7350744 6.73800124,26.7000743 4.77900125,24.7420743 C1.4870012,21.4480747 0.0610011965,16.7530745 0.967001215,12.1790746 C1.01600121,11.9290746 1.19800121,11.7300746 1.4380012,11.6580746 C1.67900117,11.5850746 1.94000117,11.6500746 2.12000118,11.8290746 L8.08200108,17.7890746 L13.8480009,18.9820746 L18.7180008,14.1140746 L17.5240007,8.34707436 L11.5620009,2.38407454 C11.3840009,2.20707455 11.3190009,1.94407453 11.3920009,1.70407453 C11.4660009,1.46207453 11.6650009,1.28207453 11.9130009,1.23207453 C12.8040009,1.05607454 13.7180009,0.965074539 14.629001,0.965074539 C18.3490008,0.965074539 21.8470007,2.41407442 24.4750007,5.04507446 C28.4720007,9.04007435 27.4830007,16.2210746 26.9350007,18.8990746 L31.4470008,22.8290746 L32.0090008,23.3190746 Z M43.7059937,43.9680176 C42.9479936,44.7270176 41.7209936,44.7270176 40.9629936,43.9690176 L40.9619936,43.9680176 C40.2049936,43.2100176 40.2049936,41.9810176 40.9619936,41.2240176 C41.7199936,40.4680176 42.9479936,40.4680176 43.7059936,41.2260176 L43.7069936,41.2260176 C44.4629974,41.9829102 44.4629974,43.2099609 43.7059937,43.9680176 Z M17.6609955,30.9750977 L21.8529949,35.8560972 C22.5449949,36.5490971 22.5449949,37.6720971 21.8529949,38.3640971 L10.574995,49.6410975 C9.88099515,50.3320975 8.75899512,50.3320975 8.06699514,49.6410975 L3.53299522,45.1050978 C2.84099525,44.4110978 2.84099525,43.2890978 3.53299522,42.5980978 L15.1539955,30.9750977 C15.8469955,30.2830977 16.9689955,30.2830977 17.6609955,30.9750977 Z M17.6609955,30.9750977" id="Shape" fill="url(#linearGradient-1)"></path>
-    </g>
-</svg>

data/images/add-contact.svg

@@ -1,20 +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>add-contact</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-1">
-            <stop stop-color="rgb(95,88,88)" offset="0%"></stop>
-            <stop stop-color="rgb(34,31,31)" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-2">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" stroke="rgb(150,150,150)" stroke-width="1" fill="url(#linearGradient-1)">
-            <path d="M41.7720032,33.5539551 C35.769989,34.1109619 31.052002,39.1710205 31.0530045,45.3179558 C31.0530045,47.0919557 31.4560045,48.7689556 32.1580045,50.2799557 L24.0980041,50.2799557 C24.0580041,50.2919557 24.0180041,50.2979557 23.9740041,50.2979557 L9.86000377,50.2979557 C9.73200378,50.2979557 9.60800378,50.2459557 9.51900378,50.1529557 C9.42900378,50.0609557 9.37900378,49.9379557 9.38200378,49.8099557 C9.5860033,40.1639548 13.6520033,32.344955 20.2560034,28.897955 C20.4300034,28.808955 20.6390034,28.832955 20.7870034,28.958955 C22.2620035,30.2229551 24.0390035,31.1019551 25.9240035,31.4979551 C25.9260033,31.4979551 26.8810034,31.680955 28.2380034,31.680955 C29.0350033,31.680955 29.8120033,31.618955 30.5480033,31.496955 C32.4120032,31.1009549 34.1890031,30.221955 35.6620032,28.9589549 C35.8100032,28.8329549 36.0190032,28.8079549 36.1930032,28.8979549 C38.3370032,30.0169551 40.2090032,31.6009551 41.7720032,33.5539551 Z M28.2260132,28.9150391 C22.1520081,28.9150391 17.2109985,23.8580322 17.211013,17.643039 C17.211013,15.2640388 17.9400131,13.0580389 19.1740131,11.2380388 C19.2140131,11.1140388 19.2780131,10.9950388 19.3690131,10.8910388 C19.4080131,10.8460388 19.4590131,10.8220388 19.5040131,10.7870388 C21.5200133,8.10803878 24.6740131,6.37203884 28.2260132,6.37203884 C34.3000126,6.37203884 39.2390127,11.4290385 39.2390127,17.6430387 C39.2390127,23.8580389 34.2990131,28.9150391 28.2260132,28.9150391 Z M44.8389893,36.3830566 C50.303009,36.3830566 54.7520142,40.8299561 54.7519894,46.2940569 C54.7519894,51.7610569 50.3029895,56.207057 44.8389893,56.207057 C39.3719893,56.207057 34.9259892,51.7610569 34.9259892,46.2940569 C34.9259892,40.8300567 39.3719893,36.3830566 44.8389893,36.3830566 Z M44.8389893,54.6779785 C40.2149892,54.6779785 36.453989,50.9169786 36.453989,46.2939787 C36.453989,41.6719785 40.2149889,37.9119787 44.8389893,37.9119787 C49.4609895,37.9119787 53.2209892,41.6719787 53.2209892,46.2939787 C53.2210083,50.9169922 49.4609985,54.6779785 44.8389893,54.6779785 Z M46.1209874,45.1409912 L46.1209874,41.3059912 C46.1209874,40.9709912 45.8499874,40.6989912 45.5169874,40.6989912 L44.3059875,40.6989912 C43.9749875,40.6989912 43.7019875,40.9709912 43.7019875,41.3059912 L43.7019875,45.1409912 L40.0379875,45.1409912 C39.7019875,45.1409912 39.4319875,45.4119912 39.4319875,45.7469912 L39.4319875,46.8789912 C39.4319875,47.2139912 39.7029875,47.4849912 40.0379875,47.4849912 L43.7019875,47.4849912 L43.7019875,51.3579911 C43.7019875,51.6919911 43.9749875,51.9629911 44.3059875,51.9629911 L45.5169874,51.9629911 C45.8509874,51.9629911 46.1209874,51.6919911 46.1209874,51.3579911 L46.1209874,47.4849912 L49.7869873,47.4849912 C50.1209873,47.4849912 50.3919873,47.2139912 50.3919873,46.8789912 L50.3919873,45.7469912 C50.3930054,45.4110107 50.1210022,45.1409912 49.7869873,45.1409912 Z M46.1209874,45.1409912" id="Shape" fill="url(#linearGradient-2)"></path>
-        </g>
-    </g>
-</svg>

data/images/add.svg

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="82px" height="82px" 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>add</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M41,71 C57.5685433,71 71,57.5685433 71,41 C71,24.4314567 57.5685433,11 41,11 C24.4314567,11 11,24.4314567 11,41 C11,57.5685433 24.4314567,71 41,71 Z M41,71" id="Oval 1" fill="rgb(154,170,198)"></path>
-        <path d="M45.1402321,37.4080257 L45.1402321,25.8322088 C45.1402321,24.8210227 44.3242652,24 43.3216195,24 L39.6753614,24 C38.6787375,24 37.8567488,24.8210228 37.8567488,25.8322088 L37.8567488,37.4080257 L26.8246346,37.4080257 C25.812956,37.4080257 25,38.22603 25,39.2372161 L25,42.6541194 C25,43.6653056 25.8159669,44.4833098 26.8246346,44.4833098 L37.8567488,44.4833098 L37.8567488,56.1738281 C37.8567488,57.1819957 38.6787376,58 39.6753614,58 L43.3216195,58 C44.3272762,58 45.1402321,57.1819957 45.1402321,56.1738281 L45.1402321,44.4833098 L56.1783677,44.4833098 C57.1840244,44.4833098 57.9999914,43.6653056 57.9999914,42.6541194 L57.9999914,39.2372161 C58.0030567,38.2230705 57.1840693,37.4080257 56.1783677,37.4080257 L45.1402321,37.4080257 Z M45.1402321,37.4080257" id="Shape" fill="rgb(254,255,254)"></path>
-    </g>
-</svg>

data/images/advanced-settings.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="79px" height="79px" 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>advanced-settings</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="173.920641%" id="linearGradient-1">
-            <stop stop-color="rgb(123,125,121)" offset="0%"></stop>
-            <stop stop-color="rgb(0,0,0)" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group" stroke="rgb(150,150,150)" stroke-width="1">
-            <path d="M77.0386845,38.7883065 L71.392233,37.998629 C71.2219104,34.1354033 70.388362,30.4270161 68.9173943,26.9457258 L73.6038458,23.410242 C73.9057813,23.1779839 74.1070716,22.8321774 74.1612652,22.4579839 C74.2154588,22.0786291 74.112233,21.6915323 73.8825555,21.3844355 L67.3612653,12.7573389 C67.1315879,12.4528228 66.7883621,12.2541131 66.4090073,12.1973389 C66.0244912,12.1431454 65.6451363,12.2463712 65.3406202,12.4760486 L61.0154589,15.7457259 C58.1509427,13.1031452 54.8786847,11.0283067 51.2606203,9.56766127 L52.0322332,4.03217745 C52.0864267,3.65282261 51.9832009,3.26830647 51.7561041,2.96120973 C51.5264267,2.6566936 51.1832009,2.45798394 50.8064267,2.40120975 L40.1044916,0.914758202 C39.7070723,0.860564654 39.3380401,0.961209812 39.0335239,1.19346789 C38.7290078,1.42056466 38.5302981,1.76637112 38.4735239,2.14572592 L37.7638465,7.28120981 C33.7715883,7.44895174 29.9419113,8.32637111 26.3522338,9.89540339 L23.0877177,5.58314532 C22.6077177,4.94830659 21.7070725,4.82443564 21.0670725,5.301855 L12.4477179,11.8128227 C12.1432018,12.0450808 11.9419115,12.3883066 11.8877179,12.7650808 C11.8335244,13.1444356 11.9367502,13.5289518 12.1664276,13.8360485 L15.2528792,17.9263712 C12.5767503,20.8889518 10.5173952,24.233468 9.11094341,27.8954032 L3.70707218,27.1470161 C3.3251367,27.0928226 2.9457819,27.1960484 2.63868508,27.4231452 C2.3367496,27.6554033 2.13287864,27.9960484 2.08126571,28.3754032 L0.599975382,39.0747578 C0.489007636,39.8644352 1.03868506,40.5921772 1.82836251,40.7005643 L7.0541692,41.4283062 C7.28900791,45.3354031 8.21029827,49.1005644 9.80771767,52.6566929 L5.25804022,56.0941123 C4.6283628,56.5741123 4.49674994,57.4773381 4.98191119,58.1147574 L11.4954594,66.734112 C11.9754594,67.3715314 12.8786852,67.4902411 13.5109433,67.0128217 L17.9548143,63.6605636 C20.8193305,66.1870151 24.1328789,68.202499 27.6425561,69.5599185 L26.8322335,75.4592733 C26.7212657,76.2489507 27.2761045,76.9741121 28.0632012,77.0850798 L38.7625558,78.5715313 C38.827072,78.5818539 38.8967494,78.5870152 38.9638461,78.5870152 C39.6709429,78.5870152 40.2902978,78.0657248 40.3909429,77.3457249 L41.1961042,71.6089505 C44.9793299,71.3895957 48.6335234,70.5224989 52.0838457,69.0257246 L55.769007,73.9031439 C56.2541682,74.5405633 57.157394,74.6566923 57.7896521,74.1844342 L66.4167487,67.678628 C66.7238455,67.4489506 66.9225552,67.1005635 66.9767487,66.7237893 C67.0309422,66.3444345 66.9277164,65.9599183 66.7006197,65.6528216 L63.1728778,60.981854 C65.7122327,58.1766927 67.7070712,54.9947574 69.113523,51.5005636 L75.1522325,52.3392732 C75.9161035,52.4347571 76.6696519,51.8979829 76.7832003,51.1083055 L78.2722326,40.4063704 C78.3779927,39.6272051 77.82844,38.8966734 77.0386845,38.7883065 C77.0386845,38.7883065 77.82844,38.8966734 77.0386845,38.7883065 L77.0386845,38.7883065 M47.570281,50.5303679 C45.1444746,52.3652067 42.2541521,53.3355293 39.2218942,53.3355293 C34.8270556,53.3355293 30.785765,51.3303679 28.1406035,47.8284323 C23.5341519,41.730368 24.7496357,33.0206906 30.8554423,28.4064968 C33.2812487,26.571658 36.1715712,25.6039162 39.2012487,25.6039162 C43.5960872,25.6039162 47.6296358,27.6064969 50.2696358,31.1006907 C54.8812689,37.2012349 53.6734816,45.921308 47.570281,50.5303679 C47.570281,50.5303679 53.6734816,45.921308 47.570281,50.5303679 L47.570281,50.5303679" id="Shape" fill="url(#linearGradient-1)"></path>
-        </g>
-    </g>
-</svg>

data/images/album-icon.svg

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="365px" height="365px" 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-icon</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="50%" cy="50%" fx="50%" fy="50%" r="70.6690133%" id="radialGradient-1">
-            <stop stop-color="rgb(187,190,185)" offset="0%"></stop>
-            <stop stop-color="rgb(213,211,209)" offset="0.923389476%"></stop>
-            <stop stop-color="rgb(241,240,240)" offset="100%"></stop>
-        </radialGradient>
-        <path d="M183,243 C216.137087,243 243,216.137087 243,183 C243,149.862913 216.137087,123 183,123 C149.862913,123 123,149.862913 123,183 C123,216.137087 149.862913,243 183,243 Z M182.5,360 C84.4694521,360 5,280.530548 5,182.5 C5,84.4694521 84.4694521,5 182.5,5 C280.530548,5 360,84.4694521 360,182.5 C360,280.530548 280.530548,360 182.5,360 Z M182.5,360" id="path-2"></path>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="Group">
-            <use id="Oval 1" stroke="rgb(49,54,58)" stroke-width="5" fill="url(#radialGradient-1)" xlink:href="#path-2"></use>
-            <use id="Oval 1-1" stroke="none" fill="none" xlink:href="#path-2"></use>
-            <path d="M183,243 C149.862913,243 123,216.137087 123,183 C123,149.862913 149.862913,123 183,123 C216.137087,123 243,149.862913 243,183 C243,216.137087 216.137087,243 183,243 Z M183.5,209 C198.135547,209 210,197.359404 210,183 C210,168.640596 198.135547,157 183.5,157 C168.864453,157 157,168.640596 157,183 C157,197.359404 168.864453,209 183.5,209 Z M183.5,209" id="Oval 2" stroke="rgb(150,150,150)" stroke-width="1" fill="rgb(137,137,137)"></path>
-        </g>
-    </g>
-</svg>

data/images/album-placeholder-grid.svg

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="355px" height="355px" viewBox="0 0 355 355" 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>
-        <path d="M177.5,219 C200.419818,219 219,200.419818 219,177.5 C219,154.580182 200.419818,136 177.5,136 C154.580182,136 136,154.580182 136,177.5 C136,200.419818 154.580182,219 177.5,219 Z M177.5,355 C79.4694521,355 0,275.530548 0,177.5 C0,79.4694521 79.4694521,0 177.5,0 C275.530548,0 355,79.4694521 355,177.5 C355,275.530548 275.530548,355 177.5,355 Z M177.5,355" id="path-1"></path>
-        <filter x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" id="filter-2">
-            <feOffset dx="0" dy="1" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
-            <feGaussianBlur stdDeviation="1.5" in="shadowOffsetInner1" result="shadowBlurInner1"></feGaussianBlur>
-            <feComposite in="shadowBlurInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
-            <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.7 0" in="shadowInnerInner1" type="matrix" result="shadowMatrixInner1"></feColorMatrix>
-            <feMerge>
-                <feMergeNode in="SourceGraphic"></feMergeNode>
-                <feMergeNode in="shadowMatrixInner1"></feMergeNode>
-            </feMerge>
-        </filter>
-    </defs>
-    <g id="Page 1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <rect d="M-23,-22 L-23,378 L377,378 L377,-22 L-23,-22 Z M-23,-22" id="Rectangle 1" sketch:type="MSShapeGroup" x="-23" y="-22" width="400" height="400"></rect>
-        <g id="Oval 1">
-            <use fill="#0B0A0A" fill-rule="evenodd" sketch:type="MSShapeGroup" xlink:href="#path-1"></use>
-            <use fill="none" xlink:href="#path-1"></use>
-        </g>
-        <circle d="M177.5,191 C184.40356,191 190,185.40356 190,178.5 C190,171.59644 184.40356,166 177.5,166 C170.59644,166 165,171.59644 165,178.5 C165,185.40356 170.59644,191 177.5,191 Z M177.5,191" id="Oval 2" stroke="#979797" fill-opacity="0.496897978" fill="#898989" filter="url(#filter-2)" sketch:type="MSShapeGroup" cx="177.5" cy="178.5" r="12.5"></circle>
-    </g>
-</svg>

data/images/apply-check.svg

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="51px" height="50px" 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" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M46,0.75402832 L5.24000168,0.75402832 C2.78800178,0.75402832 0.791001797,2.74902833 0.791001797,5.2030282 L0.791001797,44.8820291 C0.791001797,47.3350291 2.78800178,49.3320289 5.24000168,49.3320289 L46,49.3320289 C48.4519999,49.3320289 50.4489999,47.3350289 50.4489999,44.8820291 L50.4489999,5.2030282 C50.4489746,2.74902344 48.4520264,0.75402832 46,0.75402832 L46,0.75402832 L46,0.75402832 M46.5689697,44.881958 C46.5689697,45.197958 46.3149697,45.451958 45.9999697,45.451958 L5.2399714,45.451958 C4.9249714,45.451958 4.67097139,45.197958 4.67097139,44.881958 L4.67097139,5.20295715 C4.67097139,4.88895714 4.9249714,4.63095713 5.2399714,4.63095713 L46,4.63095713 C46.315,4.63095713 46.569,4.88895711 46.569,5.20295715 L46.569,44.881958 L46.569,44.881958 L46.5689697,44.881958" id="Shape" fill="rgb(62,115,0)"></path>
-            <path d="M39.992981,11.0159912 C39.112981,10.3459912 37.857981,10.5139912 37.1889811,11.3919912 L20.0559816,33.827992 L13.6759815,26.2839919 C12.9629815,25.4409919 11.6999816,25.3349919 10.8579814,26.0479919 C10.0139815,26.7619919 9.90898144,28.0239918 10.6219814,28.865992 L18.6079815,38.3099922 C18.9889815,38.7599922 19.5469815,39.0189922 20.1349815,39.0189922 C20.1519815,39.0189922 20.1679815,39.0189922 20.1849815,39.0179922 C20.7899815,39.0029922 21.3569815,38.7139922 21.7249814,38.2329922 L40.3689805,13.8199921 C41.0390015,12.94104 40.8709717,11.6870117 39.992981,11.0159912 C39.992981,11.0159912 40.8709717,11.6870117 39.992981,11.0159912 L39.992981,11.0159912" id="Shape" fill="rgb(62,115,0)"></path>
-        </g>
-    </g>
-</svg>

data/images/arrow-down-double.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" 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>arrow-down-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 23.500000) rotate(-180.000000) translate(-22.000000, -23.500000)">
-            <g id="Page 1" fill="rgb(222,223,222)">
-                <g id="Group" fill="rgb(0,0,0)">
-                    <path d="M3.48530778,39.7090464 L40.6463071,39.7090464 C41.8023053,39.7090464 42.8623067,39.0600481 43.3873082,38.0280466 C43.6143056,37.5890474 43.7243062,37.1090479 43.7243062,36.6310472 C43.7243062,35.9940462 43.5243054,35.3570452 43.1353055,34.8230448 L24.5533067,9.24104548 C23.9743062,8.44204569 23.0483056,7.9720459 22.0633069,7.9720459 C21.0783063,7.9720459 20.1523057,8.44404554 19.5743066,9.24104548 L0.993306841,34.8230448 C0.313306834,35.7580462 0.218306865,37.0010462 0.742306854,38.0280466 C1.2672902,39.0601206 2.32832536,39.7090464 3.48530778,39.7090464 C3.48530778,39.7090464 2.32832536,39.7090464 3.48530778,39.7090464 L3.48530778,39.7090464" id="Shape" fill="rgb(99,100,99)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/arrow-right-double.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="45px" height="45px" viewBox="0 0 45 45" 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>arrow-right-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="arrow-up-double" fill="rgb(0,0,0)" transform="translate(22.000000, 22.500000) rotate(-270.000000) translate(-22.000000, -22.500000)">
-            <g id="Page 1" fill="rgb(222,223,222)">
-                <g id="Group" fill="rgb(0,0,0)">
-                    <path d="M3.76020197,38.3028483 L40.9212013,38.3028483 C42.0771995,38.3028483 43.1372009,37.65385 43.6622024,36.6218485 C43.8891998,36.1828494 43.9992004,35.7028498 43.9992004,35.2248492 C43.9992004,34.5878481 43.7991996,33.9508471 43.4101997,33.4168467 L24.8282009,7.83484741 C24.2492004,7.03584762 23.3231998,6.56584783 22.3382011,6.56584783 C21.3532005,6.56584783 20.4271999,7.03784748 19.8492008,7.83484741 L1.26820104,33.4168467 C0.588201029,34.3518481 0.49320106,35.5948481 1.01720105,36.6218485 C1.5421844,37.6539225 2.60321955,38.3028483 3.76020197,38.3028483 C3.76020197,38.3028483 2.60321955,38.3028483 3.76020197,38.3028483 L3.76020197,38.3028483" id="Shape" fill="rgb(99,100,99)"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/arrow-up-double.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="42px" height="42px" 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>arrow-up-double</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(223,223,223)" fill-rule="evenodd">
-        <g id="Group" fill="rgb(0,0,0)">
-            <path d="M2.35400391,38.0279541 L39.5150032,38.0279541 C40.6710032,38.0279541 41.7310033,37.3789541 42.2560031,36.3469541 C42.4830031,35.9079541 42.5930032,35.4279541 42.5930032,34.9499542 C42.5930032,34.3129541 42.3930032,33.6759541 42.0040032,33.1419542 L23.4220024,7.55995345 C22.8430024,6.76095343 21.9170024,6.2909534 20.9320024,6.2909534 C19.9470024,6.2909534 19.0210024,6.7629534 18.4430023,7.55995345 L-0.137997031,33.1419542 C-0.817997038,34.0769542 -0.912997007,35.3199542 -0.388997018,36.3469541 C0.135986328,37.3790283 1.19702148,38.0279541 2.35400391,38.0279541 C2.35400391,38.0279541 1.19702148,38.0279541 2.35400391,38.0279541 L2.35400391,38.0279541" id="Shape" fill="rgb(100,100,100)"></path>
-        </g>
-    </g>
-</svg>

data/images/artist-icon.svg

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="100px" height="100px" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>artist-icon</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <path d="M50,100 C22.3857613,100 0,77.6142426 0,50 C0,22.3857613 22.3857613,0 50,0 C77.6142426,0 100,22.3857613 100,50 C100,77.6142426 77.6142426,100 50,100 Z M74.9125277,41.9861298 C74.7157469,41.3412425 74.1555699,40.9001649 73.5135216,40.8849538 L65.0060053,40.7024396 L62.5053189,40.6507282 L60.0046261,40.5944519 L57.8702057,40.551864 L56.870507,40.5290521 L56.3419287,38.9335645 L51.4080563,24.0601075 C51.1969142,23.4273891 50.6295549,23 49.9932524,23 C49.3569468,23 48.788151,23.4273891 48.5770089,24.0601075 L43.644573,38.9335645 L43.1145582,40.5290521 L42.1134231,40.551864 L39.9790026,40.5944519 L37.4797495,40.6507282 L34.9804964,40.7024396 L26.4715452,40.8849538 C25.8309318,40.9001649 25.2693183,41.3412425 25.0725375,41.9861298 C24.8757582,42.6325366 25.0883384,43.3367392 25.6011158,43.742836 L38.8543392,54.2739563 L34.0368129,70.9482269 C33.8515236,71.5961533 34.0712861,72.2942746 34.5869363,72.6942902 C34.7176437,72.7946676 34.8584062,72.8692004 35.0077889,72.9193891 C35.0551886,72.9376424 35.1054579,72.9361229 35.1571669,72.9498113 C35.257712,72.9711037 35.3596936,72.996961 35.4631115,72.9984805 L35.4746031,73 C35.5694024,73 35.6627653,72.9756622 35.7575645,72.9558894 C35.8078371,72.9452464 35.8595429,72.9498113 35.908379,72.931558 C36.0548873,72.8844083 36.1942133,72.8159663 36.3234874,72.7201411 L49.9946857,62.7502581 L63.6658872,72.7201411 C63.9229925,72.9072202 64.218882,73 64.5162079,73 C64.8278983,73 65.1395887,72.8996162 65.4038762,72.6942902 C65.9180869,72.2927551 66.1378509,71.5915947 65.9525617,70.9482269 L61.1335989,54.2739563 L74.389692,43.742836 C74.8982395,43.3351625 75.1093403,42.6309408 74.9125277,41.9861298 Z M74.9125277,41.9861298" id="Oval 1" fill="rgb(69,73,82)"></path>
-    </g>
-</svg>

data/images/artist-placeholder-grid.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <title>artist-placeholder-grid</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <rect d="M0,0 L0,200 L200,200 L200,0 L0,0 Z M0,0" id="Rectangle-1" sketch:type="MSShapeGroup" x="0" y="0" width="200" height="200"></rect>
-        <g sketch:type="MSLayerGroup" transform="translate(14.000000, 6.000000)" id="artist-placeholder" fill="#9B9B9B">
-            <g sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <path d="M171,65 C171,63 169,61 166,61 L109,60 L91,3 C90,1 88,0 86,0 C83,0 82,1 81,3 L62,60 L5,61 C3,61 1,63 0,65 C0,67 0,70 2,71 L47,107 L31,165 C30,167 31,169 33,171 C35,172 37,172 39,171 L86,136 L133,171 C133,171 134,172 136,172 C137,172 138,171 139,171 C140,169 141,167 140,165 L124,107 L169,71 C171,70 172,67 171,65 C171,65 172,67 171,65 L171,65 M115,101 C113,102 112,104 113,107 L126,153 L89,125 C87,124 85,124 83,125 L45,153 L58,107 C59,104 58,102 57,101 L20,72 L66,71 C68,71 70,69 71,67 L86,21 L101,67 C101,69 103,71 106,71 L151,72 L115,101" id="Shape"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

data/images/automatic-playlist.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="107px" height="107px" 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>automatic-playlist</title>
-    <description>Created with Sketch (http://www.bohemiancoding.com/sketch)</description>
-    <defs>
-        <radialGradient cx="55.1087141%" cy="29.5365341%" fx="55.1087141%" fy="29.5365341%" r="100%" id="radialGradient-1">
-            <stop stop-color="rgb(149,198,243)" offset="0%"></stop>
-            <stop stop-color="rgb(124,142,212)" offset="100%"></stop>
-        </radialGradient>
-    </defs>
-    <g id="Page 1" fill="rgb(215,215,215)" fill-rule="evenodd">
-        <g id="g2598" fill="rgb(0,0,0)">
-            <path d="M20.0684075,81.2901123 L20.9789657,80.3761627 L28.3736486,85.5563411 L26.3575333,87.5775429 C24.502504,89.429181 24.502504,92.4457232 26.354142,94.2990568 C28.2074758,96.1523906 31.2223223,96.1523906 33.0807429,94.2990568 L37.4521008,89.9260028 C43.0087105,84.3710886 43.9158777,78.5380895 44.0939198,74.0751679 C44.1176588,73.4715203 44.1312239,72.8729597 44.126137,72.2777904 C44.1227457,70.6414986 44.0396594,69.0238586 43.9599643,67.4604792 C43.8802693,65.9310126 43.8175306,64.566023 43.8073568,63.1908597 C43.8005742,62.5685601 43.8073568,61.9479562 43.8310957,61.3358304 C43.8972257,59.8487549 44.0633983,58.2497669 44.516134,56.5795623 L52.9519391,62.4854738 C50.8357813,63.3502498 48.8077968,63.6622475 46.9392023,63.7792466 C46.9561587,64.8831078 47.0172017,66.0293599 47.0799404,67.2807417 C47.1562441,68.7627304 47.2291566,70.2141976 47.2478087,71.7080559 C53.384327,71.8182724 59.8447124,70.9823223 65.7777551,65.0492805 C71.9193604,58.9059797 72.6027032,52.2065091 72.4263565,45.8834694 C72.4077045,45.2781262 72.3839656,44.6710873 72.358531,44.0742222 C72.334792,43.5638348 72.3093574,43.0619256 72.2822272,42.5634077 C72.1499673,39.9283843 72.0160118,37.203492 72.3127487,34.6159469 C72.3907481,33.9139523 72.4958778,33.2797832 72.6213551,32.67444 C72.9180919,31.2941897 73.364045,30.0071996 73.9575188,28.7829478 C73.9575188,28.7829478 79.759797,31.8201554 80.0533419,33.0525673 C80.3468867,34.2849792 77.0808863,34.5243821 75.4191598,34.919466 C75.1444662,37.2391005 75.2733348,39.7486466 75.4055946,42.4023221 L75.4496813,43.3298368 C79.8227349,43.089056 85.3674752,42.0089338 90.6561747,36.720235 L95.0326197,32.3488769 C96.8859535,30.4938476 96.8842578,27.4756096 95.0292285,25.6256675 C93.1758947,23.7689425 90.162744,23.7689425 88.3077145,25.6222762 L87.3140699,26.6176165 L79.9176915,21.4391344 L82.0219799,19.3365417 C83.873618,17.4832079 83.873618,14.4683613 82.0202843,12.6150278 C80.165255,10.7599985 77.1504084,10.7599985 75.2987703,12.6150278 L70.9240212,16.9880814 C65.3724985,22.5413 64.4619399,28.3692118 64.2838981,32.8372216 C64.2584636,33.4408692 64.2482897,34.0428211 64.251681,34.6362948 C64.2550723,36.2437608 64.3347673,37.8291835 64.4127667,39.3637372 C64.4924618,40.9101602 64.561983,42.320932 64.5721568,43.7181389 C64.5772437,44.3421341 64.5738524,44.9627381 64.5450266,45.5765594 C64.4755054,47.1518083 64.294072,48.8491431 63.7735107,50.6244775 L55.1087939,44.559176 C57.3385596,43.5943573 59.4784561,43.2552295 61.4386153,43.1314478 C61.4199633,41.9987608 61.3589203,40.8236829 61.2961816,39.6316486 C61.2232691,38.1852683 61.1469654,36.7236272 61.1334002,35.2026389 C54.9951864,35.0924223 48.5314091,35.9317638 42.5949771,41.8681967 C36.4550673,48.0081065 35.7734208,54.7024898 35.949767,61.0255295 C35.9650278,61.6376553 35.9955493,62.2396072 36.0175926,62.8415591 L36.0938963,64.350678 C36.2244606,66.9873969 36.3618074,69.7088981 36.0650705,72.2964433 C35.9853754,73.0001335 35.8819414,73.632607 35.7547685,74.2379502 C35.4495534,75.6605915 34.9883396,76.9797988 34.3677356,78.234572 L28.2159564,73.9293439 C29.6945537,73.040829 31.2528463,72.4015729 32.9569637,71.992924 C33.2333529,69.6715939 33.1044843,67.1603523 32.9722244,64.5134597 L32.9247465,63.5842494 C28.5567799,63.8216389 23.0086482,64.9017611 17.7199494,70.1921557 L13.3468958,74.5652093 C11.4901708,76.4185431 11.4935621,79.4384766 13.3468958,81.2901146 C15.2002268,83.1451418 18.2150736,83.1451418 20.0684075,81.2901123 Z M20.0684075,81.2901123" id="path2600" fill="url(#radialGradient-1)"></path>
-        </g>
-    </g>
-</svg>