Edited ChangeLog via GitHub

(cherry picked from commit 498d7052de)

.gitignore

@@ -11,7 +11,8 @@ moc_*
 /tomahawk
 thirdparty/qtweetlib/WARNING-twitter-api-keys
 .kdev4
-tomahawk.kdev4
+*.kdev4
+*.kate-swp
 clang/
 win/
 gcc/

CMakeLists.txt

@@ -1,6 +1,6 @@
 PROJECT( tomahawk )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
+SET( CMAKE_MODULE_PATH  "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
 IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
   CMAKE_POLICY(SET CMP0017 NEW)
@@ -15,28 +15,36 @@ SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
 SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
 
 SET( TOMAHAWK_VERSION_MAJOR 0 )
-SET( TOMAHAWK_VERSION_MINOR 1 )
-SET( TOMAHAWK_VERSION_PATCH 0 )
+SET( TOMAHAWK_VERSION_MINOR 2 )
+SET( TOMAHAWK_VERSION_PATCH 2 )
 
-# SET( TOMAHAWK_VERSION_RC 0 )
+#SET( TOMAHAWK_VERSION_RC 0 )
 
-IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-  # Use the date as the tweak level.
-  INCLUDE( ${CMAKE_MODULE_PATH}/kwsysDateStamp.cmake )
-  SET( TOMAHAWK_VERSION_TWEAK "${KWSYS_DATE_STAMP_YEAR}${KWSYS_DATE_STAMP_MONTH}${KWSYS_DATE_STAMP_DAY}" )
-  INCLUDE( ${CMAKE_MODULE_PATH}/CMakeVersionSource.cmake )
-ENDIF()
 
+# build options
+option(BUILD_GUI "Build Tomahawk with GUI" ON)
+option(BUILD_RELEASE "Generate TOMAHAWK_VERSION without GIT info" OFF)
+
+# generate version string
+
+# base string used in release and unstable builds
 SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
-
-IF( ${TOMAHAWK_VERSION_TWEAK} GREATER 0)
-  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_TWEAK} )
-ENDIF()
 IF( TOMAHAWK_VERSION_RC )
-  SET( CMake_VERSION ${TOMAHAWK_VERSION}-rc${TOMAHAWK_VERSION_RC} )
+  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}rc${TOMAHAWK_VERSION_RC} )
 ENDIF()
-IF( CMAKE_VERSION_SOURCE )
-  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
+
+# additional info for non-release builds
+IF( NOT BUILD_RELEASE )
+    INCLUDE( CMakeDateStamp )
+    SET( TOMAHAWK_VERSION_DATE "${CMAKE_DATESTAMP_YEAR}${CMAKE_DATESTAMP_MONTH}${CMAKE_DATESTAMP_DAY}" )
+    IF( ${TOMAHAWK_VERSION_DATE} GREATER 0)
+        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_DATE} )
+    ENDIF()
+
+    INCLUDE( CMakeVersionSource )
+    IF( CMAKE_VERSION_SOURCE )
+        SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
+    ENDIF()
 ENDIF()
 
 
@@ -48,33 +56,29 @@ SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
 
 # installer creation
-INCLUDE( CPack.cmake )
-
-# Check if we need qtgui:
-IF( "${gui}" STREQUAL "no" )
-    ADD_DEFINITIONS( -DENABLE_HEADLESS )
-    MESSAGE( STATUS "Building in HEADLESS mode ***" )
-	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtCore QtXml QtNetwork REQUIRED )
-ELSE()
-    MESSAGE( STATUS "Building full GUI version ***" )
-	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtGui QtCore QtXml QtNetwork REQUIRED )
-ENDIF()
+INCLUDE( TomahawkCPack.cmake )
 
 #deps
 INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
-# 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)
+# 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()
 
-find_package(Phonon REQUIRED)
-if(PHONON_VERSION STRLESS "4.5.0")
-	message(FATAL_ERROR "Phonon version 4.5.0 or higher is required, you have version ${PHONON_VERSION}")
-else()
-	message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} )
+macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt.nokia.com" TRUE "" "If you see this, although libqt4-devel is installed, check whether \n     the qtwebkit-devel package is installed as well")
+
+macro_optional_find_package(Phonon 4.5.0)
+macro_log_feature(PHONON_FOUND "Phonon" "The Phonon multimedia library" "http://phonon.kde.org" TRUE "" "")
+if(PHONON_FOUND)
+    message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
 endif()
 
 macro_optional_find_package(LibEchonest 1.1.7)
@@ -88,6 +92,20 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
 
 macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
+include( CheckTagLibFileName )
+check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
+
+macro_optional_find_package(Boost)
+macro_log_feature(Boost_FOUND "Boost" "Provides free peer-reviewed portable C++ source libraries" "http://www.boost.org" TRUE "" "") #FIXME: give useful explaination
+
+
+
+# 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)
+
 
 # this installs headers and such and should really be handled in a separate package by packagers
 IF( INTERNAL_JREEN )
@@ -100,7 +118,7 @@ IF( INTERNAL_JREEN )
 ELSE( INTERNAL_JREEN )
     macro_optional_find_package(Jreen)
 ENDIF( INTERNAL_JREEN )
-macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "http://gitorious.org/jreen/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")
+macro_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")
 
 # this installs headers and such and should really be handled in a separate package by packagers
 IF( INTERNAL_QTWEETLIB )
@@ -124,10 +142,16 @@ SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
 ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
 
 # we need pthreads too
-find_package(Threads)
+macro_optional_find_package(Threads)
+macro_log_feature(THREADS_FOUND "Threads" "Threading Library" "" TRUE "" "Platform specific library for threading")
 
-find_package(KDE4Installed)
-find_package(KDE4)
+macro_optional_find_package(KDE4)
+macro_optional_find_package(KDE4Installed)
+
+# this was used before we had FindKDE4Installed, just leaving it here to keep the flags
+# for future kde integration
+
+# macro_optional_find_package(KDE4)
 IF(KDE4_FOUND)
     #KDE4 adds and removes some compiler flags that we don't like
     STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
@@ -136,9 +160,6 @@ ELSE()
     SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
 ENDIF()
 
-include( CheckTagLibFileName )
-check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
-
 IF( WIN32 )
   find_library(QTSPARKLE_LIBRARIES qtsparkle)
 ENDIF( WIN32 )

CMakeModules/AddAppIconMacro.cmake

@@ -1,3 +1,5 @@
+SET(WINDRES_EXECUTABLE  ${CMAKE_RC_COMPILER})
+
 # This macro is taken from kdelibs/cmake/modules/KDE4Macros.cmake.
 #
 # Copyright (c) 2006-2009 Alexander Neundorf, <neundorf@kde.org>

CMakeModules/CMakeDateStamp.cmake

@@ -0,0 +1,23 @@
+find_program(DATE_EXECUTABLE NAMES date)
+mark_as_advanced(DATE_EXECUTABLE)
+
+if(DATE_EXECUTABLE)
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%Y
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_YEAR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%m
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_MONTH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+  execute_process(
+    COMMAND ${DATE_EXECUTABLE} +%d
+    OUTPUT_VARIABLE CMAKE_DATESTAMP_DAY
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  )
+endif()

CMakeModules/CMakeVersionSource.cmake

@@ -5,13 +5,21 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
   mark_as_advanced(GIT_EXECUTABLE)
   if(GIT_EXECUTABLE)
     execute_process(
-      COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=4 HEAD
+      COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=7 HEAD
       OUTPUT_VARIABLE head
       OUTPUT_STRIP_TRAILING_WHITESPACE
       WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       )
     if(head)
-      set(CMAKE_VERSION_SOURCE "g${head}")
+      set(branch "")
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} name-rev HEAD
+        OUTPUT_VARIABLE branch
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+      string(REGEX REPLACE "HEAD " "" branch "${branch}")
+      set(CMAKE_VERSION_SOURCE "git-${branch}-${head}")
       execute_process(
         COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

CMakeModules/FindCLucene.cmake

@@ -12,9 +12,12 @@
 INCLUDE(CheckSymbolExists)
 INCLUDE(FindLibraryWithDebug)
 
-if(NOT CLUCENE_MIN_VERSION)
-  set(CLUCENE_MIN_VERSION "0.9.23")
-endif(NOT CLUCENE_MIN_VERSION)
+
+IF(CLucene_FIND_VERSION)
+  SET(CLUCENE_MIN_VERSION ${CLucene_FIND_VERSION})
+ELSEIF()
+  SET(CLUCENE_MIN_VERSION "0.9.23")
+ENDIF(CLucene_FIND_VERSION)
 
 IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)

CMakeModules/FindPhonon.cmake

@@ -38,14 +38,14 @@ else(PHONON_FOUND)
    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)
 
-   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   _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)
-      _phonon_find_version()
-   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+   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)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY AND NOT PHONON_VERSION VERSION_LESS ${Phonon_FIND_VERSION})
 
    if(PHONON_FOUND)
       if(NOT PHONON_FIND_QUIETLY)

CMakeModules/NSIS.template.in

@@ -21,19 +21,22 @@
 !define MING_BIN "${MING_PATH}/bin"
 !define MING_LIB "${MING_PATH}/lib"
 !define BUILD_PATH "@CMAKE_BINARY_DIR@"
+!define SOURCE_PATH "@CMAKE_SOURCE_DIR@"
 !define QT_DLL_PATH "${MING_BIN}"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
-!define NSI_PATH "@CMAKE_SOURCE_DIR@/admin/win/nsi"
+
+; 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\prefix" ; SIC! ^
+!define VLC_BIN "${VLC_PATH}\bin"
+!define VLC_PLUGIN_PATH "${VLC_BIN}\plugins"
+
+!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
 
 ;-----------------------------------------------------------------------------
-; Increment installer revision number as part of this script.
+; Installer version
 ;-----------------------------------------------------------------------------
-!define /file REVISION_LAST ${NSI_PATH}/revision.txt
-!define /math REVISION ${REVISION_LAST} + 1
-!delfile revision.txt
-!appendfile revision.txt ${REVISION}
 
 !define VER_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@"
 !define VER_MINOR "@CPACK_PACKAGE_VERSION_MINOR@"
@@ -43,7 +46,7 @@
 ;-----------------------------------------------------------------------------
 ; Installer build timestamp.
 ;-----------------------------------------------------------------------------
-!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p  (rev. ${REVISION})"
+!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p"
 
 ;-----------------------------------------------------------------------------
 ; Initial installer setup and definitions.
@@ -90,7 +93,7 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !define MUI_ICON ${NSI_PATH}\installer.ico
 !define MUI_UNICON ${NSI_PATH}\installer.ico
 !define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome.bmp
-!define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller Build Revision ${REVISION}"
+!define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller"
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
 !define MUI_HEADERIMAGE
 !define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header.bmp
@@ -200,10 +203,7 @@ Function PageReinstall
       IntCmp $R0 ${VER_MINOR} build_check new_version older_version
    build_check:
       ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
-      IntCmp $R0 ${VER_BUILD} revision_check new_version older_version
-   revision_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionRevision"
-      IntCmp $R0 ${REVISION} same_version new_version older_version
+      IntCmp $R0 ${VER_BUILD} same_version new_version older_version
 
    new_version:
       !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
@@ -327,15 +327,15 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${MING_BIN}\libdbus-1-3.dll"
    File "${MING_BIN}\dbus-daemon.exe"
 
-   File "${MING_BIN}\libphonon.dll"
+   File "${VLC_BIN}\libphonon.dll"
    SetOutPath "$INSTDIR\phonon_backend"
-   File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
+   File "${VLC_BIN}\phonon_backend\phonon_vlc.dll"
    SetOutPath "$INSTDIR"
 
    ;VLC
    ;SetOutPath "$INSTDIR\phonon_backend"
-   File "${MING_BIN}\libvlc.dll"
-   File "${MING_BIN}\libvlccore.dll"
+   File "${VLC_BIN}\libvlc.dll"
+   File "${VLC_BIN}\libvlccore.dll"
    SetOutPath "$INSTDIR\plugins"
    File /r "${VLC_PLUGIN_PATH}\*.dll"
    SetOutPath "$INSTDIR"

CMakeModules/kwsysDateStamp.cmake

@@ -1,21 +0,0 @@
-# Do not edit!  Generated by kwsysDateStamp.py
-#=============================================================================
-# KWSys - Kitware System Library
-# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-#
-# 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.
-#=============================================================================
-
-# KWSys version date year component.  Format is CCYY.
-SET(KWSYS_DATE_STAMP_YEAR  2011)
-
-# KWSys version date month component.  Format is MM.
-SET(KWSYS_DATE_STAMP_MONTH 07)
-
-# KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   06)

CPackOptions.cmake.in

@@ -3,6 +3,10 @@
 # in this file.
 
 if(CPACK_GENERATOR MATCHES "NSIS")
+  if( NOT EXISTS "@CMAKE_SOURCE_DIR@/admin/win/vlc/")
+    MESSAGE(FATAL_ERROR "\n You don't have vlc in your admin/win/ dir. \n Please change into that dir and execute 'sh update-vlc.sh'" )
+  endif()
+
   #SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
 
   # set the install/unistall icon used for the installer itself

ChangeLog

@@ -1,22 +1,97 @@
+Version 0.2.2:
+    * 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 (to playlists, queue, etc.).
+
+Version 0.2.1:
+    * Fixed crashing trying to play an unavailable track.
+    * Fixed a crash caused by using Javascript resolvers.
+    * Fixed searching with Javascript resolvers.
+
+Version 0.2.0:
+    * Re-resolve queries when their resolved-to source goes offline.
+    * Cleanup formatting of Preference/Configure and Diagnostics windows.
+    * Add selection indicator on album art.
+    * Fix inability to create Echonest playlists based solely on style or mood.
+    * Created new Artist & Album page, showing various related information.
+    * Update playlists in dashboard to keep them in sync.
+    * Support Rdio track URLs and ability to drop them onto Tomahawk.
+    * Change "Recently Played" page to "Dashboard".
+    * Prioritize resolving newer queries to make GUI more responsive.
+    * Automatically expand local collection node in sidebar on launch.
+    * Display spinner animation while searching for tracks.
+    * Let Tomahawk-headless users trigger a rescan with --filescan.
+    * Include Stations and Automatic Playlists in "New Stations and Playlists".
+    * Always keep current page and sidebar selection in sync.
+    * New icon theme and many design tweaks.
+    * Fixed bug where drop indicator wouldn't show below the last track of a
+      playlist.
+    * Added support for "playing" Spotify track URLs (and t.co and bit.ly
+      shortened track URLs) and ability to drag/drop them into Tomahawk.
+    * Added support for JSPF playlists (XSPF via JSON).
+    * Scroll per pixel to making scrolling feel more natural.
+    * Filter out duplicate tracks in Collection tree view.
+    * Spotify resolver now honors SOCKS5 proxy settings.
+    * Made "show offline sources" menu option a toggle instead of two separate
+      entries.
+    * Properly decode escaped characters coming from HTTP API.
+    * Handle/display resolver file paths becoming invalid in Preferences.
+    * Fixed track skipping-on-pause bug when using Gstreamer backend.
+    * Fixed a few crashes that could occur when fetching data from Last.fm.
+    * Made Twitter dialog more readable/understandable.
+    * Fixed streaming from https:// links.
+    * Implement new Javascript resolver API and ability to present config
+      dialogs for resolvers.
+    * Show when a track was played in the Recently Played tracks history.
+    * Added context menus for Artists and Albums.
+    * Fixed playlist bugs that would cause track to stop playing when dropping
+      or moving items in the same playlist.
+    * Set volume to 75% on startup.
+    * Added "listen along" feature (and ability to "catch up").
+    * Added "love" feature - also "loves" track on Last.fm.
+    * Twitter checks for updates less often now, saving user API calls from
+      running out when using multiple clients.
+    * Added score column and score bars to indicate resolver match certainty.
+    * Added "New Additions" page for each source.
+    * Improved tomahawk:// link handling. Added support for http://toma.hk/.
+    * Fixed sorting by file size.
+    * Improved the way Adium status is updated with now-playing information.
+    * Re-resolve tracks when a resolver is added/removed/enabled/disabled.
+    * Added global search function that searches all available sources.
+    * Collection scanner can now run automatically, watching files and dirs for
+      changes.
+    * Added Pipeline status view.
+    * Allow seeking in songs - if supported by audio backend.
+    * Added ability to make a copy of a peer's playlist.
+    * Shuffle and Repeat settings are stored on a playlist by playlist basis.
+    * (Linux) Desktop notifications for now playing.
+    * (OS X) Removed "test login" button from Last.fm settings.
+    * (OS X) Added MediaKey support.
+    * (OS X) Don't quit on window close to conform to best practices.
+
 Version 0.1.0:
     * Fixed stations so they resolve against all available sources instead of
       only local and friend's collections.
-    * Add a Song seed for stations and automatic playlists, and allow dragging of
-      any tracks to the New Stations entry to create a pre-seeded station.
+    * Add a Song seed for stations and automatic playlists, and allow dragging
+      of any tracks to the New Stations entry to create a pre-seeded station.
     * Added auto-completion for artists while filling in a station or automatic
       playlist.
     * SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
       support (yet).
-    * Support loading of - and exporting to - .xspf playlists
-    * Added Tomahawk:// protocol support and share links for many things including
-      tracks, playlists, and stations.
+    * Support loading of - and exporting to - .xspf playlists.
+    * Added Tomahawk:// protocol support and share links for many things
+      including tracks, playlists, and stations.
     * Autoload automatically detected resolvers on startup.
     * Fix issue where track resolving spinner never stopped if tracks were
       removed from playlist while resolving.
     * Twitter & Jabber profile pictures are shown.
     * Fix issues with stations where multiple tracks could be added at once.
     * Allow multiple accounts of the same type.
-    * Add new Google account type that is a thin wrapper around a Jabber plugin.
+    * Add new Google account type, a thin wrapper around a Jabber plugin.
     * Overhaul the settings dialog interface.
     * Resolvers can now be enabled and disabled, and some can be configured
       directly in Tomahawk, for example the new Spotify resolver.
@@ -24,21 +99,21 @@ Version 0.1.0:
       as a node under the Super Collection.
     * Fix massive speed bottleneck on startup in the case of many recently
       played playlists.
-    * Removed filter and song view from Super Collection, coming back in the next
-      release.
+    * Removed filter and song view from Super Collection, coming back in the
+      next release.
     * Browse and play collections in our snappy tree-mode, which also shows
       images for artists and albums.
     * Fixed crash that could occur when playing a track from a browser.
     * Fixed a crash caused by sources going on or offline.
     * Huge optimizations in the resolving pipeline.
-    * Improved the handling of automatic status messages for Google Talk
+    * Improved the handling of automatic status messages for Google Talk.
     * Switch to Phonon sound system, allowing us to support a wide variety
       of audio formats.
     * UI tweaks and cleanup.
     * (OS X) Open configuration dialogs as sliding sheets.
     * (OS X) Increase our available file watches to the maximum that the system
       reports.
-    * (OS X) Added 'Window' menu with zoom/minimize actions
+    * (OS X) Added 'Window' menu with zoom/minimize actions.
 
 Version 0.0.3:
     * Show spinner while resolving playlists.
@@ -57,8 +132,9 @@ Version 0.0.3:
     * Faster painting of playlists with lots of unresolved tracks.
     * Prefer local results when results' score is equal.
     * (Windows) The tomahawk:// protocol handler works on Windows now.
-    * (Windows) Fixed launching Tomahawk from Windows installer with admin privileges.
     * (Windows) Prevent launching a second instance on Windows.
+    * (Windows) Fixed launching Tomahawk from Windows installer with admin
+      privileges.
 
 Version 0.0.2:
     * Don't reconnect to Jabber if the settings dialog is closed successfully

admin/mac/Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -23,40 +23,42 @@
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
-    <string>10.5.0</string>
-    <key>SUFeedURL</key>
-    <string>http://download.tomahawk-player.org/sparkle</string>
-    <key>SUPublicDSAKeyFile</key>
-    <string>sparkle_pub.pem</string>
-    <key>CFBundleURLTypes</key>
-        <array>
-            <dict>
-                <key>CFBundleURLName</key>
-                <string>Tomahawk URL</string>
-                <key>CFBundleURLSchemes</key>
-                <array>
-                    <string>tomahawk</string>
-                </array>
-            </dict>
-        </array>
-    <key>CFBundleDocumentTypes</key>
-      <array>
-        <dict>
-          <key>CFBundleTypeExtensions</key>
-          <array>
-            <string>xspf</string>
-          </array>
-          <key>CFBundleTypeIconFile</key>
-          <string>Generic.icns</string>
-          <key>CFBundleTypeMIMETypes</key>
-          <array>
-            <string>application/xspf+xml</string>
-          </array>
-          <key>CFBundleTypeName</key>
-          <string>XSPF Playlist</string>
-          <key>CFBundleTypeRole</key>
-          <string>Viewer</string>
-        </dict>
-      </array>        
+	<string>10.5.0</string>
+	<key>SUFeedURL</key>
+	<string>http://download.tomahawk-player.org/sparkle/update.php</string>
+	<key>SUPublicDSAKeyFile</key>
+	<string>sparkle_pub.pem</string>
+	<key>SUEnableSystemProfiling</key>
+	<true/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>Tomahawk URL</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tomahawk</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>xspf</string>
+			</array>
+			<key>CFBundleTypeIconFile</key>
+			<string>Generic.icns</string>
+			<key>CFBundleTypeMIMETypes</key>
+			<array>
+				<string>application/xspf+xml</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>XSPF Playlist</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
 </dict>
 </plist>

admin/mac/add-Qt-to-bundle.sh

@@ -1,64 +0,0 @@
-#!/bin/sh
-# author: max@last.fm
-# usage:  Run from inside the bundle root directory, eg. Last.fm.app
-#         The first parameter should be the QtFrameworks to copy.
-#         Remaining parameters are plugins to copy, directories and files are 
-#         valid.
-# eg:     add-Qt-to-bundle.sh 'QtCore QtGui QtXml' \
-#                             imageformats \
-#                             sqldrivers/libsqlite.dylib
-################################################################################
-
-QT_FRAMEWORKS_DIR="$QTDIR/lib"
-QT_PLUGINS_DIR="$QTDIR/plugins"
-
-if [[ ! -d "$QTDIR/lib/QtCore.framework" ]]
-then
-    # this dir is the location of install for the official Trolltech dmg 
-    if [[ -d /Library/Frameworks/QtCore.framework ]]
-    then
-        QT_FRAMEWORKS_DIR=/Library/Frameworks
-        QT_PLUGINS_DIR=/Developer/Applications/Qt/plugins
-    fi
-fi
-
-echo "Plugins go to: $QT_PLUGINS_DIR"
-
-if [ -z $QTDIR ]
-then
-    echo QTDIR must be set, or install the official Qt dmg
-    exit 1
-fi
-################################################################################
-
-
-#first frameworks
-mkdir -p Contents/Frameworks
-for x in $1
-do
-    echo "C $x"
-    cp -R $QT_FRAMEWORKS_DIR/$x.framework Contents/Frameworks/
-    chmod -R u+rw Contents/Frameworks/
-done
-
-#plugins
-shift
-mkdir -p Contents/MacOS
-mkdir -p Contents/MacOS/sqldrivers
-mkdir -p Contents/MacOS/imageformats
-mkdir -p Contents/MacOS/phonon_backend
-mkdir -p Contents/MacOS/crypto
-
-cp -R $QT_PLUGINS_DIR/sqldrivers/libqsqlite.dylib Contents/MacOS/sqldrivers/
-cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/
-cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/
-cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/
-cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/
-#cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/
-#cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/
-cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/
-cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/
-
-#cleanup
-find Contents/Frameworks -name Headers -o -name \*.prl -o -name \*_debug | xargs rm -rf
-find Contents -name \*_debug -o -name \*_debug.dylib | xargs rm

admin/mac/add-spotify.sh

@@ -1,16 +0,0 @@
-#!/bin/sh
-# author: lfranchi@kde.org
-# usage:  Run from inside the bundle root directory, eg. Tomahawk.app
-#         The first parameter should be the spotify resolver binary to copy.
-# eg:     add-spotify.sh /path/to/spotify_tomahawkresolver
-################################################################################
-
-mkdir -p Contents/Frameworks
-cp -R /Library/Frameworks/libspotify.framework Contents/Frameworks
-
-install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtCore.framework/Versions/4/QtCore  @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $1
-install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtNetwork.framework/Versions/4/QtNetwork  @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $1
-install_name_tool -change libqjson.0.dylib  @executable_path/libqjson.0.7.1.dylib $1
-install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
-mkdir -p Contents/MacOS
-cp $1 Contents/MacOS/

admin/mac/build-release-osx.sh

@@ -23,65 +23,28 @@ then
 fi
 
 ROOT=`pwd`
-
-QTDIR=`which qmake`
-LINKDIR=`readlink $QTDIR`
-QTDIR=`dirname $QTDIR`
-QTDIR=$QTDIR/`dirname $LINKDIR`
-QTDIR=`dirname $QTDIR`
-test -L "$QTDIR" && QTDIR=`readlink $QTDIR`
-
-echo "Goes here: $QTDIR"
-
-export QMAKESPEC='macx-g++'
-export QTDIR
-export VERSION
-export QTVERSION='4.7.3'
-################################################################################
-
-
-CLEAN='1'
-BUILD='1'
-NOTQUICK='1'
-CREATEDMG='1'
 VERSION=$1
 
-    header "Adding Qt to app bundle"
-    cd tomahawk.app
-    $ROOT/../admin/mac/add-Qt-to-bundle.sh \
-                   'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit phonon'
-#                   'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit QtDbus phonon'
+################################################################################
 
-    header "Renaming files"
+    mv tomahawk.app Tomahawk.app
+    mv Tomahawk.app/Contents/MacOS/tomahawk Tomahawk.app/Contents/MacOS/Tomahawk
+
+    header "Fixing and copying libraries"
+    $ROOT/../admin/mac/macdeploy.py Tomahawk.app quiet
+
+    cd Tomahawk.app
+
+    header "Renaming icon"
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
-    mv Contents/MacOS/tomahawk Contents/MacOS/Tomahawk
-#    cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
+    cp $ROOT/../admin/mac/qt.conf Contents/Resources/qt.conf
 
-    header "Copying VLC plugins into bundle"
-    mkdir -p Contents/plugins
-    cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/plugins
-    rm -rf Contents/plugins/video_* Contents/plugins/gui Contents/plugins/*/libold* Contents/plugins/*/libvcd* Contents/plugins/*/libdvd* \
-           Contents/plugins/*/liblibass* Contents/plugins/*/libx264* Contents/plugins/*/libschroe* Contents/plugins/*/liblibmpeg2* \
-           Contents/plugins/*/libstream_out_* Contents/plugins/*/libmjpeg_plugin* Contents/plugins/*/libh264_plugin* Contents/plugins/*/libzvbi_plugin* Contents/plugins/*/lib*sub*
-
-    header "Running install_name_tool"
-    $ROOT/../admin/mac/deposx.sh
-
-    header "Copying Sparkle pubkey & framework, and qt.conf"
-    cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
+    header "Copying Sparkle framework"
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
-    cp $ROOT/../admin/mac/qt.conf Contents/Resources
-
-    header "Adding spotify resolver to bundle if spotify_tomahawkresolver found in $ROOT"
-    if [ -e $ROOT/spotify_tomahawkresolver ]
-       then
-        header "Found, so adding spotify resolver."ac
-        $ROOT/../admin/mac/add-spotify.sh $ROOT/spotify_tomahawkresolver
-    fi
 
     header "Creating DMG"
     cd ..
-    mv tomahawk.app Tomahawk.app
+
     $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
     mv Tomahawk.dmg Tomahawk-$VERSION.dmg
     

admin/mac/deposx.sh

@@ -1,169 +0,0 @@
-#!/bin/sh
-# author: max@last.fm, chris@last.fm
-################################################################################
-
-
-if [ -z $QTDIR ]
-then
-    echo QTDIR must be set
-    exit 1
-fi
-
-if [ -z $QTVERSION ]
-then
-    echo QTVERSION must be set
-    exit 1
-fi
-
-cd ..
-ORIGROOT=`pwd`
-cd -
-
-cd Contents
-
-QTLIBS=`ls Frameworks | cut -d. -f1`
-LIBS=`cd MacOS && ls -fR1 | grep dylib`
-PLUGINFOLDERS=`ls plugins | cut -d. -f1`
-
-################################################################################
-
-
-function import_lib
-{
-    echo "L \`$1'"
-    cp -R -L $1 MacOS/`basename $1`
-    chmod u+rw MacOS/`basename $1`
-    deplib_change MacOS/`basename $1`
-    deposx_change MacOS/`basename $1`
-}
-
-function deposx_change 
-{
-    echo "D \`$1'"
-    echo $QTDIR
-    
-    for y in $QTLIBS
-    do
-        install_name_tool -change $QTDIR/lib/$y.framework/Versions/4/$y \
-                          @executable_path/../Frameworks/$y.framework/Versions/4/$y \
-                          "$1"
-
-        install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \
-                          @executable_path/../Frameworks/$y.framework/Versions/4/$y \
-                          "$1"
-
-        install_name_tool -change /usr/X11/lib/libpng12.0.dylib \
-                          @executable_path/libpng12.0.dylib \
-                          "$1"
-    done
-    
-    for y in $LIBS
-    do
-        install_name_tool -change $y \
-                          @executable_path/$y \
-                          "$1"
-    done
-}
-
-function deplib_change
-{
-    install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
-    install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
-    install_name_tool -change /usr/local/lib/libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
-    install_name_tool -change /usr/local/lib/libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
-    install_name_tool -change /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib @executable_path/libtag.1.7.0.dylib $1
-#    install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
-#    install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
-#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib @executable_path/libvorbis.0.dylib $1
-#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib @executable_path/libvorbisfile.3.dylib $1
-#    install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1
-#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1
-#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1
-    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib  @executable_path/libphonon.4.dylib $1
-    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.5.0.dylib  @executable_path/libphonon.4.dylib $1
-
-    install_name_tool -change $ORIGROOT/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_sipjabber.dylib @executable_path/libtomahawk_sipjabber.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_sipgoogle.dylib @executable_path/libtomahawk_sipgoogle.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_siptwitter.dylib @executable_path/libtomahawk_siptwitter.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_sipzeroconf.dylib @executable_path/libtomahawk_sipzeroconf.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1
-    install_name_tool -change $ORIGROOT/libtomahawk_portfwd.dylib @executable_path/libtomahawk_portfwd.dylib $1
-    install_name_tool -change $ORIGROOT/libjreen.dylib  @executable_path/libjreen.dylib $1
-    install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib  @executable_path/libjreen.dylib $1
-    install_name_tool -change /usr/local/Cellar/qca/2.0.2/lib/qca.framework/Versions/2/qca  @executable_path/../Frameworks/qca.framework/Versions/2/qca $1
-    install_name_tool -change /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib  @executable_path/libintl.8.dylib $1
-    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib   @executable_path/libvlc.5.dylib $1
-    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib  @executable_path/libvlccore.4.dylib $1
-
-    install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.7.1.dylib $1
-    install_name_tool -change libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
-    install_name_tool -change libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
-    install_name_tool -change libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
-}
-
-################################################################################
-
-
-# first all libraries and executables
-find MacOS -type f -a -perm -100 | while read x
-do
-    echo $x
-    y=$(file "$x" | grep 'Mach-O')
-    deposx_change "$x"
-    deplib_change "$x"
-done
-
-import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib
-import_lib /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib
-#import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
-#import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib
-#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib
-#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib
-#import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
-#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
-#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
-import_lib /usr/local/lib/libechonest.1.1.dylib
-import_lib /usr/local/lib/libclucene-core.1.dylib
-import_lib /usr/local/lib/libclucene-shared.1.dylib
-import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib
-import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib
-import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib
-import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib
-import_lib /usr/X11/lib/libpng12.0.dylib
-
-import_lib $ORIGROOT/libjreen.dylib
-import_lib $ORIGROOT/libtomahawklib.dylib
-import_lib $ORIGROOT/libtomahawk_sipjabber.dylib
-import_lib $ORIGROOT/libtomahawk_sipgoogle.dylib
-import_lib $ORIGROOT/libtomahawk_siptwitter.dylib
-import_lib $ORIGROOT/libtomahawk_sipzeroconf.dylib
-import_lib $ORIGROOT/libtomahawk_qtweetlib.dylib
-import_lib $ORIGROOT/libtomahawk_portfwd.dylib
-
-cp -R  /usr/local/Cellar/qca/2.0.2/lib/qca.framework Frameworks/
-chmod 644 Frameworks/qca.framework/Versions/2/qca
-deplib_change Frameworks/qca.framework/Versions/2/qca
-deposx_change Frameworks/qca.framework/Versions/2/qca
-
-# now Qt
-for x in $QTLIBS
-do
-    echo `pwd`
-#    ls -l Frameworks/$x.framework/Versions/4/$x
-    deposx_change Frameworks/$x.framework/Versions/4/$x
-    install_name_tool -id @executable_path/../Frameworks/$x.framework/Versions/4/$x \
-                      Frameworks/$x.framework/Versions/4/$x
-    deplib_change "Frameworks/$x.framework/Versions/4/$x"
-done
-
-# now VLC plugins
-for x in plugins/$PLUGINFOLDERS
-do
-    for plugin in `ls plugins/$x | cut -f1`
-    do
-        echo "Fixing VLC plugin: $plugin"
-        chmod 644 plugins/$x/$plugin
-        deplib_change plugins/$x/$plugin
-    done
-done

admin/mac/macdeploy.py

@@ -0,0 +1,517 @@
+#!/usr/bin/python
+
+#  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
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  Clementine is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import re
+import subprocess
+import sys
+
+FRAMEWORK_SEARCH_PATH=[
+    '/Library/Frameworks',
+    os.path.join(os.environ['HOME'], 'Library/Frameworks')
+]
+
+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_ftp_plugin.dylib',
+  'access/libaccess_http_plugin.dylib',
+  'access/libaccess_imem_plugin.dylib',
+  'access/libaccess_mmap_plugin.dylib',
+  'access/libaccess_mms_plugin.dylib',
+  'access/libaccess_realrtsp_plugin.dylib',
+  'access/libaccess_tcp_plugin.dylib',
+  'access/libaccess_udp_plugin.dylib',
+  'access/libcdda_plugin.dylib',
+  'access/libfilesystem_plugin.dylib',
+  'access/libqtcapture_plugin.dylib',
+  'access/librtp_plugin.dylib',
+  'access/libzip_plugin.dylib',
+  'access_output/libaccess_output_dummy_plugin.dylib',
+  'access_output/libaccess_output_file_plugin.dylib',
+  'access_output/libaccess_output_http_plugin.dylib',
+  'access_output/libaccess_output_shout_plugin.dylib',
+  'access_output/libaccess_output_udp_plugin.dylib',
+  'audio_filter/liba52tofloat32_plugin.dylib',
+  'audio_filter/liba52tospdif_plugin.dylib',
+  'audio_filter/libaudio_format_plugin.dylib',
+  'audio_filter/libaudiobargraph_a_plugin.dylib',
+  'audio_filter/libchorus_flanger_plugin.dylib',
+  'audio_filter/libconverter_fixed_plugin.dylib',
+  'audio_filter/libdolby_surround_decoder_plugin.dylib',
+  'audio_filter/libdtstofloat32_plugin.dylib',
+  'audio_filter/libdtstospdif_plugin.dylib',
+  'audio_filter/libequalizer_plugin.dylib',
+  'audio_filter/libheadphone_channel_mixer_plugin.dylib',
+  'audio_filter/libmono_plugin.dylib',
+  'audio_filter/libmpgatofixed32_plugin.dylib',
+  'audio_filter/libnormvol_plugin.dylib',
+  'audio_filter/libparam_eq_plugin.dylib',
+  'audio_filter/libscaletempo_plugin.dylib',
+  'audio_filter/libsimple_channel_mixer_plugin.dylib',
+  'audio_filter/libspatializer_plugin.dylib',
+  'audio_filter/libtrivial_channel_mixer_plugin.dylib',
+  'audio_filter/libugly_resampler_plugin.dylib',
+  'audio_mixer/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',
+  'codec/libaes3_plugin.dylib',
+  'codec/libaraw_plugin.dylib',
+  'codec/libavcodec_plugin.dylib',
+  'codec/libcc_plugin.dylib',
+  'codec/libcdg_plugin.dylib',
+  'codec/libdts_plugin.dylib',
+  'codec/libfaad_plugin.dylib',
+  'codec/libfake_plugin.dylib',
+  'codec/libflac_plugin.dylib',
+  'codec/libfluidsynth_plugin.dylib',
+  'codec/libinvmem_plugin.dylib',
+  'codec/liblpcm_plugin.dylib',
+  'codec/libmpeg_audio_plugin.dylib',
+  'codec/libpng_plugin.dylib',
+  'codec/librawvideo_plugin.dylib',
+  'codec/libspeex_plugin.dylib',
+  'codec/libspudec_plugin.dylib',
+  'codec/libtheora_plugin.dylib',
+  'codec/libtwolame_plugin.dylib',
+  'codec/libvorbis_plugin.dylib',
+  'control/libgestures_plugin.dylib',
+  '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',
+  #'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',
+  'demux/liblive555_plugin.dylib',
+  'demux/libmkv_plugin.dylib',
+  'demux/libmod_plugin.dylib',
+  'demux/libmp4_plugin.dylib',
+  'demux/libmpc_plugin.dylib',
+  'demux/libmpgv_plugin.dylib',
+  'demux/libnsc_plugin.dylib',
+  'demux/libnsv_plugin.dylib',
+  'demux/libnuv_plugin.dylib',
+  'demux/libogg_plugin.dylib',
+  'demux/libplaylist_plugin.dylib',
+  'demux/libps_plugin.dylib',
+  'demux/libpva_plugin.dylib',
+  'demux/librawaud_plugin.dylib',
+  'demux/librawdv_plugin.dylib',
+  'demux/librawvid_plugin.dylib',
+  'demux/libreal_plugin.dylib',
+  'demux/libsmf_plugin.dylib',
+  'demux/libts_plugin.dylib',
+  'demux/libtta_plugin.dylib',
+  'demux/libty_plugin.dylib',
+  'demux/libvc1_plugin.dylib',
+  'demux/libvoc_plugin.dylib',
+  'demux/libwav_plugin.dylib',
+  'demux/libxa_plugin.dylib',
+  'meta_engine/libfolder_plugin.dylib',
+  'meta_engine/libtaglib_plugin.dylib',
+  'misc/libaudioscrobbler_plugin.dylib',
+  'misc/libdummy_plugin.dylib',
+  'misc/libexport_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',
+  'misc/libxtag_plugin.dylib',
+  'mmx/libi420_rgb_mmx_plugin.dylib',
+  'mmx/libi420_yuy2_mmx_plugin.dylib',
+  'mmx/libi422_yuy2_mmx_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',
+  'mux/libmux_mp4_plugin.dylib',
+  'mux/libmux_mpjpeg_plugin.dylib',
+  'mux/libmux_ogg_plugin.dylib',
+  'mux/libmux_ps_plugin.dylib',
+  'mux/libmux_ts_plugin.dylib',
+  'mux/libmux_wav_plugin.dylib',
+  'packetizer/libpacketizer_copy_plugin.dylib',
+  'packetizer/libpacketizer_dirac_plugin.dylib',
+  'packetizer/libpacketizer_flac_plugin.dylib',
+  'packetizer/libpacketizer_h264_plugin.dylib',
+  'packetizer/libpacketizer_mlp_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4audio_plugin.dylib',
+  'packetizer/libpacketizer_mpeg4video_plugin.dylib',
+  'packetizer/libpacketizer_mpegvideo_plugin.dylib',
+  'packetizer/libpacketizer_vc1_plugin.dylib',
+  'sse2/libi420_rgb_sse2_plugin.dylib',
+  'sse2/libi420_yuy2_sse2_plugin.dylib',
+  'sse2/libi422_yuy2_sse2_plugin.dylib',
+  'stream_filter/libdecomp_plugin.dylib',
+  'stream_filter/libstream_filter_rar_plugin.dylib',
+  'stream_filter/libstream_filter_record_plugin.dylib',
+  'visualization/libvisual_plugin.dylib',
+]
+
+VLC_SEARCH_PATH=[
+    '/usr/local/lib/vlc/plugins/',
+]
+
+QT_PLUGINS = [
+    'crypto/libqca-ossl.dylib',
+    'phonon_backend/phonon_vlc.so',
+    'sqldrivers/libqsqlite.dylib',
+    'imageformats/libqgif.dylib',
+    'imageformats/libqico.dylib',
+    'imageformats/libqjpeg.dylib',
+    'imageformats/libqmng.dylib',
+]
+
+TOMAHAWK_PLUGINS = [
+  'libtomahawk_sipjabber.dylib',
+  'libtomahawk_sipgoogle.dylib',
+  'libtomahawk_siptwitter.dylib',
+  'libtomahawk_sipzeroconf.dylib',
+  'libtomahawk_qtweetlib.dylib',
+]
+
+QT_PLUGINS_SEARCH_PATH=[
+    '/usr/local/Cellar/qt/4.7.3/plugins',
+]
+
+
+class Error(Exception):
+  pass
+
+
+class CouldNotFindQtPluginErrorFindFrameworkError(Error):
+  pass
+
+
+class InstallNameToolError(Error):
+  pass
+
+
+class CouldNotFindQtPluginError(Error):
+  pass
+
+
+class CouldNotFindVLCPluginError(Error):
+  pass
+
+
+class CouldNotFindScriptPluginError(Error):
+  pass
+
+
+
+if len(sys.argv) < 2:
+  print 'Usage: %s <bundle.app>' % sys.argv[0]
+
+bundle_dir = sys.argv[1]
+
+bundle_name = os.path.basename(bundle_dir).split('.')[0]
+
+commands = []
+
+binary_dir = os.path.join(bundle_dir, 'Contents', 'MacOS')
+frameworks_dir = os.path.join(bundle_dir, 'Contents', 'Frameworks')
+commands.append(['mkdir', '-p', frameworks_dir])
+resources_dir = os.path.join(bundle_dir, 'Contents', 'Resources')
+commands.append(['mkdir', '-p', resources_dir])
+plugins_dir = os.path.join(bundle_dir, 'Contents', 'PlugIns')
+binary = os.path.join(bundle_dir, 'Contents', 'MacOS', bundle_name)
+
+fixed_libraries = []
+fixed_frameworks = []
+
+def GetBrokenLibraries(binary):
+  #print "Checking libs for binary: %s" % binary
+  output = subprocess.Popen(['otool', '-L', binary], stdout=subprocess.PIPE).communicate()[0]
+  broken_libs = {
+      'frameworks': [],
+      'libs': []}
+  for line in [x.split(' ')[0].lstrip() for x in output.split('\n')[1:]]:
+    #print "Checking line: %s" % line
+    if not line:  # skip empty lines
+      continue
+    if os.path.basename(binary) == os.path.basename(line):
+      #print "mnope %s-%s" % (os.path.basename(binary), os.path.basename(line))
+      continue
+    if re.match(r'^\s*/System/', line):
+      continue  # System framework
+    elif re.match(r'^\s*/usr/lib/', line):
+      #print "unix style system lib"
+      continue  # unix style system library
+    elif re.match(r'Breakpad', line):
+      continue  # Manually added by cmake.
+    elif re.match(r'^\s*@executable_path', line) or re.match(r'^\s*@loader_path', line):
+      # Potentially already fixed library
+      if '.framework' in line:
+        relative_path = os.path.join(*line.split('/')[3:])
+        if not os.path.exists(os.path.join(frameworks_dir, relative_path)):
+          broken_libs['frameworks'].append(relative_path)
+      else:
+        relative_path = os.path.join(*line.split('/')[1:])
+        #print "RELPATH %s %s" % (relative_path, os.path.join(binary_dir, relative_path))
+        if not os.path.exists(os.path.join(binary_dir, relative_path)):
+          broken_libs['libs'].append(relative_path)
+    elif re.search(r'\w+\.framework', line):
+      broken_libs['frameworks'].append(line)
+    else:
+      broken_libs['libs'].append(line)
+
+  return broken_libs
+
+def FindFramework(path):
+  for search_path in FRAMEWORK_SEARCH_PATH:
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+
+  raise CouldNotFindFrameworkError(path)
+
+def FindLibrary(path):
+  if os.path.exists(path):
+    return path
+  for search_path in LIBRARY_SEARCH_PATH:
+    abs_path = os.path.join(search_path, path)
+    if os.path.exists(abs_path):
+      return abs_path
+    else: # try harder---look for lib name in library folders
+      newpath = os.path.join(search_path,os.path.basename(path))
+      if os.path.exists(newpath):
+        return newpath
+
+  return ""
+  #raise CouldNotFindFrameworkError(path)
+
+def FixAllLibraries(broken_libs):
+  for framework in broken_libs['frameworks']:
+    FixFramework(framework)
+  for lib in broken_libs['libs']:
+    FixLibrary(lib)
+
+def FixFramework(path):
+  if path in fixed_libraries:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindFramework(path)
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyFramework(abs_path)
+  id = os.sep.join(new_path.split(os.sep)[3:])
+  FixFrameworkId(new_path, id)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixLibrary(path):
+  if path in fixed_libraries or FindSystemLibrary(os.path.basename(path)) is not None:
+    return
+  else:
+    fixed_libraries.append(path)
+  abs_path = FindLibrary(path)
+  if abs_path == "":
+    print "Could not resolve %s, not fixing!" % path
+    return
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyLibrary(abs_path)
+  FixLibraryId(new_path)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixVLCPlugin(abs_path, subdir):
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  #print "Copying plugin....%s %s %s" % (plugins_dir, subdir, os.path.join(abs_path.split('/')[-2:]))
+  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]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixPlugin(abs_path, subdir):
+  broken_libs = GetBrokenLibraries(abs_path)
+  FixAllLibraries(broken_libs)
+
+  new_path = CopyPlugin(abs_path, subdir)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, new_path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, new_path)
+
+def FixBinary(path):
+  broken_libs = GetBrokenLibraries(path)
+  FixAllLibraries(broken_libs)
+  for framework in broken_libs['frameworks']:
+    FixFrameworkInstallPath(framework, path)
+  for library in broken_libs['libs']:
+    FixLibraryInstallPath(library, path)
+
+def CopyLibrary(path):
+  new_path = os.path.join(frameworks_dir, os.path.basename(path))
+  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyPlugin(path, subdir):
+  new_path = os.path.join(plugins_dir, subdir, os.path.basename(path))
+  args = ['mkdir', '-p', os.path.dirname(new_path)]
+  commands.append(args)
+  args = ['ditto', '--arch=i386', '--arch=x86_64', path, new_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', new_path]
+  commands.append(args)
+  return new_path
+
+def CopyFramework(path):
+  parts = path.split(os.sep)
+  for i, part in enumerate(parts):
+    if re.match(r'\w+\.framework', part):
+      full_path = os.path.join(frameworks_dir, *parts[i:-1])
+      break
+  args = ['mkdir', '-p', full_path]
+  commands.append(args)
+  args = ['ditto', '--arch=i386', '--arch=x86_64', path, full_path]
+  commands.append(args)
+  args = ['chmod', 'u+w', os.path.join(full_path, parts[-1])]
+  commands.append(args)
+
+  menu_nib = os.path.join(os.path.split(path)[0], 'Resources', 'qt_menu.nib')
+  if os.path.exists(menu_nib):
+    args = ['cp', '-r', menu_nib, resources_dir]
+    commands.append(args)
+
+  return os.path.join(full_path, parts[-1])
+
+def FixId(path, library_name):
+  id = '@executable_path/../Frameworks/%s' % library_name
+  args = ['install_name_tool', '-id', id, path]
+  commands.append(args)
+
+def FixLibraryId(path):
+  library_name = os.path.basename(path)
+  FixId(path, library_name)
+
+def FixFrameworkId(path, id):
+  FixId(path, id)
+
+def FixInstallPath(library_path, library, new_path):
+  args = ['install_name_tool', '-change', library_path, new_path, library]
+  commands.append(args)
+
+def FindSystemLibrary(library_name):
+  for path in ['/lib', '/usr/lib']:
+    full_path = os.path.join(path, library_name)
+    if os.path.exists(full_path):
+      return full_path
+  return None
+
+def FixLibraryInstallPath(library_path, library):
+  system_library = FindSystemLibrary(os.path.basename(library_path))
+  if system_library is None:
+    new_path = '@executable_path/../Frameworks/%s' % os.path.basename(library_path)
+    FixInstallPath(library_path, library, new_path)
+  else:
+    FixInstallPath(library_path, library, system_library)
+
+def FixFrameworkInstallPath(library_path, library):
+  parts = library_path.split(os.sep)
+  for i, part in enumerate(parts):
+    if re.match(r'\w+\.framework', part):
+      full_path = os.path.join(*parts[i:])
+      break
+  new_path = '@executable_path/../Frameworks/%s' % full_path
+  FixInstallPath(library_path, library, new_path)
+
+def FindQtPlugin(name):
+  for path in QT_PLUGINS_SEARCH_PATH:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindQtPluginError(name)
+
+
+def FindVLCPlugin(name):
+  for path in VLC_SEARCH_PATH:
+    if os.path.exists(path):
+      if os.path.exists(os.path.join(path, name)):
+        return os.path.join(path, name)
+  raise CouldNotFindVLCPluginError(name)
+
+FixBinary(binary)
+
+for plugin in VLC_PLUGINS:
+  FixVLCPlugin(FindVLCPlugin(plugin), '.')
+
+for plugin in TOMAHAWK_PLUGINS:
+  FixPlugin(plugin, '../MacOS')
+
+try:
+  FixPlugin('spotify_tomahawkresolver', '../MacOS')
+except:
+  print 'Failed to find spotify resolver'
+
+for plugin in QT_PLUGINS:
+  FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
+
+if len(sys.argv) <= 2:
+  print 'Would run %d commands:' % len(commands)
+  for command in commands:
+    print ' '.join(command)
+
+  print 'OK?'
+  raw_input()
+
+for command in commands:
+  p = subprocess.Popen(command)
+  os.waitpid(p.pid, 0)

admin/mac/qt.conf

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

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -1,20 +1,27 @@
+SET(MINGW_PREFIX  "i686-w64-mingw32")
+
 # this one is important
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER ccache i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER ccache i686-w64-mingw32-g++)
+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/i686-w64-mingw32/sys-root/mingw)
+SET(CMAKE_FIND_ROOT_PATH  /usr/${MINGW_PREFIX}/sys-root/mingw)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE  ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM  NEVER)
 
-# windres executable for application icon support
-SET(WINDRES_EXECUTABLE /usr/bin/i686-w64-mingw32-windres)
+
 
 # libs with broken find modules
 SET(TAGLIB_FOUND true)
 SET(TAGLIB_LIBRARIES  ${CMAKE_FIND_ROOT_PATH}/lib/libtag.dll.a)
 SET(TAGLIB_INCLUDES   ${CMAKE_FIND_ROOT_PATH}/include/taglib)
+
+SET(QT_PLUGINS_DIR  ${CMAKE_FIND_ROOT_PATH}/lib/qt4/plugins/)
+SET(QT_QTUITOOLS_LIBRARY_RELEASE  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiTools.a)
+SET(QT_QTUITOOLS_LIBRARY_DEBUG  ${CMAKE_FIND_ROOT_PATH}/lib/libQtUiToolsd.a)
+SET(QT_QTUITOOLS_LIBRARY  ${QT_QTUITOOLS_LIBRARY_RELEASE})

admin/win/nsi/revision.txt

@@ -1 +0,0 @@
-122

admin/win/nsi/tomahawk.nsi

@@ -1,667 +0,0 @@
-;Tomahawk installer script.
-
-;-----------------------------------------------------------------------------
-; Some installer script options (comment-out options not required)
-;-----------------------------------------------------------------------------
-;!define OPTION_LICENSE_AGREEMENT
-!define OPTION_UAC_PLUGIN_ENHANCED
-!define OPTION_SECTION_SC_START_MENU
-!define OPTION_SECTION_SC_DESKTOP
-!define OPTION_SECTION_SC_QUICK_LAUNCH
-!define OPTION_FINISHPAGE
-!define OPTION_FINISHPAGE_LAUNCHER
-!define OPTION_FINISHPAGE_RELEASE_NOTES
-
-;-----------------------------------------------------------------------------
-; Some paths.
-;-----------------------------------------------------------------------------
-!ifndef MING_PATH
-    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
-!endif
-!define MING_BIN "${MING_PATH}/bin"
-!define MING_LIB "${MING_PATH}/lib"
-!define ROOT_PATH "..\..\.." ; assuming the script is in ROOT/admin/win/nsi
-!define BUILD_PATH "${ROOT_PATH}\build"
-!define QT_DLL_PATH "${MING_BIN}"
-!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
-!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
-!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
-
-;-----------------------------------------------------------------------------
-; Increment installer revision number as part of this script.
-;-----------------------------------------------------------------------------
-!define /file REVISION_LAST revision.txt
-!define /math REVISION ${REVISION_LAST} + 1
-!delfile revision.txt
-!appendfile revision.txt ${REVISION}
-
-!ifndef VER_MAJOR && VER_MINOR && VER_BUILD
-    !define VER_MAJOR "0"
-    !define VER_MINOR "2"
-    !define VER_BUILD "0prealpha"
-!endif
-
-!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"
-
-;-----------------------------------------------------------------------------
-; Installer build timestamp.
-;-----------------------------------------------------------------------------
-!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p  (rev. ${REVISION})"
-
-;-----------------------------------------------------------------------------
-; Initial installer setup and definitions.
-;-----------------------------------------------------------------------------
-Name "Tomahawk"
-Caption "Tomahawk Installer"
-BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
-OutFile "${ROOT_PATH}\build\tomahawk-${VERSION}.exe"
-InstallDir "$PROGRAMFILES\Tomahawk"
-InstallDirRegKey HKCU "Software\Tomahawk" ""
-InstType Standard
-InstType Full
-InstType Minimal
-CRCCheck On
-SetCompressor /SOLID lzma
-RequestExecutionLevel user ;Now using the UAC plugin.
-ReserveFile tomahawk.ini
-ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
-
-;-----------------------------------------------------------------------------
-; Include some required header files.
-;-----------------------------------------------------------------------------
-!include LogicLib.nsh ;Used by APPDATA uninstaller.
-!include nsDialogs.nsh ;Used by APPDATA uninstaller.
-!include MUI2.nsh ;Used by APPDATA uninstaller.
-!include InstallOptions.nsh ;Required by MUI2 to support old MUI_INSTALLOPTIONS.
-!include Memento.nsh ;Remember user selections.
-!include WinVer.nsh ;Windows version detection.
-!include WordFunc.nsh  ;Used by VersionCompare macro function.
-!include UAC.nsh ;Used by the UAC elevation to install as user or admin.
-
-;-----------------------------------------------------------------------------
-; Memento selections stored in registry.
-;-----------------------------------------------------------------------------
-!define MEMENTO_REGISTRY_ROOT HKLM
-!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk
-
-;-----------------------------------------------------------------------------
-; Modern User Interface (MUI) defintions and setup.
-;-----------------------------------------------------------------------------
-!define MUI_ABORTWARNING
-!define MUI_ICON installer.ico
-!define MUI_UNICON installer.ico
-!define MUI_WELCOMEFINISHPAGE_BITMAP welcome.bmp
-!define MUI_WELCOMEPAGE_TITLE "Tomahawk ${VERSION} Setup$\r$\nInstaller Build Revision ${REVISION}"
-!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP page_header.bmp
-!define MUI_COMPONENTSPAGE_SMALLDESC
-!define MUI_FINISHPAGE_TITLE "Tomahawk Install Completed"
-!define MUI_FINISHPAGE_LINK "Click here to visit the Tomahawk website."
-!define MUI_FINISHPAGE_LINK_LOCATION "http://tomahawk-player.org/"
-!define MUI_FINISHPAGE_NOREBOOTSUPPORT
-!ifdef OPTION_FINISHPAGE_RELEASE_NOTES
-   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NOTES.txt"
-   !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show release notes"
-!endif
-!ifdef OPTION_FINISHPAGE_LAUNCHER
-   !define MUI_FINISHPAGE_NOAUTOCLOSE
-   !define MUI_FINISHPAGE_RUN
-   !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchTomahawk"
-!endif
-
-;-----------------------------------------------------------------------------
-; Page macros.
-;-----------------------------------------------------------------------------
-!insertmacro MUI_PAGE_WELCOME
-!ifdef OPTION_LICENSE_AGREEMENT
-   !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
-!endif
-Page custom PageReinstall PageLeaveReinstall
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-!ifdef OPTION_FINISHPAGE
-   !insertmacro MUI_PAGE_FINISH
-!endif
-!insertmacro MUI_UNPAGE_CONFIRM
-UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
-!insertmacro MUI_UNPAGE_INSTFILES
-
-;-----------------------------------------------------------------------------
-; Other MUI macros.
-;-----------------------------------------------------------------------------
-!insertmacro MUI_LANGUAGE "English"
-
-##############################################################################
-#                                                                            #
-#   FINISH PAGE LAUNCHER FUNCTIONS                                           #
-#                                                                            #
-##############################################################################
-
-Function LaunchTomahawk
-   ${UAC.CallFunctionAsUser} LaunchTomahawkAsUser
-FunctionEnd
-
-Function LaunchTomahawkAsUser
-   Exec "$INSTDIR\tomahawk.exe"
-FunctionEnd
-
-##############################################################################
-#                                                                            #
-#   PROCESS HANDLING FUNCTIONS AND MACROS                                    #
-#                                                                            #
-##############################################################################
-
-!macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
-   Processes::FindProcess ${processName}
-   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
-!macroend
-
-!macro ConfirmEndProcess processName
-   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
-     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
-     IDYES process_${processName}_kill IDNO process_${processName}_ended
-   process_${processName}_kill:
-      DetailPrint "Killing ${processName} processes."
-      Processes::KillProcess ${processName}
-      Sleep 1500
-      StrCmp $R0 "1" process_${processName}_ended
-      DetailPrint "Process to kill not found!"
-   process_${processName}_ended:
-!macroend
-
-!macro CheckAndConfirmEndProcess processName
-   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
-   !insertmacro ConfirmEndProcess ${processName}
-   no_process_${processName}_to_end:
-!macroend
-
-Function EnsureTomahawkShutdown
-   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
-FunctionEnd
-
-##############################################################################
-#                                                                            #
-#   RE-INSTALLER FUNCTIONS                                                   #
-#                                                                            #
-##############################################################################
-
-Function PageReinstall
-   ReadRegStr $R0 HKLM "Software\Tomahawk" ""
-   StrCmp $R0 "" 0 +2
-   Abort
-
-   ;Detect version
-   ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMajor"
-   IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
-   minor_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMinor"
-      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
-   build_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
-      IntCmp $R0 ${VER_BUILD} revision_check new_version older_version
-   revision_check:
-      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionRevision"
-      IntCmp $R0 ${REVISION} same_version new_version older_version
-
-   new_version:
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
-      StrCpy $R0 "1"
-      Goto reinst_start
-
-   older_version:
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Uninstall before installing"
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Do not uninstall"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
-      StrCpy $R0 "1"
-      Goto reinst_start
-
-   same_version:
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 2" "Text" "Add/Reinstall components"
-      !insertmacro INSTALLOPTIONS_WRITE "tomahawk.ini" "Field 3" "Text" "Uninstall Tomahawk"
-      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
-      StrCpy $R0 "2"
-
-   reinst_start:
-      !insertmacro INSTALLOPTIONS_DISPLAY "tomahawk.ini"
-FunctionEnd
-
-Function PageLeaveReinstall
-   !insertmacro INSTALLOPTIONS_READ $R1 "tomahawk.ini" "Field 2" "State"
-   StrCmp $R0 "1" 0 +2
-   StrCmp $R1 "1" reinst_uninstall reinst_done
-   StrCmp $R0 "2" 0 +3
-   StrCmp $R1 "1" reinst_done reinst_uninstall
-   reinst_uninstall:
-      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString"
-      HideWindow
-      ClearErrors
-      ExecWait '$R1 _?=$INSTDIR'
-      IfErrors no_remove_uninstaller
-      IfFileExists "$INSTDIR\tomahawk.exe" no_remove_uninstaller
-      Delete $R1
-      RMDir $INSTDIR
-   no_remove_uninstaller:
-      StrCmp $R0 "2" 0 +3
-      UAC::Unload
-      Quit
-      BringToFront
-   reinst_done:
-FunctionEnd
-
-##############################################################################
-#                                                                            #
-#   INSTALLER SECTIONS                                                       #
-#                                                                            #
-##############################################################################
-
-Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
-   SectionIn 1 2 3 RO
-   SetDetailsPrint listonly
-
-   SetDetailsPrint textonly
-   DetailPrint "Installing Tomahawk Player essentials."
-   SetDetailsPrint listonly
-   SetOutPath "$INSTDIR"
-
-   !ifdef INSTALL_PATH
-        ;Main executable.
-        File "${INSTALL_PATH}\bin\tomahawk.exe"
-
-        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}\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.
-   File "${ROOT_PATH}\LICENSE.txt"
-   File /oname=NOTES.txt RELEASE_NOTES.txt
-
-   ;QT stuff:
-   File "${QT_DLL_PATH}\QtCore4.dll"
-   File "${QT_DLL_PATH}\QtGui4.dll"
-   File "${QT_DLL_PATH}\QtNetwork4.dll"
-   File "${QT_DLL_PATH}\QtSql4.dll"
-   File "${QT_DLL_PATH}\QtXml4.dll"
-   File "${QT_DLL_PATH}\QtWebKit4.dll"
-
-   ;SQLite driver
-   SetOutPath "$INSTDIR\sqldrivers"
-   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
-   SetOutPath "$INSTDIR"
-
-   ;Image plugins
-   SetOutPath "$INSTDIR\imageformats"
-   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
-   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
-   SetOutPath "$INSTDIR"
-
-   ;Cygwin/c++ stuff
-   ;File "${MING_BIN}\cygmad-0.dll"
-   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
-   ;File "${MING_BIN}\mingwm10.dll"
-   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
-   File "${MING_BIN}\libstdc++-6.dll"
-
-   ;Phonon stuff
-
-   ;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 "${MING_BIN}\libphonon.dll"
-   SetOutPath "$INSTDIR\phonon_backend"
-   File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
-   SetOutPath "$INSTDIR"
-
-   ;VLC
-   ;SetOutPath "$INSTDIR\phonon_backend"
-   File "${MING_BIN}\libvlc.dll"
-   File "${MING_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"
-   File "${MING_BIN}\libtag.dll"
-   File "${MING_BIN}\libpng15-15.dll"
-   File "${MING_BIN}\libjpeg-8.dll"
-   File "${MING_BIN}\zlib1.dll"
-
-   File "${MING_BIN}\libechonest.dll"
-   File "${MING_BIN}\libQTweetLib.dll"
-
-   ; Jabber
-   File "${MING_BIN}\libjreen.dll"
-   File "${MING_BIN}\libqca.dll"
-   SetOutPath "$INSTDIR\crypto"
-   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
-   SetOutPath "$INSTDIR"
-   File "${MING_BIN}\libssl-8.dll"
-   File "${MING_BIN}\libcrypto-8.dll"
-
-   File "${MING_LIB}\libclucene-core.dll"
-   File "${MING_LIB}\libclucene-shared.dll"
-
-   File "${MING_BIN}\libqtsparkle.dll"
-SectionEnd
-
-SectionGroup "Shortcuts"
-
-!ifdef OPTION_SECTION_SC_START_MENU
-   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Adding shortcuts for the Tomahawk program group to the Start Menu."
-      SetDetailsPrint listonly
-      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\Tomahawk"
-      CreateDirectory "$SMPROGRAMS\Tomahawk"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
-      SetShellVarContext current
-   ${MementoSectionEnd}
-!endif
-
-!ifdef OPTION_SECTION_SC_DESKTOP
-   ${MementoSection} "Desktop Shortcut" SEC_DESKTOP
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Creating Desktop Shortcuts"
-      SetDetailsPrint listonly
-      CreateShortCut "$DESKTOP\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-   ${MementoSectionEnd}
-!endif
-
-!ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-   ${MementoSection} "Quick Launch Shortcut" SEC_QUICK_LAUNCH
-      SectionIn 1 2
-      SetDetailsPrint textonly
-      DetailPrint "Creating Quick Launch Shortcut"
-      SetDetailsPrint listonly
-      CreateShortCut "$QUICKLAUNCH\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
-   ${MementoSectionEnd}
-!endif
-
-SectionGroupEnd
-
-${MementoSectionDone}
-
-; Installer section descriptions
-;--------------------------------
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "Tomahawk player essentials."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "Tomahawk program group."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for Tomahawk."
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for Tomahawk."
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-Section -post
-
-   ;Uninstaller file.
-   SetDetailsPrint textonly
-   DetailPrint "Writing Uninstaller"
-   SetDetailsPrint listonly
-   WriteUninstaller $INSTDIR\uninstall.exe
-
-   ;Registry keys required for installer version handling and uninstaller.
-   SetDetailsPrint textonly
-   DetailPrint "Writing Installer Registry Keys"
-   SetDetailsPrint listonly
-
-   ;Version numbers used to detect existing installation version for comparisson.
-   WriteRegStr HKLM "Software\Tomahawk" "" $INSTDIR
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMinor" "${VER_MINOR}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionRevision" "${REVISION}"
-   WriteRegDWORD HKLM "Software\Tomahawk" "VersionBuild" "${VER_BUILD}"
-
-   ;Add or Remove Programs entry.
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString" '"$INSTDIR\Uninstall.exe"'
-   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation" "$INSTDIR"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayName" "Tomahawk"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "Publisher" "Tomahawk-player.org"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayVersion" "${VERSION}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMajor" "${VER_MAJOR}"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMinor" "${VER_MINOR}.${REVISION}"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "URLInfoAbout" "http://tomahawk-player.org/"
-   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "HelpLink" "http://tomahawk-player.org/"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
-   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
-
-   ; Register tomahawk:// protocol handler
-   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
-   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
-   WriteRegStr HKCR "tomahawk\shell" "" "open"
-   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
-
-   SetDetailsPrint textonly
-   DetailPrint "Finsihed."
-SectionEnd
-
-##############################################################################
-#                                                                            #
-#   UNINSTALLER SECTION                                                      #
-#                                                                            #
-##############################################################################
-
-Var UnPageUserAppDataDialog
-Var UnPageUserAppDataCheckbox
-Var UnPageUserAppDataCheckbox_State
-Var UnPageUserAppDataEditBox
-
-Function un.UnPageUserAppData
-   !insertmacro MUI_HEADER_TEXT "Uninstall Tomahawk" "Remove Tomahawk's data folder from your computer."
-   nsDialogs::Create /NOUNLOAD 1018
-   Pop $UnPageUserAppDataDialog
-
-   ${If} $UnPageUserAppDataDialog == error
-      Abort
-   ${EndIf}
-
-   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete Tomahawk's data folder?"
-   Pop $0
-
-   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\Tomahawk"
-   Pop $UnPageUserAppDataEditBox
-   SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
-
-   ${NSD_CreateLabel} 0 46u 100% 24u "Leave unchecked to keep the data folder for later use or check to delete the data folder."
-   Pop $0
-
-   ${NSD_CreateCheckbox} 0 71u 100% 8u "Yes, delete this data folder."
-   Pop $UnPageUserAppDataCheckbox
-
-   nsDialogs::Show
-FunctionEnd
-
-Function un.UnPageUserAppDataLeave
-   ${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
-FunctionEnd
-
-Section Uninstall
-   IfFileExists "$INSTDIR\tomahawk.exe" tomahawk_installed
-      MessageBox MB_YESNO "It does not appear that Tomahawk is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
-      Abort "Uninstall aborted by user"
-   tomahawk_installed:
-
-   ;Delete registry keys.
-   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionBuild"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionMajor"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionMinor"
-   DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
-   DeleteRegValue HKLM "Software\Tomahawk" ""
-   DeleteRegKey HKLM "Software\Tomahawk"
-
-   DeleteRegKey HKCR "tomahawk"
-
-   ;Start menu shortcuts.
-   !ifdef OPTION_SECTION_SC_START_MENU
-      SetShellVarContext all
-      RMDir /r "$SMPROGRAMS\Tomahawk"
-      SetShellVarContext current
-   !endif
-
-   ;Desktop shortcut.
-   !ifdef OPTION_SECTION_SC_DESKTOP
-      IfFileExists "$DESKTOP\Tomahawk.lnk" 0 +2
-         Delete "$DESKTOP\Tomahawk.lnk"
-   !endif
-
-   ;Quick Launch shortcut.
-   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
-      IfFileExists "$QUICKLAUNCH\Tomahawk.lnk" 0 +2
-         Delete "$QUICKLAUNCH\Tomahawk.lnk"
-   !endif
-
-   ;Remove all the Program Files.
-   RMDir /r $INSTDIR
-
-   ;Uninstall User Data if option is checked, otherwise skip.
-   ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
-      RMDir /r "$LOCALAPPDATA\Tomahawk"
-   ${EndIf}
-
-   SetDetailsPrint textonly
-   DetailPrint "Finsihed."
-SectionEnd
-
-##############################################################################
-#                                                                            #
-#   NSIS Installer Event Handler Functions                                   #
-#                                                                            #
-##############################################################################
-
-Function .onInit
-   !insertmacro INSTALLOPTIONS_EXTRACT "tomahawk.ini"
-
-   ;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
-   ${IfNot} ${AtMostWinVista}
-      SectionSetText ${SEC_QUICK_LAUNCH} "Quick Launch Shortcut (N/A)"
-      SectionSetFlags ${SEC_QUICK_LAUNCH} ${SF_RO}
-      SectionSetInstTypes ${SEC_QUICK_LAUNCH} 0
-   ${EndIf}
-
-   ${MementoSectionRestore}
-
-   UAC_Elevate:
-      UAC::RunElevated
-      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
-      StrCmp 0 $0 0 UAC_Err ; Error?
-      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
-      Quit
-
-   UAC_Err:
-      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
-      Abort
-
-   UAC_ElevationAborted:
-      Abort
-
-   UAC_Success:
-      StrCmp 1 $3 +4 ;Admin?
-      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP "This installer requires admin access, try again"
-      goto UAC_Elevate
-
-   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkInstaller") i .r1 ?e'
-   Pop $R0
-   StrCmp $R0 0 +3
-      MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
-      Abort
-
-   ;Use available InstallLocation when possible. This is useful in the uninstaller
-   ;via re-install, which would otherwise use a default location - a bug.
-   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
-   StrCmp $R0 "" SkipSetInstDir
-   StrCpy $INSTDIR $R0
-   SkipSetInstDir:
-
-   ;Shutdown Tomahawk in case Add/Remove re-installer option used.
-   Call EnsureTomahawkShutdown
-FunctionEnd
-
-Function .onInstSuccess
-   ${MementoSectionSave}
-   UAC::Unload ;Must call unload!
-FunctionEnd
-
-Function .onInstFailed
-   UAC::Unload ;Must call unload!
-FunctionEnd
-
-##############################################################################
-#                                                                            #
-#   NSIS Uninstaller Event Handler Functions                                 #
-#                                                                            #
-##############################################################################
-
-Function un.onInit
-   UAC_Elevate:
-      UAC::RunElevated
-      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
-      StrCmp 0 $0 0 UAC_Err ; Error?
-      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
-      Quit
-
-   UAC_Err:
-      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
-      Abort
-
-   UAC_ElevationAborted:
-      Abort
-
-   UAC_Success:
-      StrCmp 1 $3 +4 ;Admin?
-      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-      MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
-      goto UAC_Elevate
-
-   ;Prevent multiple instances.
-   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkUninstaller") i .r1 ?e'
-   Pop $R0
-   StrCmp $R0 0 +3
-      MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller is already running."
-      Abort
-FunctionEnd
-
-Function un.onUnInstSuccess
-   UAC::Unload ;Must call unload!
-FunctionEnd
-
-Function un.onUnInstFailed
-   UAC::Unload ;Must call unload!
-FunctionEnd

admin/win/update-vlc.sh

@@ -1,20 +1,49 @@
 #!/bin/bash
 echo "Remove old vlc dir..."
+
+mkdir -p vlc/
+cd vlc/
+
 #rm -vf vlc-*.7z
-rm -rf vlc/
+#rm -rf vlc/
 
 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://nightlies.videolan.org/build/win32/trunk-20110524-1321/vlc-1.2.0-git-20110524-1321-win32.7z"
+#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 vlc-*.7z
-mv -v vlc-*/ vlc/
+7z x phonon-vlc-last.7z
+#mv -v vlc-*/ vlc/
+#unzip tomahawk-vlc-0.1.zip
 
 echo "Strip unneeded plugins from vlc/plugins..."
-cd vlc/plugins/
-rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
-     */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub*
+cd prefix/bin/plugins
+rm -rvf libold* libvcd* libdvd* liblibass* libx264* libschroe* liblibmpeg2* \
+    libstream_out_* libmjpeg_plugin* libh264_plugin* libzvbi_plugin* lib*sub* \
+    *qt4* *skins2* libaccess_bd_plugin.dll \
+    libaudiobargraph_* libball_plugin.dll \
+    libdirac_plugin.dll \
+    libgnutls_plugin.dll \
+    libcaca_plugin.dll \
+    libfreetype_plugin.dll \
+    libaccess_output_shout_plugin.dll \
+    libremoteosd_plugin.dll \
+    libsdl_image_plugin.dll \
+    libvout_sdl_plugin.dll \
+    libpng_plugin.dll \
+    libgoom_plugin.dll \
+    libatmo_plugin.dll \
+    libmux_ts_plugin.dll \
+    libkate_plugin.dll \
+    libtaglib_plugin.dll
+
+
+# this is for vlc-1.2
+# 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/js/tomahawk.js

@@ -31,19 +31,19 @@ Tomahawk.resolver = {
 
 Tomahawk.timestamp = function() {
     return Math.round( new Date()/1000 );
-}
+};
 
 Tomahawk.dumpResult = function( result ) {
     var results = result.results;
     Tomahawk.log("Dumping " + results.length + " results for query " + result.qid + "...");
     for(var i=0; i<results.length;i++)
     {
-        var result = results[i];
-        Tomahawk.log( result.artist + " - " + result.track + " | " + result.url );
+        var result1 = results[i];
+        Tomahawk.log( result1.artist + " - " + result1.track + " | " + result1.url );
     }
 
     Tomahawk.log("Done.");
-}
+};
 
 // javascript part of Tomahawk-Object API
 Tomahawk.extend = function(object, members) {
@@ -57,7 +57,7 @@ Tomahawk.extend = function(object, members) {
     }
 
     return newObject;
-}
+};
 
 
 // Resolver BaseObject, inherit it to implement your own resolver
@@ -77,7 +77,9 @@ var TomahawkResolver = {
     {
         var configJson = window.localStorage[ this.scriptPath() ];
         if( configJson === undefined )
+	{
             configJson = "{}";
+	}
 
         var config = JSON.parse( configJson );
 
@@ -153,11 +155,15 @@ var TomahawkResolver = {
 Tomahawk.valueForSubNode = function(node, tag)
 {
     if(node === undefined)
+    {
         throw new Error("Tomahawk.valueForSubnode: node is undefined!");
+    }
 
     var element = node.getElementsByTagName(tag)[0];
     if( element === undefined )
+    {
         return undefined;
+    }
 
     return element.textContent;
 };
@@ -165,11 +171,13 @@ Tomahawk.valueForSubNode = function(node, tag)
 
 Tomahawk.syncRequest = function(url)
 {
-    var xmlHttpRequest = new XMLHttpRequest();
-    xmlHttpRequest.open('GET', url, false);
-    xmlHttpRequest.send(null);
-    return xmlHttpRequest.responseText;
-}
+	var xmlHttpRequest = new XMLHttpRequest();
+	xmlHttpRequest.open('GET', url, false);
+	xmlHttpRequest.send(null);
+	if (xmlHttpRequest.status == 200){
+		return xmlHttpRequest.responseText;
+	}
+};
 
 /**
 *
@@ -210,7 +218,7 @@ Tomahawk.sha256=function(s){
         m[l >> 5] |= 0x80 << (24 - l % 32);
         m[((l + 64 >> 9) << 4) + 15] = l;
 
-        for ( var i = 0; i<m.length; i+=16 ) {
+        for ( i = 0; i<m.length; i+=16 ) {
             a = HASH[0];
             b = HASH[1];
             c = HASH[2];
@@ -220,9 +228,15 @@ Tomahawk.sha256=function(s){
             g = HASH[6];
             h = HASH[7];
 
-            for ( var j = 0; j<64; j++) {
-                if (j < 16) W[j] = m[j + i];
-                else W[j] = safe_add(safe_add(safe_add(Gamma1256(W[j - 2]), W[j - 7]), Gamma0256(W[j - 15])), W[j - 16]);
+            for ( j = 0; j<64; j++) {
+                if (j < 16)
+		{
+			W[j] = m[j + i];
+		}
+                else
+		{
+			W[j] = safe_add(safe_add(safe_add(Gamma1256(W[j - 2]), W[j - 7]), Gamma0256(W[j - 15])), W[j - 16]);
+		}
 
                 T1 = safe_add(safe_add(safe_add(safe_add(h, Sigma1256(e)), Ch(e, f, g)), K[j]), W[j]);
                 T2 = safe_add(Sigma0256(a), Maj(a, b, c));
@@ -297,4 +311,10 @@ Tomahawk.sha256=function(s){
     s = Utf8Encode(s);
     return binb2hex(core_sha256(str2binb(s), s.length * chrsz));
 
-}
+};
+
+
+
+// some aliases
+Tomahawk.setTimeout = window.setTimeout;
+Tomahawk.setInterval = window.setInterval;

data/sql/dbmigrate-24_to_25.sql

@@ -1,7 +1,6 @@
 -- Script to migate from db version 24 to 25.
 -- Added the social_attributes table.
 --
--- Separate each command with %%
 
 ALTER TABLE dynamic_playlist RENAME TO tmp_dynamic_playlist;
 

data/sql/dbmigrate-25_to_26.sql

@@ -0,0 +1,8 @@
+-- Script to migate from db version 25 to 26.
+-- Added the "autoload" column to dynamic_playlist
+--
+
+
+ALTER TABLE dynamic_playlist ADD COLUMN autoload BOOLEAN DEFAULT 'true';
+
+UPDATE settings SET v = '26' WHERE k == 'schema_version';

lang/tomahawk_de.ts

@@ -119,22 +119,22 @@
     <message>
         <location filename="src/libtomahawk/playlist/collectionmodel.cpp" line="168"/>
         <source>Name</source>
-        <translation type="unfinished">Name</translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/collectionmodel.cpp" line="168"/>
         <source>Tracks</source>
-        <translation type="unfinished">Stücke</translation>
+        <translation>Stücke</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/collectionmodel.cpp" line="168"/>
         <source>Duration</source>
-        <translation type="unfinished">Spieldauer</translation>
+        <translation>Spieldauer</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/collectionmodel.cpp" line="168"/>
         <source>Origin</source>
-        <translation type="unfinished">Quelle</translation>
+        <translation>Quelle</translation>
     </message>
 </context>
 <context>
@@ -142,17 +142,17 @@
     <message>
         <location filename="src/libtomahawk/playlist/collectionview.cpp" line="75"/>
         <source>&amp;Play</source>
-        <translation type="unfinished">&amp;Abspielen</translation>
+        <translation>&amp;Abspielen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/collectionview.cpp" line="76"/>
         <source>Add to &amp;Queue</source>
-        <translation type="unfinished">Zur &amp;Warteschlange hinzufügen</translation>
+        <translation>In &amp;Warteschlange einreihen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/collectionview.cpp" line="108"/>
         <source>This collection is empty.</source>
-        <translation type="unfinished">Diese Sammlung ist leer.</translation>
+        <translation>Diese Sammlung ist leer.</translation>
     </message>
 </context>
 <context>
@@ -175,19 +175,19 @@
     <message>
         <location filename="src/sip/jabber/jabber.cpp" line="124"/>
         <source>Add Friend...</source>
-        <translation type="unfinished">Freund hinzufügen…</translation>
+        <translation>Freund hinzufügen…</translation>
     </message>
     <message>
         <location filename="src/sip/jabber/jabber.cpp" line="169"/>
         <location filename="src/sip/jreen/jabber.cpp" line="183"/>
         <source>Add Friend</source>
-        <translation type="unfinished">Freund hinzufügen</translation>
+        <translation>Freund hinzufügen</translation>
     </message>
     <message>
         <location filename="src/sip/jabber/jabber.cpp" line="170"/>
         <location filename="src/sip/jreen/jabber.cpp" line="184"/>
         <source>Enter Jabber ID:</source>
-        <translation type="unfinished">Jabber-ID eingeben:</translation>
+        <translation>Jabber-ID eingeben:</translation>
     </message>
 </context>
 <context>
@@ -208,27 +208,27 @@
     <message>
         <location filename="src/libtomahawk/widgets/newplaylistwidget.ui" line="22"/>
         <source>Enter a title for the new playlist:</source>
-        <translation type="unfinished">Gib einen Titel für die neue Playliste ein:</translation>
+        <translation>Gib einen Titel für die neue Playliste ein:</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/newplaylistwidget.ui" line="44"/>
         <source>Tomahawk offers a variety of ways to help you create playlists and find music you enjoy!</source>
-        <translation type="unfinished">Tomahawk bietet verschiedene Wege, Playlisten zu erstellen und Musik zu finden, die du magst!</translation>
+        <translation>Tomahawk bietet verschiedene Wege, Playlisten zu erstellen und Musik zu finden, die du magst!</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/newplaylistwidget.ui" line="59"/>
         <source>Just enter a genre or tag name and Tomahawk will suggest a few songs to get you started with your new playlist:</source>
-        <translation type="unfinished">Gib einfach ein Genre oder einen Tagnamen ein und Tomahawk wird dir einige Lieder vorschlagen, um dir zu helfen, eine neue Playliste zu erstellen:</translation>
+        <translation>Gib einfach ein Genre oder einen Tagnamen ein, und Tomahawk wird dir einige Lieder vorschlagen und dir helfen eine neue Playliste zu erstellen:</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/newplaylistwidget.cpp" line="45"/>
         <source>&amp;Create Playlist</source>
-        <translation type="unfinished">Playliste &amp;erstellen</translation>
+        <translation>Playliste &amp;erstellen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/newplaylistwidget.h" line="51"/>
         <source>Create a new playlist</source>
-        <translation type="unfinished">Erstelle eine neue Playliste</translation>
+        <translation>Erstelle eine neue Playliste</translation>
     </message>
 </context>
 <context>
@@ -270,27 +270,27 @@
     <message>
         <location filename="src/libtomahawk/playlist/playlistview.cpp" line="74"/>
         <source>&amp;Play</source>
-        <translation type="unfinished">&amp;Abspielen</translation>
+        <translation>&amp;Abspielen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/playlistview.cpp" line="75"/>
         <source>Add to &amp;Queue</source>
-        <translation type="unfinished">In &amp;Warteschlange einreihen</translation>
+        <translation>In &amp;Warteschlange einreihen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/playlistview.cpp" line="79"/>
         <source>&amp;Delete Items</source>
-        <translation type="unfinished">Elemente &amp;entfernen</translation>
+        <translation>Elemente &amp;entfernen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/playlistview.cpp" line="79"/>
         <source>&amp;Delete Item</source>
-        <translation type="unfinished">Element &amp;entfernen</translation>
+        <translation>Element &amp;entfernen</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/playlistview.cpp" line="143"/>
         <source>This playlist is currently empty. Add some tracks to it and enjoy the music!</source>
-        <translation type="unfinished">Die Playliste ist derzeit leer. Füge einige Stücke hinzu und genieße die Musik!</translation>
+        <translation>Die Playliste ist derzeit leer. Füge einige Stücke hinzu und genieße die Musik!</translation>
     </message>
 </context>
 <context>
@@ -359,18 +359,18 @@
     <message>
         <location filename="src/settingsdialog.ui" line="30"/>
         <source>Jabber</source>
-        <translation type="unfinished">Jabber</translation>
+        <translation>Jabber</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="53"/>
         <source>Jabber ID:</source>
-        <translation type="unfinished">Jabber-ID:</translation>
+        <translation>Jabber-ID:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="79"/>
         <location filename="src/settingsdialog.ui" line="524"/>
         <source>Password:</source>
-        <translation type="unfinished">Passwort:</translation>
+        <translation>Passwort:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="132"/>
@@ -380,138 +380,138 @@
     <message>
         <location filename="src/settingsdialog.ui" line="152"/>
         <source>Server:</source>
-        <translation type="unfinished">Server:</translation>
+        <translation>Server:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="175"/>
         <source>Port:</source>
-        <translation type="unfinished">Port:</translation>
+        <translation>Port:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="238"/>
         <source>Network</source>
-        <translation type="unfinished">Netzwerk</translation>
+        <translation>Netzwerk</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="250"/>
         <source>Advanced Network Settings</source>
-        <translation type="unfinished">Erweiterte Netzwerkeinstellungen</translation>
+        <translation>Erweiterte Netzwerkeinstellungen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="267"/>
         <source>If you&apos;re having difficulty connecting to peers, try setting this to your external IP address/host name and a port number (default 50210). Make sure to forward that port to this machine!</source>
-        <translation type="unfinished">Wenn du Schwierigkeiten hast, zu anderen Leuten zu verbinden, versuche diene externe IP-Addresse/Rechnernamen und eine Portnummer (Standard 50210) hier einzutragen. Stelle sicher, den Port entsprechend an diesen Rechner weiterzuleiten!</translation>
+        <translation>Wenn du Schwierigkeiten hast, dich mit anderen Leuten zu verbinden, versuche deine externe IP-Adresse/Rechnernamen und eine Portnummer (Standard 50210) hier einzutragen. Stelle sicher, den Port entsprechend an diesen Rechner weiterzuleiten!</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="285"/>
         <source>Static Host Name:</source>
-        <translation type="unfinished">Statischer Rechnername:</translation>
+        <translation>Statischer Rechnername:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="301"/>
         <source>Static Port:</source>
-        <translation type="unfinished">Statischer Port:</translation>
+        <translation>Statischer Port:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="323"/>
         <source>Always use static host name/port? (Overrides UPnP discovery/port forwarding)</source>
-        <translation type="unfinished">Statischen Rechnernamen/Port immer benutzen? (Überschreibt UPnP-discovery/Portweiterleitung)</translation>
+        <translation>Statischen Rechnernamen/Port immer benutzen? (Überschreibt UPnP-discovery/Portweiterleitung)</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="347"/>
         <source>Proxy Settings...</source>
-        <translation type="unfinished">Proxy-Einstellungen…</translation>
+        <translation>Proxy-Einstellungen…</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="385"/>
         <source>Playdar HTTP API</source>
-        <translation type="unfinished">Playdar HTTP API</translation>
+        <translation>Playdar HTTP API</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="398"/>
         <source>Connect automatically when Tomahawk starts</source>
-        <translation type="unfinished">Automatisch beim Start von Tomahawk verbinden</translation>
+        <translation>Automatisch beim Start von Tomahawk verbinden</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="411"/>
         <source>Use UPnP to establish port forward</source>
-        <translation type="unfinished">Benutze UPnP um die Portweiterleitung zu konfigurieren</translation>
+        <translation>Benutze UPnP um die Portweiterleitung einzurichten</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="425"/>
         <source>Local Music</source>
-        <translation type="unfinished">Lokale Musik</translation>
+        <translation>Lokale Musik</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="436"/>
         <source>Path to scan for music files:</source>
-        <translation type="unfinished">Pfad zu den Musikdateien:</translation>
+        <translation>Pfad zu den Musikdateien:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="448"/>
         <source>...</source>
-        <translation type="unfinished">…</translation>
+        <translation>…</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="490"/>
         <source>Last.fm</source>
-        <translation type="unfinished">Last.fm</translation>
+        <translation>Last.fm</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="499"/>
         <source>Scrobble tracks to Last.fm</source>
-        <translation type="unfinished">Gespielte Stücke an Last.fm übertragen</translation>
+        <translation>Gespielte Stücke an Last.fm übertragen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="506"/>
         <source>Last.fm Login</source>
-        <translation type="unfinished">Last.fm Anmeldung</translation>
+        <translation>Last.fm Anmeldung</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="514"/>
         <source>Username:</source>
-        <translation type="unfinished">Benutzername:</translation>
+        <translation>Benutzername:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="540"/>
         <source>Test Login</source>
-        <translation type="unfinished">Anmeldung Testen</translation>
+        <translation>Anmeldung testen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="564"/>
         <source>Script Resolvers</source>
-        <translation type="unfinished"></translation>
+        <translation>Script Resolver</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.ui" line="570"/>
         <source>Loaded script resolvers:</source>
-        <translation type="unfinished"></translation>
+        <translation>Geladene Script Resolver:</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.cpp" line="163"/>
         <source>Select Music Folder</source>
-        <translation type="unfinished">Musikordner auswählen</translation>
+        <translation>Musikordner auswählen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.cpp" line="250"/>
         <location filename="src/settingsdialog.cpp" line="262"/>
         <source>Failed</source>
-        <translation type="unfinished">Fehlgeschlagen</translation>
+        <translation>Fehlgeschlagen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.cpp" line="255"/>
         <source>Success</source>
-        <translation type="unfinished">Erfolgreich</translation>
+        <translation>Erfolgreich</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.cpp" line="268"/>
         <source>Could not contact server</source>
-        <translation type="unfinished">Konnte den Server nicht erreichen</translation>
+        <translation>Konnte den Server nicht erreichen</translation>
     </message>
     <message>
         <location filename="src/settingsdialog.cpp" line="338"/>
         <source>Load script resolver file</source>
-        <translation type="unfinished"></translation>
+        <translation>Script Resolver laden</translation>
     </message>
 </context>
 <context>
@@ -519,17 +519,17 @@
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="558"/>
         <source>Offline</source>
-        <translation type="unfinished">Nicht Verbunden</translation>
+        <translation>Nicht Verbunden</translation>
     </message>
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="560"/>
         <source>All available tracks</source>
-        <translation type="unfinished">Alle verfügbaren Stücke</translation>
+        <translation>Alle verfügbaren Stücke</translation>
     </message>
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="564"/>
         <source>Online</source>
-        <translation type="unfinished">Verbunden</translation>
+        <translation>Verbunden</translation>
     </message>
 </context>
 <context>
@@ -537,27 +537,27 @@
     <message>
         <location filename="src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="26"/>
         <source>Recent Albums</source>
-        <translation type="unfinished">Aktuelle Alben</translation>
+        <translation>Aktuelle Alben</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="68"/>
         <source>Latest Additions to their Collection</source>
-        <translation type="unfinished">Zuletzt zur Sammlung hinzugefügte Stücke</translation>
+        <translation>Zuletzt zur Sammlung hinzugefügt</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/infowidgets/sourceinfowidget.ui" line="89"/>
         <source>Recently played Tracks</source>
-        <translation type="unfinished">Aktuell gespiele Stücke</translation>
+        <translation>Zuletzt gespiele Stücke</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="65"/>
         <source>Info about %1</source>
-        <translation type="unfinished">Information über %1</translation>
+        <translation>Information über %1</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/infowidgets/sourceinfowidget.cpp" line="65"/>
         <source>Your Collection</source>
-        <translation type="unfinished">Deine Sammlung</translation>
+        <translation>Deine Sammlung</translation>
     </message>
 </context>
 <context>
@@ -654,17 +654,17 @@
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="125"/>
         <source>&amp;Load Playlist</source>
-        <translation type="unfinished">&amp;Lade Playliste</translation>
+        <translation>&amp;Lade Playliste</translation>
     </message>
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="126"/>
         <source>&amp;Rename Playlist</source>
-        <translation type="unfinished">Playliste &amp;umbenennen</translation>
+        <translation>Playliste &amp;umbenennen</translation>
     </message>
     <message>
         <location filename="src/sourcetree/sourcetreeview.cpp" line="128"/>
         <source>&amp;Delete Playlist</source>
-        <translation type="unfinished">Playliste &amp;löschen</translation>
+        <translation>Playliste &amp;löschen</translation>
     </message>
 </context>
 <context>
@@ -698,7 +698,7 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
     <message>
         <location filename="src/libtomahawk/playlist/dynamic/widgets/DynamicSetupWidget.cpp" line="62"/>
         <source>Generate</source>
-        <translation type="unfinished">Erzeugen</translation>
+        <translation>Erzeugen</translation>
     </message>
 </context>
 <context>
@@ -706,17 +706,17 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
     <message>
         <location filename="src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="135"/>
         <source>Add some filters above to seed this station!</source>
-        <translation type="unfinished">Füge einige Filter hinzu, um diese Station zu initialisieren!</translation>
+        <translation>Füge einige Filter hinzu, um diese Station zu starten!</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="140"/>
         <source>Press Generate to get started!</source>
-        <translation type="unfinished">Drücke Erzeugen, um zu beginnen!</translation>
+        <translation>Drücke Erzeugen, und los geht&apos;s!</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/playlist/dynamic/DynamicView.cpp" line="142"/>
         <source>Add some filters above, and press Generate to get started!</source>
-        <translation type="unfinished">Füge oben einige Filter hinzu und drücke Erzeugen um zu beginnen!</translation>
+        <translation>Füge oben einige Filter hinzu und drücke Erzeugen um loszulegen!</translation>
     </message>
 </context>
 <context>
@@ -1091,53 +1091,53 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
     <message>
         <location filename="src/tomahawkwindow.ui" line="14"/>
         <source>Tomahawk</source>
-        <translation type="unfinished">Tomahawk</translation>
+        <translation>Tomahawk</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="43"/>
         <source>&amp;Settings</source>
-        <translation type="unfinished">&amp;Einstellungen</translation>
+        <translation>&amp;Einstellungen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="49"/>
         <source>&amp;Music Player</source>
-        <translation type="unfinished">&amp;Abspielprogramm</translation>
+        <translation>&amp;Music Player</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="60"/>
         <source>&amp;Playlist</source>
-        <translation type="unfinished">&amp;Playliste</translation>
+        <translation>&amp;Playliste</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="70"/>
         <source>&amp;Network</source>
-        <translation type="unfinished">&amp;Netzwerk</translation>
+        <translation>&amp;Netzwerk</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="77"/>
         <source>&amp;Help</source>
-        <translation type="unfinished">&amp;Hilfe</translation>
+        <translation>&amp;Hilfe</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="90"/>
         <source>&amp;Quit</source>
-        <translation type="unfinished">&amp;Verlassen</translation>
+        <translation>&amp;Verlassen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="93"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Strg+Q</translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="101"/>
         <location filename="src/tomahawkwindow.cpp" line="471"/>
         <source>Go &amp;online</source>
-        <translation type="unfinished">&amp;Verbindung herstellen</translation>
+        <translation>&amp;Verbindung herstellen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="106"/>
         <source>Add &amp;Friend...</source>
-        <translation type="unfinished">Freund &amp;hinzufügen…</translation>
+        <translation>Freund &amp;hinzufügen…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="111"/>
@@ -1147,58 +1147,58 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
     <message>
         <location filename="src/tomahawkwindow.ui" line="116"/>
         <source>&amp;Configure Tomahawk...</source>
-        <translation type="unfinished">Tomahawk &amp;einrichten…</translation>
+        <translation>Tomahawk &amp;einrichten…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="124"/>
         <source>Load &amp;XSPF...</source>
-        <translation type="unfinished">&amp;XSPF-Datei laden…</translation>
+        <translation>&amp;XSPF laden…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="129"/>
         <source>Create &amp;New Playlist...</source>
-        <translation type="unfinished">Neue &amp;Playliste erstellen…</translation>
+        <translation>Neue &amp;Playliste erstellen…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="134"/>
         <source>About &amp;Tomahawk...</source>
-        <translation type="unfinished">Über &amp;Tomahawk…</translation>
+        <translation>Über &amp;Tomahawk…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="142"/>
         <source>Create New &amp;Automatic Playlist</source>
-        <translation type="unfinished">Neue, &amp;automatische Playliste erstellen</translation>
+        <translation>Neue &amp;automatische Playliste erstellen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="147"/>
         <source>Create New &amp;Station</source>
-        <translation type="unfinished">Neue &amp;Station erstellen</translation>
+        <translation>Neue &amp;Station erstellen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="152"/>
         <source>Show Offline Sources</source>
-        <translation type="unfinished">Nicht-Verfügbare Quellen anzeigen</translation>
+        <translation>Nicht-Verfügbare Quellen anzeigen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.ui" line="157"/>
         <source>Hide Offline Sources</source>
-        <translation type="unfinished">Nicht-Verfügbare Quellen ausblenden</translation>
+        <translation>Nicht-Verfügbare Quellen ausblenden</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="150"/>
         <location filename="src/tomahawkwindow.cpp" line="166"/>
         <source>Check for updates...</source>
-        <translation type="unfinished">Teste auf updates…</translation>
+        <translation type="unfinished">Suche nach Updates…</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="170"/>
         <source>Back</source>
-        <translation type="unfinished">Zurück</translation>
+        <translation>Zurück</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="171"/>
         <source>Forward</source>
-        <translation type="unfinished">Forwärts</translation>
+        <translation>Vorwärts</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="172"/>
@@ -1210,37 +1210,37 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
         <location filename="src/tomahawkwindow.cpp" line="339"/>
         <location filename="src/tomahawkwindow.cpp" line="347"/>
         <source>Connect To Peer</source>
-        <translation type="unfinished">Zu Gegenstelle verbinden</translation>
+        <translation>Zu Gegenstelle verbinden</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="333"/>
         <source>Enter peer address:</source>
-        <translation type="unfinished">Gib die Adresse der Gegenstelle ein:</translation>
+        <translation>Gib die Adresse der Gegenstelle ein:</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="340"/>
         <source>Enter peer port:</source>
-        <translation type="unfinished">Gib den Port der Gegenstelle ein:</translation>
+        <translation>Gib den Port der Gegenstelle ein:</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="348"/>
         <source>Enter peer key:</source>
-        <translation type="unfinished">Gib den Schlüssel der Gegenstelle ein:</translation>
+        <translation>Gib den Schlüssel der Gegenstelle ein:</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="464"/>
         <source>Go &amp;offline</source>
-        <translation type="unfinished">Verbindung &amp;trennen</translation>
+        <translation>Verbindung &amp;trennen</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="481"/>
         <source>Authentication Error</source>
-        <translation type="unfinished">Authentifizierungsfehler</translation>
+        <translation>Authentifizierungsfehler</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="496"/>
         <source>by</source>
-        <translation type="unfinished">von</translation>
+        <translation>von</translation>
     </message>
     <message>
         <location filename="src/tomahawkwindow.cpp" line="506"/>
@@ -1357,17 +1357,17 @@ Bitte ändere den Filter oder versuche es erneut.</translation>
     <message>
         <location filename="src/transferview.cpp" line="46"/>
         <source>Peer</source>
-        <translation type="unfinished">Gegenstelle</translation>
+        <translation>Gegenstelle</translation>
     </message>
     <message>
         <location filename="src/transferview.cpp" line="46"/>
         <source>Rate</source>
-        <translation type="unfinished">Rate</translation>
+        <translation>Rate</translation>
     </message>
     <message>
         <location filename="src/transferview.cpp" line="46"/>
         <source>Track</source>
-        <translation type="unfinished">Stück</translation>
+        <translation>Stück</translation>
     </message>
 </context>
 <context>
@@ -1435,22 +1435,22 @@ If connections to peers seem to have been lost, just press the appropriate butto
     <message>
         <location filename="src/libtomahawk/widgets/welcomewidget.ui" line="22"/>
         <source>Recently played playlists:</source>
-        <translation type="unfinished">Aktuell gespielte Playlisten:</translation>
+        <translation>Zuletzt gespielte Playlisten:</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/welcomewidget.ui" line="37"/>
         <source>Recently played tracks:</source>
-        <translation type="unfinished">Aktuell gespielte Stücke:</translation>
+        <translation>Zuletzt gespielte Stücke:</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/welcomewidget.cpp" line="81"/>
         <source>You have not played any playlists yet.</source>
-        <translation type="unfinished">Du hast bisher keine Playlisten abgespielt.</translation>
+        <translation>Du hast bisher keine Playlisten abgespielt.</translation>
     </message>
     <message>
         <location filename="src/libtomahawk/widgets/welcomewidget.h" line="106"/>
         <source>Welcome to Tomahawk</source>
-        <translation type="unfinished">Willkommen bei Tomahawk</translation>
+        <translation>Willkommen bei Tomahawk</translation>
     </message>
 </context>
 <context>

resources.qrc

@@ -1,102 +1,110 @@
 <RCC>
-  <qresource>
-    <file>./data/images/avatar-dude-plus.png</file>
-    <file>./data/images/avatar-dude.png</file>
-    <file>./data/images/back-pressed.png</file>
-    <file>./data/images/back-rest.png</file>
-    <file>./data/images/cover-shadow.png</file>
-    <file>./data/images/loved.png</file>
-    <file>./data/images/not-loved.png</file>
-    <file>./data/images/no-album-art-placeholder.png</file>
-    <file>./data/images/now-playing-panel.png</file>
-    <file>./data/images/now-playing-speaker.png</file>
-    <file>./data/images/pause-pressed.png</file>
-    <file>./data/images/pause-rest.png</file>
-    <file>./data/images/play-pressed.png</file>
-    <file>./data/images/play-rest.png</file>
-    <file>./data/images/sipplugin-add.png</file>
-    <file>./data/images/sipplugin-remove.png</file>
-    <file>./data/images/playlist-icon.png</file>
-    <file>./data/images/repeat-1-on-pressed.png</file>
-    <file>./data/images/repeat-1-on-rest.png</file>
-    <file>./data/images/repeat-all-on-pressed.png</file>
-    <file>./data/images/repeat-all-on-rest.png</file>
-    <file>./data/images/repeat-off-pressed.png</file>
-    <file>./data/images/repeat-off-rest.png</file>
-    <file>./data/images/search-box-dismiss-x.png</file>
-    <file>./data/images/seek-and-volume-knob-pressed.png</file>
-    <file>./data/images/seek-and-volume-knob-rest.png</file>
-    <file>./data/images/seek-slider-bkg.png</file>
-    <file>./data/images/seek-slider-level.png</file>
-    <file>./data/images/shuffle-off-pressed.png</file>
-    <file>./data/images/shuffle-off-rest.png</file>
-    <file>./data/images/shuffle-on-pressed.png</file>
-    <file>./data/images/shuffle-on-rest.png</file>
-    <file>./data/images/skip-pressed.png</file>
-    <file>./data/images/skip-rest.png</file>
-    <file>./data/images/user-avatar.png</file>
-    <file>./data/images/view-toggle-active-centre.png</file>
-    <file>./data/images/view-toggle-active-left.png</file>
-    <file>./data/images/view-toggle-active-right.png</file>
-    <file>./data/images/view-toggle-icon-artist-active.png</file>
-    <file>./data/images/view-toggle-icon-artist-inactive.png</file>
-    <file>./data/images/view-toggle-icon-cloud-active.png</file>
-    <file>./data/images/view-toggle-icon-cloud-inactive.png</file>
-    <file>./data/images/view-toggle-icon-list-active.png</file>
-    <file>./data/images/view-toggle-icon-list-inactive.png</file>
-    <file>./data/images/view-toggle-inactive-centre.png</file>
-    <file>./data/images/view-toggle-inactive-left.png</file>
-    <file>./data/images/view-toggle-inactive-right.png</file>
-    <file>./data/images/view-toggle-pressed-centre.png</file>
-    <file>./data/images/view-toggle-pressed-left.png</file>
-    <file>./data/images/view-toggle-pressed-right.png</file>
-    <file>./data/images/list-add.png</file>
-    <file>./data/images/list-remove.png</file>
-    <file>./data/images/arrow-up-double.png</file>
-    <file>./data/images/arrow-down-double.png</file>
-    <file>./data/images/volume-icon-full.png</file>
-    <file>./data/images/arrow-right-double.png</file>
-    <file>./data/images/view-refresh.png</file>
-    <file>./data/images/volume-icon-muted.png</file>
-    <file>./data/images/volume-slider-bkg.png</file>
-    <file>./data/images/volume-slider-level.png</file>
-    <file>./data/images/echonest_logo.png</file>
-    <file>./data/images/loading-animation.gif</file>
-    <file>./data/images/home.png</file>
-    <file>./data/images/back.png</file>
-    <file>./data/images/forward.png</file>
-    <file>./data/images/music-icon.png</file>
-    <file>./data/images/configure.png</file>
-    <file>./data/images/create-playlist.png</file>
-    <file>./data/images/add.png</file>
-    <file>./data/images/recently-played.png</file>
-    <file>./data/images/supercollection.png</file>
-    <file>./data/images/sipplugin-online.png</file>
-    <file>./data/images/sipplugin-offline.png</file>
-    <file>./data/images/advanced-settings.png</file>
-    <file>./data/images/account-settings.png</file>
-    <file>./data/images/music-settings.png</file>
-    <file>./data/images/resolvers-settings.png</file>
-    <file>./data/images/lastfm-settings.png</file>
-    <file>./data/images/automatic-playlist.png</file>
-    <file>./data/images/station.png</file>
-    <file>./data/images/new-additions.png</file>
-    <file>./data/stylesheets/topbar-radiobuttons.css</file>
-    <file>./data/icons/tomahawk-icon-16x16.png</file>
-    <file>./data/icons/tomahawk-icon-32x32.png</file>
-    <file>./data/icons/tomahawk-icon-64x64.png</file>
-    <file>./data/icons/tomahawk-icon-128x128.png</file>
-    <file>./data/icons/tomahawk-icon-256x256.png</file>
-    <file>./data/icons/tomahawk-icon-512x512.png</file>
-    <file>./data/icons/audio-x-generic-22x22.png</file>
-    <file>./data/icons/audio-x-generic-32x32.png</file>
-    <file>./data/icons/audio-x-generic-16x16.png</file>
-    <file>./data/www/auth.html</file>
-    <file>./data/www/auth.na.html</file>
-    <file>./data/www/tomahawk_banner_small.png</file>
-    <file>./data/sql/dbmigrate-22_to_23.sql</file>
-    <file>./data/sql/dbmigrate-23_to_24.sql</file>
-    <file>./data/sql/dbmigrate-24_to_25.sql</file>
-    <file>./data/js/tomahawk.js</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>data/images/avatar-dude-plus.png</file>
+        <file>data/images/avatar-dude.png</file>
+        <file>data/images/back-pressed.png</file>
+        <file>data/images/back-rest.png</file>
+        <file>data/images/cover-shadow.png</file>
+        <file>data/images/filter.png</file>
+        <file>data/images/loved.png</file>
+        <file>data/images/not-loved.png</file>
+        <file>data/images/no-album-art-placeholder.png</file>
+        <file>data/images/no-artist-image-placeholder.png</file>
+        <file>data/images/track-placeholder.png</file>
+        <file>data/images/now-playing-panel.png</file>
+        <file>data/images/now-playing-speaker.png</file>
+        <file>data/images/pause-pressed.png</file>
+        <file>data/images/pause-rest.png</file>
+        <file>data/images/play-pressed.png</file>
+        <file>data/images/play-rest.png</file>
+        <file>data/images/sipplugin-add.png</file>
+        <file>data/images/sipplugin-remove.png</file>
+        <file>data/images/playlist-icon.png</file>
+        <file>data/images/repeat-1-on-pressed.png</file>
+        <file>data/images/repeat-1-on-rest.png</file>
+        <file>data/images/repeat-all-on-pressed.png</file>
+        <file>data/images/repeat-all-on-rest.png</file>
+        <file>data/images/repeat-off-pressed.png</file>
+        <file>data/images/repeat-off-rest.png</file>
+        <file>data/images/search-box-dismiss-x.png</file>
+        <file>data/images/seek-and-volume-knob-pressed.png</file>
+        <file>data/images/seek-and-volume-knob-rest.png</file>
+        <file>data/images/seek-slider-bkg.png</file>
+        <file>data/images/seek-slider-level.png</file>
+        <file>data/images/shuffle-off-pressed.png</file>
+        <file>data/images/shuffle-off-rest.png</file>
+        <file>data/images/shuffle-on-pressed.png</file>
+        <file>data/images/shuffle-on-rest.png</file>
+        <file>data/images/skip-pressed.png</file>
+        <file>data/images/skip-rest.png</file>
+        <file>data/images/user-avatar.png</file>
+        <file>data/images/view-toggle-active-centre.png</file>
+        <file>data/images/view-toggle-active-left.png</file>
+        <file>data/images/view-toggle-active-right.png</file>
+        <file>data/images/view-toggle-icon-artist-active.png</file>
+        <file>data/images/view-toggle-icon-artist-inactive.png</file>
+        <file>data/images/view-toggle-icon-cloud-active.png</file>
+        <file>data/images/view-toggle-icon-cloud-inactive.png</file>
+        <file>data/images/view-toggle-icon-list-active.png</file>
+        <file>data/images/view-toggle-icon-list-inactive.png</file>
+        <file>data/images/view-toggle-inactive-centre.png</file>
+        <file>data/images/view-toggle-inactive-left.png</file>
+        <file>data/images/view-toggle-inactive-right.png</file>
+        <file>data/images/view-toggle-pressed-centre.png</file>
+        <file>data/images/view-toggle-pressed-left.png</file>
+        <file>data/images/view-toggle-pressed-right.png</file>
+        <file>data/images/list-add.png</file>
+        <file>data/images/list-remove.png</file>
+        <file>data/images/arrow-up-double.png</file>
+        <file>data/images/arrow-down-double.png</file>
+        <file>data/images/volume-icon-full.png</file>
+        <file>data/images/arrow-right-double.png</file>
+        <file>data/images/view-refresh.png</file>
+        <file>data/images/volume-icon-muted.png</file>
+        <file>data/images/volume-slider-bkg.png</file>
+        <file>data/images/volume-slider-level.png</file>
+        <file>data/images/echonest_logo.png</file>
+        <file>data/images/loading-animation.gif</file>
+        <file>data/images/info.png</file>
+        <file>data/images/home.png</file>
+        <file>data/images/back.png</file>
+        <file>data/images/forward.png</file>
+        <file>data/images/music-icon.png</file>
+        <file>data/images/configure.png</file>
+        <file>data/images/create-playlist.png</file>
+        <file>data/images/add.png</file>
+        <file>data/images/recently-played.png</file>
+        <file>data/images/supercollection.png</file>
+        <file>data/images/sipplugin-online.png</file>
+        <file>data/images/sipplugin-offline.png</file>
+        <file>data/images/advanced-settings.png</file>
+        <file>data/images/account-settings.png</file>
+        <file>data/images/music-settings.png</file>
+        <file>data/images/resolvers-settings.png</file>
+        <file>data/images/lastfm-settings.png</file>
+        <file>data/images/automatic-playlist.png</file>
+        <file>data/images/station.png</file>
+        <file>data/images/new-additions.png</file>
+        <file>data/images/loved_playlist.png</file>
+        <file>data/images/dashboard.png</file>
+        <file>data/stylesheets/topbar-radiobuttons.css</file>
+        <file>data/icons/tomahawk-icon-16x16.png</file>
+        <file>data/icons/tomahawk-icon-32x32.png</file>
+        <file>data/icons/tomahawk-icon-64x64.png</file>
+        <file>data/icons/tomahawk-icon-128x128.png</file>
+        <file>data/icons/tomahawk-icon-256x256.png</file>
+        <file>data/icons/tomahawk-icon-512x512.png</file>
+        <file>data/icons/audio-x-generic-22x22.png</file>
+        <file>data/icons/audio-x-generic-32x32.png</file>
+        <file>data/icons/audio-x-generic-16x16.png</file>
+        <file>data/www/auth.html</file>
+        <file>data/www/auth.na.html</file>
+        <file>data/www/tomahawk_banner_small.png</file>
+        <file>data/sql/dbmigrate-22_to_23.sql</file>
+        <file>data/sql/dbmigrate-23_to_24.sql</file>
+        <file>data/sql/dbmigrate-24_to_25.sql</file>
+        <file>data/sql/dbmigrate-25_to_26.sql</file>
+        <file>data/js/tomahawk.js</file>
+        <file>data/images/avatar_frame.png</file>
+    </qresource>
 </RCC>

src/CMakeLists.osx.txt

@@ -41,12 +41,17 @@ if (APPLE)
               edited_plist # save in this variable
               "${plist}" # from the contents of this var
           )
-  IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
-    STRING( REPLACE "http://download.tomahawk-player.org/sparkle" # match this
-              "http://download.tomahawk-player.org/sparkle-debug"  #replace with debug url
-              edited_plist # save in this variable
-              "${edited_plist}" # from the contents of this var
-          )
-  ENDIF()
+  # Disable non-release sparkle for now. We haven't used it yet.
+#  IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+#    STRING( REPLACE "http://download.tomahawk-player.org/sparkle" # match this
+#              "http://download.tomahawk-player.org/sparkle-debug"  #replace with debug url
+#              edited_plist # save in this variable
+#              "${edited_plist}" # from the contents of this var
+#          )
+#  ENDIF()
   FILE( WRITE ${CMAKE_BINARY_DIR}/Info.plist "${edited_plist}" )
+
+  FILE(COPY ${CMAKE_SOURCE_DIR}/admin/mac/sparkle_pub.pem
+    DESTINATION "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/Resources")
+
 endif (APPLE)

src/CMakeLists.txt

@@ -14,7 +14,7 @@ SET( QT_USE_QTXML TRUE )
 SET( QT_USE_QTWEBKIT TRUE )
 
 INCLUDE( ${QT_USE_FILE} )
-INCLUDE( ${CMAKE_MODULE_PATH}/AddAppIconMacro.cmake )
+INCLUDE( AddAppIconMacro )
 
 #SET( CMAKE_BUILD_TYPE "Release" )
 SET( CMAKE_VERBOSE_MAKEFILE ON )
@@ -72,6 +72,7 @@ SET( tomahawkSourcesGui ${tomahawkSourcesGui}
      configdelegatebase.cpp
      sipconfigdelegate.cpp
      resolverconfigdelegate.cpp
+     settingslistdelegate.cpp
      resolversmodel.cpp
      tomahawkwindow.cpp
 )
@@ -115,6 +116,7 @@ SET( tomahawkHeadersGui ${tomahawkHeadersGui}
      configdelegatebase.h
      resolverconfigdelegate.h
      sipconfigdelegate.h
+     settingslistdelegate.h
      resolversmodel.h
      delegateconfigwrapper.h
      tomahawkwindow.h
@@ -235,7 +237,6 @@ TARGET_LINK_LIBRARIES( tomahawk
     ${QXTWEB_LIBRARIES}
     ${QJSON_LIBRARIES}
     ${TAGLIB_LIBRARIES}
-    ${CLUCENE_LIBRARIES}
 )
 
 

src/CPack.txt

@@ -1,70 +0,0 @@
-# cd build ; cmake -DCPACK_GENERATOR=DEB .. ; make package
-
-INCLUDE(InstallRequiredSystemLibraries)
-
-set(CPACK_PACKAGING_INSTALL_PREFIX /usr/local)
-
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Tomahawk desktop player")
-SET(CPACK_PACKAGE_NAME "tomahawk")
-SET(CPACK_PACKAGE_VENDOR "tomahawk.org")
-SET(CPACK_PACKAGE_CONTACT "Richard Jones")
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "rj@tomahawk.org")
-
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/../README")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt")
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
-#SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386") # Default: Output of dpkg --print-architecture or i386
-# Copied from generator script, needs to be set for inclusion into filename of package:
-# $ dpkg --print-architecture
-FIND_PROGRAM(DPKG_CMD dpkg)
-IF(NOT DPKG_CMD)
-    MESSAGE(STATUS "Can not find dpkg in your path, default to i386.")
-    SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386)
-ELSE(NOT DPKG_CMD)
-    EXECUTE_PROCESS(COMMAND "${DPKG_CMD}" --print-architecture
-                OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-ENDIF(NOT DPKG_CMD)
-
-EXECUTE_PROCESS(COMMAND "date" "+%s"
-                OUTPUT_VARIABLE TIMEMARK
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-               )
-
-# eg: tomahawk-i386-1.0.0
-SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}-${CPACK_PACKAGE_VERSION}_${TIMEMARK}")
-
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
-
-IF(WIN32 AND NOT UNIX)
-  ###
-ELSE(WIN32 AND NOT UNIX)
-#  SET(CPACK_STRIP_FILES "tomahawk")
-#  SET(CPACK_SOURCE_STRIP_FILES "")
-ENDIF(WIN32 AND NOT UNIX)
-
-# Nsis only? SET(CPACK_PACKAGE_EXECUTABLES "tomahawk" "tomahawk")
-
-#gnutls is in here because gloox needs it, and we link statically to gloox:
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>=4:4.7.0-0ubuntu1), libtag1c2a (>=1.6.2-0ubuntu1), liblastfm-dev (>=0.4.0~really0.3.3-0ubuntu1), libqt4-sql-sqlite (>=4:4.7.0-0ubuntu1), libvorbis0a (>=1.2.3-3ubuntu1), libmad0 (>=0.15.1b-4ubuntu1), libasound2 (>=1.0.22-0ubuntu7), zlib1g (>=1:1.2.3.3.dfsg-15ubuntu1), libqjson-dev (>=0.7.1-1), libgnutls26 (>= 2.7.14-0), libgloox8 (>=1.0-1)")
-
-#SET(CPACK_DEBIAN_PACKAGE_SECTION "music")
-
-INSTALL(
-    TARGETS tomahawk DESTINATION bin
-    RUNTIME DESTINATION bin
-#    LIBRARY DESTINATION lib${LIB_SUFFIX}
-#    ARCHIVE DESTINATION lib${LIB_SUFFIX}
-       )
-
-INSTALL(
-    PROGRAMS ${CMAKE_BINARY_DIR}/tomahawk
-    DESTINATION bin
-    )
-
-INCLUDE(CPack)

src/PipelineStatusView.cpp

@@ -23,6 +23,8 @@
 
 #include "libtomahawk/pipeline.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 
@@ -41,6 +43,7 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
     headers << tr( "Searching For" ) << tr( "Pending" );
     m_tree->setHeaderLabels( headers );
 
+    m_tree->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     m_tree->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Ignored );
     m_tree->setColumnCount( 2 );
     m_tree->setColumnWidth( 0, 200 );
@@ -57,6 +60,17 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
     connect( Pipeline::instance(), SIGNAL( resolving( Tomahawk::query_ptr ) ), SLOT( onPipelineUpdate( Tomahawk::query_ptr ) ) );
     connect( Pipeline::instance(), SIGNAL( idle() ), SLOT( onPipelineUpdate() ) );
 
+#ifndef Q_WS_WIN
+    QFont f = font();
+    f.setPointSize( f.pointSize() - 1 );
+    setFont( f );
+#endif
+
+#ifdef Q_WS_MAC
+    f.setPointSize( f.pointSize() - 2 );
+    setFont( f );
+#endif
+
     onPipelineUpdate();
 }
 
@@ -64,8 +78,6 @@ PipelineStatusView::PipelineStatusView( AnimatedSplitter* parent )
 void
 PipelineStatusView::onPipelineUpdate( const query_ptr& query )
 {
-    qDebug() << Q_FUNC_INFO;
-
     QTreeWidgetItem* ti = m_tree->invisibleRootItem()->child( 0 );
 
     if ( Pipeline::instance()->activeQueryCount() && !query.isNull() )

src/PipelineStatusView.h

@@ -19,7 +19,6 @@
 #ifndef PIPELINESTATUSVIEW_H
 #define PIPELINESTATUSVIEW_H
 
-#include <QDebug>
 #include <QTreeWidget>
 
 #include "typedefs.h"
@@ -35,7 +34,6 @@ public:
     explicit PipelineStatusView( AnimatedSplitter* parent );
     virtual ~PipelineStatusView()
     {
-        qDebug() << Q_FUNC_INFO;
     }
 
     QSize sizeHint() const;

src/audiocontrols.cpp

@@ -20,16 +20,23 @@
 #include "ui_audiocontrols.h"
 
 #include <QNetworkReply>
+#include <QDropEvent>
+#include <QMouseEvent>
 
 #include "audio/audioengine.h"
 #include "viewmanager.h"
-#include "utils/imagebutton.h"
-#include "utils/tomahawkutils.h"
+#include "playlist/playlistview.h"
 #include "database/database.h"
 #include "database/databasecommand_socialaction.h"
 
 #include "album.h"
 
+#include "utils/imagebutton.h"
+#include "utils/tomahawkutils.h"
+#include "utils/logger.h"
+#include <globalactionmanager.h>
+#include "dropjob.h"
+
 using namespace Tomahawk;
 
 static QString s_acInfoIdentifier = QString( "AUDIOCONTROLS" );
@@ -42,8 +49,7 @@ AudioControls::AudioControls( QWidget* parent )
     , m_shuffled( false )
 {
     ui->setupUi( this );
-
-    ui->buttonAreaLayout->setSpacing( 2 );
+    setAcceptDrops( true );
 
     QFont font( ui->artistTrackLabel->font() );
     font.setPixelSize( 12 );
@@ -85,54 +91,9 @@ AudioControls::AudioControls( QWidget* parent )
     ui->ownerLabel->setForegroundRole( QPalette::Dark );
     ui->metaDataArea->setStyleSheet( "QWidget#metaDataArea {\nborder-width: 4px;\nborder-image: url(" RESPATH "images/now-playing-panel.png) 4 4 4 4 stretch stretch; }" );
 
-    ui->seekSlider->setFixedHeight( 20 );
     ui->seekSlider->setEnabled( true );
-    ui->seekSlider->setStyleSheet( "QSlider::groove::horizontal {"
-                                   "margin: 5px; border-width: 3px;"
-                                   "border-image: url(" RESPATH "images/seek-slider-bkg.png) 3 3 3 3 stretch stretch;"
-                                   "}"
-
-                                   "QSlider::sub-page:horizontal {"
-                                   "margin: 5px; border-width: 3px;"
-                                   "border-image: url(" RESPATH "images/seek-slider-level.png) 3 3 3 3 stretch stretch;"
-                                   "}"
-
-                                   "QSlider::handle::horizontal {"
-                                   "margin-bottom: -7px; margin-top: -7px;"
-                                   "height: 17px; width: 16px;"
-                                   "background-image: url(" RESPATH "images/seek-and-volume-knob-rest.png);"
-                                   "background-repeat: no-repeat;"
-                                   "}" );
-
-    ui->volumeSlider->setFixedHeight( 20 );
     ui->volumeSlider->setRange( 0, 100 );
     ui->volumeSlider->setValue( AudioEngine::instance()->volume() );
-    ui->volumeSlider->setStyleSheet( "QSlider::groove::horizontal {"
-                                     "margin: 5px; border-width: 3px;"
-                                     "border-image: url(" RESPATH "images/volume-slider-bkg.png) 3 3 3 3 stretch stretch;"
-                                     "}"
-
-                                     "QSlider::sub-page:horizontal {"
-                                     "margin: 5px; border-width: 3px;"
-                                     "border-image: url(" RESPATH "images/seek-slider-level.png) 3 3 3 3 stretch stretch;"
-                                     "}"
-
-                                     "QSlider::handle::horizontal {"
-                                     "margin-bottom: -7px; margin-top: -7px;"
-                                     "height: 17px; width: 16px;"
-                                     "background-image: url(" RESPATH "images/seek-and-volume-knob-rest.png);"
-                                     "background-repeat: no-repeat;"
-                                     "}" );
-
-/*    m_playAction  = new QAction( this );
-    m_pauseAction = new QAction( this );
-    m_prevAction  = new QAction( this );
-    m_nextAction  = new QAction( this );
-
-    connect( m_playAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( play() ) );
-    connect( m_pauseAction, SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( pause() ) );
-    connect( m_prevAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( previous() ) );
-    connect( m_nextAction,  SIGNAL( triggered() ), (QObject*)APP->audioEngine(), SLOT( next() ) ); */
 
     connect( ui->seekSlider,       SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( seek( int ) ) );
     connect( ui->volumeSlider,     SIGNAL( valueChanged( int ) ), AudioEngine::instance(), SLOT( setVolume( int ) ) );
@@ -172,6 +133,14 @@ AudioControls::AudioControls( QWidget* parent )
 
     connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
 
+    ui->buttonAreaLayout->setSpacing( 0 );
+    ui->stackedLayout->setSpacing( 0 );
+    ui->stackedLayout->setContentsMargins( 0, 0, 0, 0 );
+    ui->stackedLayout->setMargin( 0 );
+    ui->playPauseButton->setContentsMargins( 0, 0, 0, 0 );
+    ui->pauseButton->setContentsMargins( 0, 0, 0, 0 );
+    ui->stackedLayout->setSizeConstraint( QLayout::SetFixedSize );
+
     onPlaybackStopped(); // initial state
 }
 
@@ -210,7 +179,7 @@ AudioControls::onVolumeChanged( int volume )
 void
 AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     onPlaybackLoading( result );
 
@@ -223,7 +192,7 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
     requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
     requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo );
     requestData.customData = QVariantMap();
-    
+
     Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
 }
 
@@ -231,22 +200,20 @@ AudioControls::onPlaybackStarted( const Tomahawk::result_ptr& result )
 void
 AudioControls::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
 {
-    qDebug() << Q_FUNC_INFO << requestData.caller << requestData.type << s_acInfoIdentifier << Tomahawk::InfoSystem::InfoAlbumCoverArt;
     if ( requestData.caller != s_acInfoIdentifier || requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
     {
-        qDebug() << "Info of wrong type or not with our identifier";
         return;
     }
 
     if ( m_currentTrack.isNull() )
     {
-        qDebug() << "Current track is null when trying to apply fetched cover art";
+        tLog() << "Current track is null when trying to apply fetched cover art";
         return;
     }
 
     if ( !output.canConvert< QVariantMap >() )
     {
-        qDebug() << "Cannot convert fetched art from a QByteArray";
+        tDebug( LOGINFO ) << "Cannot convert fetched art from a QByteArray";
         return;
     }
 
@@ -269,14 +236,13 @@ void
 AudioControls::infoSystemFinished( QString target )
 {
     Q_UNUSED( target );
-    qDebug() << Q_FUNC_INFO;
 }
 
 
 void
 AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     m_currentTrack = result;
 
@@ -292,27 +258,34 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
     ui->seekSlider->setValue( 0 );
     ui->seekSlider->setVisible( true );
 
-/*    m_playAction->setEnabled( false );
-    m_pauseAction->setEnabled( true ); */
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
 
-    ui->pauseButton->setEnabled( true );
-    ui->pauseButton->setVisible( true );
-    ui->playPauseButton->setVisible( false );
-    ui->playPauseButton->setEnabled( false );
     ui->loveButton->setEnabled( true );
     ui->loveButton->setVisible( true );
 
     result->loadSocialActions();
 
-    if ( result->loved() )
+    connect( result.data(), SIGNAL( socialActionsLoaded() ), this, SLOT( socialActionsLoaded() ) );
+}
+
+void
+AudioControls::socialActionsLoaded()
+{
+    Result* r = qobject_cast< Result* >( sender() );
+    Q_ASSERT( r );
+
+    if ( m_currentTrack.data() == r )
     {
-        ui->loveButton->setPixmap( RESPATH "images/loved.png" );
-        ui->loveButton->setChecked( true );
-    }
-    else
-    {
-        ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
-        ui->loveButton->setChecked( false );
+        if ( m_currentTrack->loved() )
+        {
+            ui->loveButton->setPixmap( RESPATH "images/loved.png" );
+            ui->loveButton->setChecked( true );
+        }
+        else
+        {
+            ui->loveButton->setPixmap( RESPATH "images/not-loved.png" );
+            ui->loveButton->setChecked( false );
+        }
     }
 }
 
@@ -320,26 +293,13 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
 void
 AudioControls::onPlaybackPaused()
 {
-/*    m_pauseAction->setEnabled( false );
-    m_playAction->setEnabled( true ); */
-
-    ui->pauseButton->setVisible( false );
-    ui->pauseButton->setEnabled( false );
-    ui->playPauseButton->setEnabled( true );
-    ui->playPauseButton->setVisible( true );
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
 }
 
-
 void
 AudioControls::onPlaybackResumed()
 {
-/*    m_playAction->setEnabled( false );
-    m_pauseAction->setEnabled( true ); */
-
-    ui->playPauseButton->setVisible( false );
-    ui->playPauseButton->setEnabled( false );
-    ui->pauseButton->setVisible( true );
-    ui->pauseButton->setEnabled( true );
+    ui->stackedLayout->setCurrentWidget( ui->pauseButton );
     ui->loveButton->setVisible( true );
 }
 
@@ -357,15 +317,9 @@ AudioControls::onPlaybackStopped()
     ui->coverImage->setPixmap( QPixmap() );
     ui->seekSlider->setVisible( false );
 
-    ui->pauseButton->setVisible( false );
-    ui->pauseButton->setEnabled( false );
-    ui->playPauseButton->setEnabled( true );
-    ui->playPauseButton->setVisible( true );
+    ui->stackedLayout->setCurrentWidget( ui->playPauseButton );
     ui->loveButton->setEnabled( false );
     ui->loveButton->setVisible( false );
-
-/*    m_pauseAction->setEnabled( false );
-    m_playAction->setEnabled( true ); */
 }
 
 
@@ -505,6 +459,54 @@ AudioControls::onTrackClicked()
 }
 
 
+void
+AudioControls::dragEnterEvent( QDragEnterEvent* e )
+{
+    if ( DropJob::acceptsMimeData( e->mimeData() ) )
+        e->acceptProposedAction();
+}
+
+
+void
+AudioControls::dragMoveEvent( QDragMoveEvent* /* e */ )
+{
+//     if ( GlobalActionManager::instance()->acceptsMimeData( e->mimeData() ) )
+//         e->acceptProposedAction();
+}
+
+
+void
+AudioControls::dropEvent( QDropEvent* e )
+{
+    tDebug() << "AudioControls got drop:" << e->mimeData()->formats();
+    if ( DropJob::acceptsMimeData( e->mimeData() ) )
+    {
+        DropJob *dj = new DropJob();
+        connect( dj, SIGNAL( tracks( QList<Tomahawk::query_ptr> ) ), this, SLOT( droppedTracks( QList<Tomahawk::query_ptr> ) ) );
+        dj->tracksFromMimeData( e->mimeData() );
+
+        e->accept();
+    }
+}
+
+
+void
+AudioControls::droppedTracks( QList< query_ptr > tracks )
+{
+    if ( !tracks.isEmpty() )
+    {
+        // queue and play the first if nothign is playing
+        GlobalActionManager::instance()->handleOpenTrack( tracks.first() );
+
+        // just queue the rest
+        for ( int i = 1; i < tracks.size(); i++ )
+        {
+            ViewManager::instance()->queue()->model()->append( tracks[ i ] );
+        }
+    }
+}
+
+
 void
 AudioControls::onLoveButtonClicked( bool checked )
 {

src/audiocontrols.h

@@ -25,6 +25,9 @@
 #include "playlistinterface.h"
 #include "infosystem/infosystem.h"
 
+class QDropEvent;
+class QDragEnterEvent;
+class QDragMoveEvent;
 namespace Ui
 {
     class AudioControls;
@@ -48,6 +51,9 @@ public slots:
 
 protected:
     void changeEvent( QEvent* e );
+    void dragEnterEvent ( QDragEnterEvent* );
+    void dragMoveEvent ( QDragMoveEvent* );
+    void dropEvent ( QDropEvent* );
 
 private slots:
     void onPlaybackStarted( const Tomahawk::result_ptr& result );
@@ -70,14 +76,12 @@ private slots:
     void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
     void infoSystemFinished( QString target );
 
+    void droppedTracks( QList<Tomahawk::query_ptr> );
+
+    void socialActionsLoaded();
 private:
     Ui::AudioControls *ui;
 
-    QAction* m_playAction;
-    QAction* m_pauseAction;
-    QAction* m_prevAction;
-    QAction* m_nextAction;
-
     QPixmap m_defaultCover;
 
     Tomahawk::result_ptr m_currentTrack;

src/audiocontrols.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>939</width>
+    <width>929</width>
     <height>80</height>
    </rect>
   </property>
@@ -60,7 +60,7 @@
      </property>
      <layout class="QHBoxLayout" name="buttonAreaLayout">
       <item>
-       <spacer name="horizontalSpacer">
+       <spacer name="horizontalSpacer_2">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -80,18 +80,25 @@
        </widget>
       </item>
       <item>
-       <widget class="ImageButton" name="playPauseButton">
-        <property name="text">
-         <string>Play</string>
+       <layout class="QStackedLayout" name="stackedLayout">
+        <property name="spacing">
+         <number>0</number>
         </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="ImageButton" name="pauseButton">
-        <property name="text">
-         <string>Pause</string>
-        </property>
-       </widget>
+        <item>
+         <widget class="ImageButton" name="playPauseButton">
+          <property name="text">
+           <string>Play</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="ImageButton" name="pauseButton">
+          <property name="text">
+           <string>Pause</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <widget class="ImageButton" name="nextButton">
@@ -101,7 +108,7 @@
        </widget>
       </item>
       <item>
-       <spacer name="horizontalSpacer_2">
+       <spacer name="horizontalSpacer">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
@@ -330,7 +337,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QSlider" name="seekSlider">
+           <widget class="SeekSlider" name="seekSlider">
             <property name="minimumSize">
              <size>
               <width>0</width>
@@ -482,7 +489,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QSlider" name="volumeSlider">
+          <widget class="SeekSlider" name="volumeSlider">
            <property name="minimumSize">
             <size>
              <width>0</width>
@@ -522,6 +529,11 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>SeekSlider</class>
+   <extends>QSlider</extends>
+   <header location="global">widgets/SeekSlider.h</header>
+  </customwidget>
   <customwidget>
    <class>ImageButton</class>
    <extends>QPushButton</extends>

src/configdelegatebase.cpp

@@ -18,12 +18,13 @@
 
 #include "configdelegatebase.h"
 
-#include "utils/tomahawkutils.h"
-
 #include <QPainter>
 #include <QApplication>
 #include <QMouseEvent>
 
+#include "utils/tomahawkutils.h"
+#include "utils/logger.h"
+
 ConfigDelegateBase::ConfigDelegateBase ( QObject* parent )
     : QStyledItemDelegate ( parent )
 {
@@ -97,13 +98,13 @@ ConfigDelegateBase::editorEvent ( QEvent* event, QAbstractItemModel* model, cons
             return false;
 
         // eat the double click events inside the check rect
-            if( event->type() == QEvent::MouseButtonDblClick ) {
-                return true;
-            }
+        if( event->type() == QEvent::MouseButtonDblClick ) {
+            return true;
+        }
 
-            Qt::CheckState curState = static_cast< Qt::CheckState >( index.data( Qt::CheckStateRole ).toInt() );
-            Qt::CheckState newState = curState == Qt::Checked ? Qt::Unchecked : Qt::Checked;
-            return model->setData( index, newState, Qt::CheckStateRole );
+        Qt::CheckState curState = static_cast< Qt::CheckState >( index.data( Qt::CheckStateRole ).toInt() );
+        Qt::CheckState newState = curState == Qt::Checked ? Qt::Unchecked : Qt::Checked;
+        return model->setData( index, newState, Qt::CheckStateRole );
 
     } else if( event->type() == QEvent::MouseButtonPress ) {
         QMouseEvent* me = static_cast< QMouseEvent* >( event );

src/diagnosticsdialog.cpp

@@ -19,17 +19,21 @@
 #include "diagnosticsdialog.h"
 #include "ui_diagnosticsdialog.h"
 
+#include "config.h"
+
 #include <sip/SipHandler.h>
 #include <network/servent.h>
 #include <sourcelist.h>
 
 #include <QTextEdit>
-#include <QDebug>
 #include <QDialogButtonBox>
 #include <QPushButton>
 #include <QApplication>
 #include <QClipboard>
 
+#include "utils/logger.h"
+
+
 DiagnosticsDialog::DiagnosticsDialog( QWidget *parent )
     : QDialog( parent )
     , ui( new Ui::DiagnosticsDialog )
@@ -52,6 +56,11 @@ void DiagnosticsDialog::updateLogView()
             .arg( QDateTime::currentDateTime().toString() )
     );
 
+    // network
+    log.append(
+        "TOMAHAWK-VERSION: " TOMAHAWK_VERSION "\n\n\n"
+    );
+
     // network
     log.append(
         "NETWORK:\n"

src/diagnosticsdialog.h

@@ -20,7 +20,6 @@
 #define DIAGNOSTICSDIALOG_H
 
 #include <QDialog>
-#include <QDebug>
 
 namespace Ui
 {

src/diagnosticsdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>621</width>
-    <height>434</height>
+    <width>724</width>
+    <height>433</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -20,6 +20,9 @@
    <string>Tomahawk Diagnostics</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="margin">
+    <number>4</number>
+   </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
@@ -57,8 +60,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="../resources.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

src/libtomahawk/CMakeLists.txt

@@ -21,7 +21,6 @@ set( libSources
     artist.cpp
     album.cpp
     collection.cpp
-    webcollection.cpp
     playlist.cpp
     resolver.cpp
     query.cpp
@@ -31,7 +30,8 @@ set( libSources
     viewpage.cpp
     viewmanager.cpp
     globalactionmanager.cpp
-    contextMenu.cpp
+    contextmenu.cpp
+    dropjob.cpp
 
     sip/SipPlugin.cpp
     sip/SipHandler.cpp
@@ -76,6 +76,7 @@ set( libSources
     database/databasecommand_setdynamicplaylistrevision.cpp
     database/databasecommand_createdynamicplaylist.cpp
     database/databasecommand_loaddynamicplaylist.cpp
+    database/databasecommand_loaddynamicplaylistentries.cpp
     database/databasecommand_loadallautoplaylists.cpp
     database/databasecommand_loadallstations.cpp
     database/databasecommand_deletedynamicplaylist.cpp
@@ -83,6 +84,7 @@ set( libSources
     database/databasecommand_clientauthvalid.cpp
     database/databasecommand_socialaction.cpp
     database/databasecommand_loadsocialactions.cpp
+    database/databasecommand_genericselect.cpp
     database/database.cpp
 
     infosystem/infosystemcache.cpp
@@ -91,6 +93,7 @@ set( libSources
     infosystem/infoplugins/generic/echonestplugin.cpp
     infosystem/infoplugins/generic/lastfmplugin.cpp
     infosystem/infoplugins/generic/musixmatchplugin.cpp
+    infosystem/infoplugins/generic/musicbrainzPlugin.cpp
 
     playlist/treemodel.cpp
     playlist/treeproxymodel.cpp
@@ -117,6 +120,7 @@ set( libSources
     playlist/albumitemdelegate.cpp
     playlist/albumview.cpp
     playlist/artistview.cpp
+    playlist/customplaylistview.cpp
 
     playlist/topbar/topbar.cpp
     playlist/topbar/clearbutton.cpp
@@ -143,6 +147,8 @@ set( libSources
     playlist/dynamic/widgets/CollapsibleControls.cpp
     playlist/dynamic/widgets/DynamicSetupWidget.cpp
     playlist/dynamic/widgets/LoadingSpinner.cpp
+    playlist/dynamic/database/DatabaseControl.cpp
+    playlist/dynamic/database/DatabaseGenerator.cpp
 
     network/bufferiodevice.cpp
     network/msgprocessor.cpp
@@ -158,22 +164,29 @@ set( libSources
     utils/querylabel.cpp
     utils/elidedlabel.cpp
     utils/imagebutton.cpp
-    utils/progresstreeview.cpp
+    utils/logger.cpp
     utils/proxystyle.cpp
     utils/widgetdragfilter.cpp
     utils/animatedsplitter.cpp
     utils/xspfloader.cpp
     utils/xspfgenerator.cpp
+    utils/jspfloader.cpp
+    utils/spotifyparser.cpp
+    utils/rdioparser.cpp
+    utils/shortenedlinkparser.cpp
 
     widgets/newplaylistwidget.cpp
     widgets/searchwidget.cpp
+    widgets/SeekSlider.cpp
     widgets/playlisttypeselectordlg.cpp
     widgets/welcomewidget.cpp
     widgets/welcomeplaylistmodel.cpp
     widgets/overlaywidget.cpp
     widgets/HeaderLabel.cpp
+    widgets/SocialPlaylistWidget.cpp
     widgets/infowidgets/sourceinfowidget.cpp
     widgets/infowidgets/ArtistInfoWidget.cpp
+    widgets/infowidgets/AlbumInfoWidget.cpp
 
     kdsingleapplicationguard/kdsingleapplicationguard.cpp
     kdsingleapplicationguard/kdsharedmemorylocker.cpp
@@ -189,7 +202,6 @@ set( libHeaders
 
     aclsystem.h
     collection.h
-    webcollection.h
     query.h
     resolver.h
     result.h
@@ -197,11 +209,11 @@ set( libHeaders
     sourceplaylistinterface.h
     viewmanager.h
     globalactionmanager.h
-    contextMenu.h
+    contextmenu.h
+    dropjob.h
 
     artist.h
     album.h
-    track.h
     playlist.h
 
     sip/SipPlugin.h
@@ -247,6 +259,7 @@ set( libHeaders
     database/databasecommand_setdynamicplaylistrevision.h
     database/databasecommand_createdynamicplaylist.h
     database/databasecommand_loaddynamicplaylist.h
+    database/databasecommand_loaddynamicplaylistentries.h
     database/databasecommand_deletedynamicplaylist.h
     database/databasecommand_loadallautoplaylists.h
     database/databasecommand_loadallstations.h
@@ -254,6 +267,7 @@ set( libHeaders
     database/databasecommand_clientauthvalid.h
     database/databasecommand_socialaction.h
     database/databasecommand_loadsocialactions.h
+    database/databasecommand_genericselect.h
 
     infosystem/infosystem.h
     infosystem/infosystemworker.h
@@ -261,6 +275,7 @@ set( libHeaders
     infosystem/infoplugins/generic/echonestplugin.h
     infosystem/infoplugins/generic/lastfmplugin.h
     infosystem/infoplugins/generic/musixmatchplugin.h
+    infosystem/infoplugins/generic/musicbrainzPlugin.h
 
     network/bufferiodevice.h
     network/msgprocessor.h
@@ -297,6 +312,7 @@ set( libHeaders
     playlist/albumitemdelegate.h
     playlist/albumview.h
     playlist/artistview.h
+    playlist/customplaylistview.h
 
     playlist/topbar/topbar.h
     playlist/topbar/clearbutton.h
@@ -323,26 +339,34 @@ set( libHeaders
     playlist/dynamic/widgets/CollapsibleControls.h
     playlist/dynamic/widgets/DynamicSetupWidget.h
     playlist/dynamic/widgets/LoadingSpinner.h
+    playlist/dynamic/database/DatabaseControl.h
+    playlist/dynamic/database/DatabaseGenerator.h
 
     utils/querylabel.h
     utils/elidedlabel.h
     utils/animatedcounterlabel.h
     utils/imagebutton.h
-    utils/progresstreeview.h
     utils/widgetdragfilter.h
     utils/animatedsplitter.h
     utils/xspfloader.h
     utils/xspfgenerator.h
+    utils/jspfloader.h
+    utils/spotifyparser.h
+    utils/rdioparser.h
+    utils/shortenedlinkparser.h
 
     widgets/newplaylistwidget.h
     widgets/searchwidget.h
+    widgets/SeekSlider.h
     widgets/playlisttypeselectordlg.h
     widgets/welcomewidget.h
     widgets/welcomeplaylistmodel.h
     widgets/overlaywidget.h
     widgets/HeaderLabel.h
+    widgets/SocialPlaylistWidget.h
     widgets/infowidgets/sourceinfowidget.h
     widgets/infowidgets/ArtistInfoWidget.h
+    widgets/infowidgets/AlbumInfoWidget.h
 
     kdsingleapplicationguard/kdsingleapplicationguard.h
 )
@@ -363,8 +387,10 @@ set( libUI ${libUI}
     widgets/newplaylistwidget.ui
     widgets/searchwidget.ui
     widgets/welcomewidget.ui
+    widgets/SocialPlaylistWidget.ui
     widgets/infowidgets/sourceinfowidget.ui
     widgets/infowidgets/ArtistInfoWidget.ui
+    widgets/infowidgets/AlbumInfoWidget.ui
     playlist/topbar/topbar.ui
     playlist/infobar/infobar.ui
 )
@@ -416,11 +442,14 @@ IF( APPLE )
     FIND_LIBRARY( SCRIPTINGBRIDGE_LIBRARY ScriptingBridge )
     MARK_AS_ADVANCED( COREAUDIO_LIBRARY COREFOUNDATION_LIBRARY FOUNDATION_LIBRARY SCRIPTINGBRIDGE_LIBRARY )
 
-    SET( libSources ${libSources} 
+    SET( libSources ${libSources}
       infosystem/infoplugins/mac/adium.mm
-      infosystem/infoplugins/mac/adiumplugin.cpp )
+      infosystem/infoplugins/mac/adiumplugin.cpp
+      widgets/maclineedit.mm
+      utils/tomahawkutils_mac.mm )
 
-    SET( libHeaders ${libHeaders} 
+    SET( libHeaders ${libHeaders}
+      widgets/maclineedit.h
       infosystem/infoplugins/mac/adium.h
       infosystem/infoplugins/mac/adiumplugin.h )
 
@@ -431,6 +460,8 @@ IF( APPLE )
         ${COREFOUNDATION_LIBRARY}
 	${FOUNDATION_LIBRARY}
 	${SCRIPTINGBRIDGE_LIBRARY}
+
+        /System/Library/Frameworks/AppKit.framework
     )
 ENDIF( APPLE )
 
@@ -455,6 +486,7 @@ target_link_libraries( tomahawklib
     ${TAGLIB_LIBRARIES}
     ${CLUCENE_LIBRARIES}
     ${LIBECHONEST_LIBRARY}
+    ${QT_QTUITOOLS_LIBRARY}
     ${QT_LIBRARIES}
     ${OS_SPECIFIC_LINK_LIBRARIES}
     ${CMAKE_THREAD_LIBS_INIT}

src/libtomahawk/aclsystem.cpp

@@ -18,12 +18,14 @@
 
 #include "aclsystem.h"
 
-#include <QtDebug>
 #include <QMutexLocker>
 #include <QVariant>
 
 #include <tomahawksettings.h>
 
+#include "utils/logger.h"
+
+
 ACLSystem* ACLSystem::s_instance = 0;
 
 ACLSystem*

src/libtomahawk/album.cpp

@@ -18,15 +18,26 @@
 
 #include "album.h"
 
-#include <QDebug>
-
 #include "collection.h"
 #include "database/database.h"
 #include "database/databasecommand_alltracks.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 
+album_ptr
+Album::get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate )
+{
+    int albid = Database::instance()->impl()->albumId( artist->id(), name, autoCreate );
+    if ( albid < 1 )
+        return album_ptr();
+
+    return Album::get( albid, name, artist );
+}
+
+
 album_ptr
 Album::get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist )
 {

src/libtomahawk/album.h

@@ -37,6 +37,7 @@ class DLLEXPORT Album : public QObject, public PlaylistInterface
 Q_OBJECT
 
 public:
+    static album_ptr get( const Tomahawk::artist_ptr& artist, const QString& name, bool autoCreate = false );
     static album_ptr get( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist );
 
     Album( unsigned int id, const QString& name, const Tomahawk::artist_ptr& artist );

src/libtomahawk/artist.cpp

@@ -18,12 +18,12 @@
 
 #include "artist.h"
 
-#include <QDebug>
-
 #include "collection.h"
 #include "database/database.h"
 #include "database/databasecommand_alltracks.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 

src/libtomahawk/audio/audioengine.cpp

@@ -30,12 +30,15 @@
 
 #include "album.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 AudioEngine* AudioEngine::s_instance = 0;
 
 static QString s_aeInfoIdentifier = QString( "AUDIOENGINE" );
 
+
 AudioEngine*
 AudioEngine::instance()
 {
@@ -46,18 +49,18 @@ AudioEngine::instance()
 AudioEngine::AudioEngine()
     : QObject()
     , m_isPlayingHttp( false )
-    , m_playlist( 0 )
-    , m_currentTrackPlaylist( 0 )
     , m_queue( 0 )
     , m_timeElapsed( 0 )
     , m_expectStop( false )
     , m_waitingOnNewTrack( false )
     , m_infoSystemConnected( false )
+    , m_state( Stopped )
 {
     s_instance = this;
-    qDebug() << "Init AudioEngine";
+    tDebug() << "Init AudioEngine";
 
     qRegisterMetaType< AudioErrorCode >("AudioErrorCode");
+    qRegisterMetaType< AudioState >("AudioState");
 
     m_mediaObject = new Phonon::MediaObject( this );
     m_audioOutput = new Phonon::AudioOutput( Phonon::MusicCategory, this );
@@ -81,7 +84,7 @@ AudioEngine::AudioEngine()
 
 AudioEngine::~AudioEngine()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug() << Q_FUNC_INFO;
     m_mediaObject->stop();
 //    stop();
 
@@ -90,6 +93,21 @@ AudioEngine::~AudioEngine()
 }
 
 
+QStringList
+AudioEngine::supportedMimeTypes() const
+{
+    if ( m_supportedMimeTypes.isEmpty() )
+    {
+        m_supportedMimeTypes = Phonon::BackendCapabilities::availableMimeTypes();
+        m_supportedMimeTypes << "audio/basic";
+
+        return m_supportedMimeTypes;
+    }
+    else
+        return m_supportedMimeTypes;
+}
+
+
 void
 AudioEngine::playPause()
 {
@@ -103,7 +121,7 @@ AudioEngine::playPause()
 void
 AudioEngine::play()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     if ( isPaused() )
     {
@@ -126,10 +144,11 @@ AudioEngine::play()
 void
 AudioEngine::pause()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     m_mediaObject->pause();
     emit paused();
+
     Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo( s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNowPaused, QVariant() );
 }
 
@@ -137,12 +156,13 @@ AudioEngine::pause()
 void
 AudioEngine::stop()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
+    setState( Stopped );
     m_mediaObject->stop();
 
-    if ( m_playlist )
-        m_playlist->reset();
+    if ( !m_playlist.isNull() )
+        m_playlist.data()->reset();
 
     setCurrentTrack( Tomahawk::result_ptr() );
     emit stopped();
@@ -166,13 +186,13 @@ AudioEngine::stop()
 void
 AudioEngine::previous()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
-    if ( !m_playlist )
+    if ( m_playlist.isNull() )
         return;
 
-    if ( m_playlist->skipRestrictions() == PlaylistInterface::NoSkip ||
-         m_playlist->skipRestrictions() == PlaylistInterface::NoSkipBackwards )
+    if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
+         m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipBackwards )
         return;
 
     loadPreviousTrack();
@@ -182,17 +202,17 @@ AudioEngine::previous()
 void
 AudioEngine::next()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
-    if ( !m_playlist )
+    if ( m_playlist.isNull() )
         return;
 
-    if ( m_playlist->skipRestrictions() == PlaylistInterface::NoSkip ||
-         m_playlist->skipRestrictions() == PlaylistInterface::NoSkipForwards )
+    if ( m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkip ||
+         m_playlist.data()->skipRestrictions() == PlaylistInterface::NoSkipForwards )
         return;
 
-    if ( !m_currentTrack.isNull() && !m_playlist->hasNextItem() &&
-          m_currentTrack->id() == m_playlist->currentItem()->id() )
+    if ( !m_currentTrack.isNull() && !m_playlist.data()->hasNextItem() &&
+         ( m_playlist.data()->currentItem().isNull() || ( m_currentTrack->id() == m_playlist.data()->currentItem()->id() ) ) )
     {
         //For instance, when doing a catch-up while listening along, but the person
         //you're following hasn't started a new track yet...don't do anything
@@ -206,15 +226,12 @@ AudioEngine::next()
 void
 AudioEngine::seek( int ms )
 {
-    if ( !m_playlist )
-        return;
-
-    if ( m_playlist->seekRestrictions() == PlaylistInterface::NoSeek )
+    if ( !m_playlist.isNull() && m_playlist.data()->seekRestrictions() == PlaylistInterface::NoSeek )
         return;
 
     if ( isPlaying() || isPaused() )
     {
-        qDebug() << Q_FUNC_INFO << ms;
+        tDebug( LOGVERBOSE ) << Q_FUNC_INFO << ms;
         m_mediaObject->seek( ms );
     }
 }
@@ -223,13 +240,14 @@ AudioEngine::seek( int ms )
 void
 AudioEngine::setVolume( int percentage )
 {
-    //qDebug() << Q_FUNC_INFO;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << percentage;
 
     percentage = qBound( 0, percentage, 100 );
     m_audioOutput->setVolume( (qreal)percentage / 100.0 );
     emit volumeChanged( percentage );
 }
 
+
 void
 AudioEngine::mute()
 {
@@ -251,19 +269,19 @@ AudioEngine::sendWaitingNotification() const
 void
 AudioEngine::sendNowPlayingNotification()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     if ( ! m_infoSystemConnected )
     {
         connect( Tomahawk::InfoSystem::InfoSystem::instance(),
              SIGNAL( info( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ),
              SLOT( infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData, QVariant ) ) );
-    
+
         connect( Tomahawk::InfoSystem::InfoSystem::instance(), SIGNAL( finished( QString ) ), SLOT( infoSystemFinished( QString ) ) );
 
         m_infoSystemConnected = true;
     }
-    
+
     Tomahawk::InfoSystem::InfoCriteriaHash trackInfo;
     trackInfo["artist"] = m_currentTrack->album()->artist()->name();
     trackInfo["album"] = m_currentTrack->album()->name();
@@ -273,7 +291,7 @@ AudioEngine::sendNowPlayingNotification()
     requestData.type = Tomahawk::InfoSystem::InfoAlbumCoverArt;
     requestData.input = QVariant::fromValue< Tomahawk::InfoSystem::InfoCriteriaHash >( trackInfo );
     requestData.customData = QVariantMap();
-    
+
     Tomahawk::InfoSystem::InfoSystem::instance()->getInfo( requestData );
 }
 
@@ -281,12 +299,9 @@ AudioEngine::sendNowPlayingNotification()
 void
 AudioEngine::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output )
 {
-    qDebug() << Q_FUNC_INFO;
-    
     if ( requestData.caller != s_aeInfoIdentifier ||
          requestData.type != Tomahawk::InfoSystem::InfoAlbumCoverArt )
     {
-        qDebug() << Q_FUNC_INFO << " not destined for us or wrong type, caller is " << requestData.caller << " and type is " << requestData.type;
         return;
     }
 
@@ -297,10 +312,8 @@ AudioEngine::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData,
                                      .arg( m_currentTrack->album()->name() );
     if ( !output.isNull() && output.isValid() )
     {
-        qDebug() << Q_FUNC_INFO << " output is valid";
         QVariantMap returnedData = output.value< QVariantMap >();
         const QByteArray ba = returnedData["imgbytes"].toByteArray();
-        qDebug() << "ba.length = " << ba.length();
         if ( ba.length() )
         {
             QPixmap pm;
@@ -308,7 +321,7 @@ AudioEngine::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData,
             playInfo["image"] = QVariant( pm.toImage() );
         }
     }
-    
+
     Tomahawk::InfoSystem::InfoSystem::instance()->pushInfo(
         s_aeInfoIdentifier, Tomahawk::InfoSystem::InfoNotifyUser,
         QVariant::fromValue< QVariantMap >( playInfo ) );
@@ -319,24 +332,13 @@ void
 AudioEngine::infoSystemFinished( QString caller )
 {
     Q_UNUSED( caller );
-    qDebug() << Q_FUNC_INFO;
-}
-
-
-void
-AudioEngine::onTrackAboutToFinish()
-{
-    qDebug() << Q_FUNC_INFO;
 }
 
 
 bool
 AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
 {
-    qDebug() << Q_FUNC_INFO << thread() << result;
-
     bool err = false;
-
     {
         QSharedPointer<QIODevice> io;
 
@@ -352,7 +354,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
 
                 if ( !io || io.isNull() )
                 {
-                    qDebug() << "Error getting iodevice for item";
+                    tLog() << "Error getting iodevice for" << result->url();
                     err = true;
                 }
             }
@@ -360,7 +362,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
 
         if ( !err )
         {
-            qDebug() << "Starting new song from url:" << m_currentTrack->url();
+            tLog() << "Starting new song:" << m_currentTrack->url();
             emit loading( m_currentTrack );
 
             if ( !isHttpResult( m_currentTrack->url() ) && !isLocalResult( m_currentTrack->url() ) )
@@ -371,13 +373,26 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
             }
             else
             {
-                QUrl furl = m_currentTrack->url();
-                if ( m_currentTrack->url().contains( "?" ) )
+                if ( !isLocalResult( m_currentTrack->url() ) )
                 {
-                    furl = QUrl( m_currentTrack->url().left( m_currentTrack->url().indexOf( '?' ) ) );
-                    furl.setEncodedQuery( QString( m_currentTrack->url().mid( m_currentTrack->url().indexOf( '?' ) + 1 ) ).toLocal8Bit() );
+                    QUrl furl = m_currentTrack->url();
+                    if ( m_currentTrack->url().contains( "?" ) )
+                    {
+                        furl = QUrl( m_currentTrack->url().left( m_currentTrack->url().indexOf( '?' ) ) );
+                        furl.setEncodedQuery( QString( m_currentTrack->url().mid( m_currentTrack->url().indexOf( '?' ) + 1 ) ).toLocal8Bit() );
+                    }
+                    m_mediaObject->setCurrentSource( furl );
                 }
-                m_mediaObject->setCurrentSource( furl );
+                else
+                {
+                    QString furl = m_currentTrack->url();
+#ifdef Q_OS_WIN32
+                    if ( furl.startsWith( "file://" ) )
+                        furl = furl.right( furl.length() - 7 );
+#endif
+                    m_mediaObject->setCurrentSource( furl );
+                }
+
                 m_mediaObject->currentSource().setAutoDelete( true );
                 m_isPlayingHttp = true;
             }
@@ -398,7 +413,7 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
             trackInfo["title"] = m_currentTrack->track();
             trackInfo["artist"] = m_currentTrack->artist()->name();
             trackInfo["album"] = m_currentTrack->album()->name();
-            
+
             if ( TomahawkSettings::instance()->verboseNotifications() )
                 sendNowPlayingNotification();
 
@@ -419,18 +434,19 @@ AudioEngine::loadTrack( const Tomahawk::result_ptr& result )
     return true;
 }
 
+
 void
 AudioEngine::loadPreviousTrack()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
-    if ( !m_playlist )
+    if ( m_playlist.isNull() )
     {
         stop();
         return;
     }
 
-    Tomahawk::result_ptr result = m_playlist->previousItem();
+    Tomahawk::result_ptr result = m_playlist.data()->previousItem();
     if ( !result.isNull() )
         loadTrack( result );
     else
@@ -441,7 +457,7 @@ AudioEngine::loadPreviousTrack()
 void
 AudioEngine::loadNextTrack()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO;
 
     Tomahawk::result_ptr result;
 
@@ -450,16 +466,16 @@ AudioEngine::loadNextTrack()
         result = m_queue->nextItem();
     }
 
-    if ( m_playlist && result.isNull() )
+    if ( !m_playlist.isNull() && result.isNull() )
     {
-        result = m_playlist->nextItem();
+        result = m_playlist.data()->nextItem();
     }
 
     if ( !result.isNull() )
         loadTrack( result );
     else
     {
-        if ( m_playlist && m_playlist->retryMode() == Tomahawk::PlaylistInterface::Retry )
+        if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == Tomahawk::PlaylistInterface::Retry )
             m_waitingOnNewTrack = true;
         stop();
     }
@@ -469,17 +485,17 @@ AudioEngine::loadNextTrack()
 void
 AudioEngine::playItem( Tomahawk::PlaylistInterface* playlist, const Tomahawk::result_ptr& result )
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGEXTRA ) << Q_FUNC_INFO << ( result.isNull() ? QString() : result->url() );
 
-    if ( m_playlist )
-        m_playlist->reset();
+    if ( !m_playlist.isNull() )
+        m_playlist.data()->reset();
 
     setPlaylist( playlist );
-    m_currentTrackPlaylist = playlist;
+    m_currentTrackPlaylist = playlist->getSharedPointer();
 
     if ( !result.isNull() )
         loadTrack( result );
-    else if ( m_playlist && m_playlist->retryMode() == PlaylistInterface::Retry )
+    else if ( !m_playlist.isNull() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
     {
         m_waitingOnNewTrack = true;
         stop();
@@ -501,7 +517,7 @@ AudioEngine::playlistNextTrackReady()
 void
 AudioEngine::onAboutToFinish()
 {
-    qDebug() << Q_FUNC_INFO;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO;
     m_expectStop = true;
 }
 
@@ -509,23 +525,43 @@ AudioEngine::onAboutToFinish()
 void
 AudioEngine::onStateChanged( Phonon::State newState, Phonon::State oldState )
 {
-    qDebug() << Q_FUNC_INFO << oldState << newState << m_expectStop;
+    tDebug( LOGVERBOSE ) << Q_FUNC_INFO << oldState << newState << m_expectStop;
 
     if ( newState == Phonon::ErrorState )
     {
-        qDebug() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
+        tLog() << "Phonon Error:" << m_mediaObject->errorString() << m_mediaObject->errorType();
         return;
     }
-
-    if ( !m_expectStop )
-        return;
-    m_expectStop = false;
+    if ( newState == Phonon::PlayingState )
+        setState( Playing );
 
     if ( oldState == Phonon::PlayingState )
     {
-        if ( newState == Phonon::PausedState || newState == Phonon::StoppedState )
+        bool stopped = false;
+        switch ( newState )
         {
-            qDebug() << "Loading next track.";
+            case Phonon::PausedState:
+            {
+                qint64 duration = m_mediaObject->totalTime() > 0 ? m_mediaObject->totalTime() : m_currentTrack->duration() * 1000;
+                stopped = ( duration - 1000 < m_mediaObject->currentTime() );
+                if ( !stopped )
+                    setState( Paused );
+
+                break;
+            }
+            case Phonon::StoppedState:
+            {
+                stopped = true;
+                break;
+            }
+            default:
+                break;
+        }
+
+        if ( stopped && m_expectStop )
+        {
+            m_expectStop = false;
+            tDebug( LOGEXTRA ) << "Finding next track.";
             loadNextTrack();
         }
     }
@@ -557,13 +593,15 @@ AudioEngine::timerTriggered( qint64 time )
 void
 AudioEngine::setPlaylist( PlaylistInterface* playlist )
 {
-    if ( m_playlist )
-        m_playlist->reset();
+    if ( !m_playlist.isNull() )
+        m_playlist.data()->reset();
 
-    m_playlist = playlist;
+    if ( !playlist )
+        return;
+    m_playlist = playlist->getSharedPointer();
 
-    if ( m_playlist && m_playlist->object() && m_playlist->retryMode() == PlaylistInterface::Retry )
-        connect( m_playlist->object(), SIGNAL( nextTrackReady() ), SLOT( playlistNextTrackReady() ) );
+    if ( m_playlist.data()->object() && m_playlist.data()->retryMode() == PlaylistInterface::Retry )
+        connect( m_playlist.data()->object(), SIGNAL( nextTrackReady() ), SLOT( playlistNextTrackReady() ) );
 
     emit playlistChanged( playlist );
 }
@@ -597,3 +635,13 @@ AudioEngine::isLocalResult( const QString& url ) const
 {
     return url.startsWith( "file://" );
 }
+
+
+void
+AudioEngine::setState( AudioState state )
+{
+    AudioState oldState = m_state;
+    m_state = state;
+
+    emit stateChanged( state, oldState );
+}

src/libtomahawk/audio/audioengine.h

@@ -24,6 +24,7 @@
 
 #include <phonon/MediaObject>
 #include <phonon/AudioOutput>
+#include <phonon/BackendCapabilities>
 
 #include "infosystem/infosystem.h"
 
@@ -45,24 +46,29 @@ Q_OBJECT
 
 public:
     enum AudioErrorCode { StreamReadError, AudioDeviceError, DecodeError };
+    enum AudioState { Stopped, Playing, Paused };
 
     static AudioEngine* instance();
 
     explicit AudioEngine();
     ~AudioEngine();
 
+    QStringList supportedMimeTypes() const;
     unsigned int volume() const { return m_audioOutput->volume() * 100.0; } // in percent
-    bool isPlaying() const { return m_mediaObject->state() == Phonon::PlayingState; }
-    bool isPaused() const { return m_mediaObject->state() == Phonon::PausedState; }
+
+    AudioState state() const { return m_state; }
+    bool isPlaying() const { return m_state == Playing; }
+    bool isPaused() const { return m_state == Paused; }
+    bool isStopped() const { return m_state == Stopped; }
 
     /* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */
-    Tomahawk::PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist; }
+    Tomahawk::PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist.data(); }
 
     /* Returns the PlaylistInterface of the current playlist. Note: The currently playing track might still be from a different playlist! */
-    Tomahawk::PlaylistInterface* playlist() const { return m_playlist; }
+    Tomahawk::PlaylistInterface* playlist() const { return m_playlist.data(); }
 
     Tomahawk::result_ptr currentTrack() const { return m_currentTrack; }
-    
+
 public slots:
     void playPause();
     void play();
@@ -83,8 +89,6 @@ public slots:
     void setPlaylist( Tomahawk::PlaylistInterface* playlist );
     void setQueue( Tomahawk::PlaylistInterface* queue ) { m_queue = queue; }
 
-    void onTrackAboutToFinish();
-
     void playlistNextTrackReady();
 
     void infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData requestData, QVariant output );
@@ -98,6 +102,7 @@ signals:
     void paused();
     void resumed();
 
+    void stateChanged( AudioState newState, AudioState oldState );
     void volumeChanged( int volume /* in percent */ );
 
     void timerMilliSeconds( qint64 msElapsed );
@@ -120,8 +125,11 @@ private slots:
     void setCurrentTrack( const Tomahawk::result_ptr& result );
 
 private:
+    void setState( AudioState state );
+
     bool isHttpResult( const QString& ) const;
     bool isLocalResult( const QString& ) const;
+
     void sendWaitingNotification() const;
     void sendNowPlayingNotification();
 
@@ -130,8 +138,8 @@ private:
 
     Tomahawk::result_ptr m_currentTrack;
     Tomahawk::result_ptr m_lastTrack;
-    Tomahawk::PlaylistInterface* m_playlist;
-    Tomahawk::PlaylistInterface* m_currentTrackPlaylist;
+    QWeakPointer< Tomahawk::PlaylistInterface > m_playlist;
+    QWeakPointer< Tomahawk::PlaylistInterface > m_currentTrackPlaylist;
     Tomahawk::PlaylistInterface* m_queue;
 
     Phonon::MediaObject* m_mediaObject;
@@ -142,6 +150,9 @@ private:
     bool m_waitingOnNewTrack;
     bool m_infoSystemConnected;
 
+    mutable QStringList m_supportedMimeTypes;
+    AudioState m_state;
+
     static AudioEngine* s_instance;
 };
 

src/libtomahawk/collection.cpp

@@ -24,6 +24,8 @@
 #include "dynamic/DynamicPlaylist.h"
 #include "playlist.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 
@@ -61,19 +63,17 @@ source_ptr& Collection::source() const
 void
 Collection::addPlaylist( const Tomahawk::playlist_ptr& p )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     if ( m_playlists.contains( p->guid() ) )
         return;
 
     QList<playlist_ptr> toadd;
     toadd << p;
-    qDebug() << "Inserted playlist with guid:" << p->guid();
+//    qDebug() << "Inserted playlist with guid:" << p->guid();
     m_playlists.insert( p->guid(), p );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit playlistsAdded( toadd );
 }
 
@@ -81,16 +81,14 @@ Collection::addPlaylist( const Tomahawk::playlist_ptr& p )
 void
 Collection::addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     QList<dynplaylist_ptr> toadd;
     toadd << p;
-    qDebug() << "Inserted dynamic playlist with guid:" << p->guid();
+//    qDebug() << "Inserted dynamic playlist with guid:" << p->guid();
     m_autoplaylists.insert( p->guid(), p );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit autoPlaylistsAdded( toadd );
 }
 
@@ -98,16 +96,14 @@ Collection::addAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
 void
 Collection::addStation( const dynplaylist_ptr& s )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     QList<dynplaylist_ptr> toadd;
     toadd << s;
-    qDebug() << "Inserted station with guid:" << s->guid();
+//    qDebug() << "Inserted station with guid:" << s->guid();
     m_stations.insert( s->guid(), s );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit stationsAdded( toadd );
 }
 
@@ -115,15 +111,13 @@ Collection::addStation( const dynplaylist_ptr& s )
 void
 Collection::deletePlaylist( const Tomahawk::playlist_ptr& p )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     QList<playlist_ptr> todelete;
     todelete << p;
     m_playlists.remove( p->guid() );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit playlistsDeleted( todelete );
 }
 
@@ -131,15 +125,13 @@ Collection::deletePlaylist( const Tomahawk::playlist_ptr& p )
 void
 Collection::deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     QList<dynplaylist_ptr> todelete;
     todelete << p;
     m_autoplaylists.remove( p->guid() );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit autoPlaylistsDeleted( todelete );
 }
 
@@ -147,15 +139,13 @@ Collection::deleteAutoPlaylist( const Tomahawk::dynplaylist_ptr& p )
 void
 Collection::deleteStation( const dynplaylist_ptr& s )
 {
-//    qDebug() << Q_FUNC_INFO;
-
     QList<dynplaylist_ptr> todelete;
     todelete << s;
     m_stations.remove( s->guid() );
 
-    qDebug() << Q_FUNC_INFO << "Collection name" << name()
+/*    qDebug() << Q_FUNC_INFO << "Collection name" << name()
                             << "from source id" << source()->id()
-                            << "numplaylists:" << m_playlists.count();
+                            << "numplaylists:" << m_playlists.count();*/
     emit stationsDeleted( todelete );
 }
 

src/libtomahawk/collection.h

@@ -30,7 +30,6 @@
 #include <QDir>
 #include <QList>
 #include <QSharedPointer>
-#include <QDebug>
 
 #include "functimeout.h"
 #include "playlist.h"

src/libtomahawk/contextmenu.cpp

@@ -16,14 +16,14 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "contextMenu.h"
-
-#include <QDebug>
+#include "contextmenu.h"
 
 #include "globalactionmanager.h"
 #include "playlistview.h"
 #include "viewmanager.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 

src/libtomahawk/contextmenu.h

@@ -23,7 +23,8 @@
 #include <QMenu>
 
 #include "typedefs.h"
-
+#include "album.h"
+#include "artist.h"
 #include "dllmacro.h"
 
 namespace Tomahawk

src/libtomahawk/database/database.cpp

@@ -18,6 +18,8 @@
 
 #include "database.h"
 
+#include "utils/logger.h"
+
 #define DEFAULT_WORKER_THREADS 4
 #define MAX_WORKER_THREADS 16
 
@@ -105,7 +107,7 @@ Database::enqueue( QSharedPointer<DatabaseCommand> lc )
                 happyThread = worker;
         }
 
-        qDebug() << "Enqueueing command to thread:" << happyThread << busyThreads << lc->commandname();
+//        qDebug() << "Enqueueing command to thread:" << happyThread << busyThreads << lc->commandname();
         happyThread->enqueue( lc );
     }
 }

src/libtomahawk/database/database.h

@@ -81,6 +81,7 @@ private:
     static Database* s_instance;
 
     friend class Tomahawk::Artist;
+    friend class Tomahawk::Album;
 };
 
 #endif // DATABASE_H

src/libtomahawk/database/databasecollection.cpp

@@ -26,6 +26,8 @@
 #include "databasecommand_loadallautoplaylists.h"
 #include "databasecommand_loadallstations.h"
 
+#include "utils/logger.h"
+
 using namespace Tomahawk;
 
 

src/libtomahawk/database/databasecommand.cpp

@@ -18,8 +18,6 @@
 
 #include "databasecommand.h"
 
-#include <QDebug>
-
 #include "databasecommand_addfiles.h"
 #include "databasecommand_createplaylist.h"
 #include "databasecommand_deletefiles.h"
@@ -31,7 +29,8 @@
 #include "databasecommand_deletedynamicplaylist.h"
 #include "databasecommand_setdynamicplaylistrevision.h"
 #include "databasecommand_socialaction.h"
-#include "databasecommand_loadsocialactions.h"
+
+#include "utils/logger.h"
 
 
 DatabaseCommand::DatabaseCommand( QObject* parent )

src/libtomahawk/database/databasecommand_addclientauth.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -18,9 +18,12 @@
 
 #include "databasecommand_addclientauth.h"
 
-DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& clientToken, 
-                                                              const QString& website, 
-                                                              const QString& name, 
+#include "utils/logger.h"
+
+
+DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& clientToken,
+                                                              const QString& website,
+                                                              const QString& name,
                                                               const QString& userAgent,
                                                               QObject* parent )
     : DatabaseCommand( parent )
@@ -31,7 +34,8 @@ DatabaseCommand_AddClientAuth::DatabaseCommand_AddClientAuth( const QString& cli
 {
 }
 
-void DatabaseCommand_AddClientAuth::exec(DatabaseImpl* lib)
+
+void DatabaseCommand_AddClientAuth::exec( DatabaseImpl* lib )
 {
     TomahawkSqlQuery q = lib->newquery();
     q.prepare( "INSERT INTO http_client_auth (token, website, name, ua, mtime, permissions) VALUES (?, ?, ?, ?, ?, ?)" );
@@ -41,8 +45,9 @@ void DatabaseCommand_AddClientAuth::exec(DatabaseImpl* lib)
     q.addBindValue( m_userAgent );
     q.addBindValue( 0 );
     q.addBindValue( "*" );
-    
-    if( !q.exec() ) {
+
+    if ( !q.exec() )
+    {
         qWarning() << "Failed to insert http client into auth table!";
     }
 }

src/libtomahawk/database/databasecommand_addfiles.cpp

@@ -27,6 +27,9 @@
 #include "databasecommand_collectionstats.h"
 #include "databaseimpl.h"
 #include "network/controlconnection.h"
+#include "sourcelist.h"
+
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
@@ -70,7 +73,15 @@ DatabaseCommand_AddFiles::postCommitHook()
     emit notify( m_queries );
 
     if( source()->isLocal() )
+    {
         Servent::instance()->triggerDBSync();
+
+        // Re-calculate local db stats
+        DatabaseCommand_CollectionStats* cmd = new DatabaseCommand_CollectionStats( SourceList::instance()->getLocal() );
+        connect( cmd, SIGNAL( done( QVariantMap ) ),
+                 SourceList::instance()->getLocal().data(), SLOT( setStats( QVariantMap ) ), Qt::QueuedConnection );
+        Database::instance()->enqueue( QSharedPointer<DatabaseCommand>( cmd ) );
+    }
 }
 
 

src/libtomahawk/database/databasecommand_addsource.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -16,9 +16,12 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <QSqlQuery>
 #include "databasecommand_addsource.h"
+
+#include <QSqlQuery>
+
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 
 DatabaseCommand_addSource::DatabaseCommand_addSource( const QString& username, const QString& fname, QObject* parent )

src/libtomahawk/database/databasecommand_allalbums.cpp

@@ -21,6 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 
 void
@@ -73,8 +74,7 @@ DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
         al << album;
     }
 
-    if ( al.count() )
-        emit albums( al, data() );
+    emit albums( al, data() );
     emit done();
 }
 
@@ -123,8 +123,7 @@ DatabaseCommand_AllAlbums::execForCollection( DatabaseImpl* dbi )
         al << album;
     }
 
-    if ( al.count() )
-        emit albums( al, data() );
+    emit albums( al, data() );
     emit done();
 }
 

src/libtomahawk/database/databasecommand_allalbums.h

@@ -38,7 +38,7 @@ public:
         ModificationTime = 1
     };
 
-    explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection, const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 )
+    explicit DatabaseCommand_AllAlbums( const Tomahawk::collection_ptr& collection = Tomahawk::collection_ptr(), const Tomahawk::artist_ptr& artist = Tomahawk::artist_ptr(), QObject* parent = 0 )
         : DatabaseCommand( parent )
         , m_collection( collection )
         , m_artist( artist )
@@ -55,6 +55,7 @@ public:
     void execForCollection( DatabaseImpl* );
     void execForArtist( DatabaseImpl* );
 
+    void setArtist( const Tomahawk::artist_ptr& artist ) { m_artist = artist; }
     void setLimit( unsigned int amount ) { m_amount = amount; }
     void setSortOrder( DatabaseCommand_AllAlbums::SortOrder order ) { m_sortOrder = order; }
     void setSortDescending( bool descending ) { m_sortDescending = descending; }

src/libtomahawk/database/databasecommand_allartists.cpp

@@ -21,6 +21,8 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
+#include "utils/logger.h"
+
 
 void
 DatabaseCommand_AllArtists::exec( DatabaseImpl* dbi )

src/libtomahawk/database/databasecommand_alltracks.cpp

@@ -24,6 +24,7 @@
 #include "artist.h"
 #include "album.h"
 #include "sourcelist.h"
+#include "utils/logger.h"
 
 
 void

src/libtomahawk/database/databasecommand_clientauthvalid.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -18,27 +18,36 @@
 
 #include "databasecommand_clientauthvalid.h"
 
+#include "utils/logger.h"
+
+
 DatabaseCommand_ClientAuthValid::DatabaseCommand_ClientAuthValid( const QString& clientToken, QObject* parent )
     : DatabaseCommand( parent )
     , m_clientToken( clientToken )
 {
-
 }
 
-void DatabaseCommand_ClientAuthValid::exec(DatabaseImpl* lib)
+
+void DatabaseCommand_ClientAuthValid::exec( DatabaseImpl* lib )
 {
     TomahawkSqlQuery q = lib->newquery();
-    q.prepare(  "SELECT name FROM http_client_auth WHERE token = ?" );
+    q.prepare( "SELECT name FROM http_client_auth WHERE token = ?" );
     q.addBindValue( m_clientToken );
-    
-    if( q.exec() ) {
-        if( q.next() ) {
+
+    if ( q.exec() )
+    {
+        if ( q.next() )
+        {
             QString name = q.value( 0 ).toString();
             emit authValid( m_clientToken, name, true );
-        } else {
+        }
+        else
+        {
             emit authValid( m_clientToken, QString(), false );
         }
-    } else {
+    }
+    else
+    {
         qWarning() << "Failed to query http auth table for client:" << m_clientToken;
     }
 }

src/libtomahawk/database/databasecommand_collectionstats.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -19,6 +19,7 @@
 #include "databasecommand_collectionstats.h"
 
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/databasecommand_createdynamicplaylist.cpp

@@ -27,23 +27,26 @@
 
 #include "network/servent.h"
 #include "viewmanager.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
 
 DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( QObject* parent )
-: DatabaseCommand_CreatePlaylist( parent )
+    : DatabaseCommand_CreatePlaylist( parent )
+    , m_autoLoad( true )
 {
-    qDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
+    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 1";
 }
 
 
 DatabaseCommand_CreateDynamicPlaylist::DatabaseCommand_CreateDynamicPlaylist( const source_ptr& author,
-                                                                const dynplaylist_ptr& playlist )
+                                                                const dynplaylist_ptr& playlist, bool autoLoad )
     : DatabaseCommand_CreatePlaylist( author, playlist.staticCast<Playlist>() )
     , m_playlist( playlist )
+    , m_autoLoad( autoLoad )
 {
-    qDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
+    tDebug() << Q_FUNC_INFO << "creating dynamiccreatecommand 2";
 }
 
 
@@ -60,8 +63,8 @@ DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
     qDebug() << "Create dynamic execing!" << m_playlist << m_v;
     TomahawkSqlQuery cre = lib->newquery();
 
-    cre.prepare( "INSERT INTO dynamic_playlist( guid, pltype, plmode ) "
-                 "VALUES( ?, ?, ? )" );
+    cre.prepare( "INSERT INTO dynamic_playlist( guid, pltype, plmode, autoload ) "
+                 "VALUES( ?, ?, ?, ? )" );
 
     if( m_playlist.isNull() ) {
         QVariantMap m = m_v.toMap();
@@ -73,6 +76,7 @@ DatabaseCommand_CreateDynamicPlaylist::exec( DatabaseImpl* lib )
         cre.addBindValue( m_playlist->type() );
         cre.addBindValue( m_playlist->mode() );
     }
+    cre.addBindValue( m_autoLoad );
     cre.exec();
 }
 
@@ -87,7 +91,7 @@ DatabaseCommand_CreateDynamicPlaylist::postCommitHook()
         return;
     }
 
-    if( report() == false )
+    if(  !DatabaseCommand_CreatePlaylist::report() || report() == false )
         return;
 
     qDebug() << Q_FUNC_INFO << "..reporting..";

src/libtomahawk/database/databasecommand_createdynamicplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -24,21 +24,31 @@
 #include "dynamic/DynamicPlaylist.h"
 #include "typedefs.h"
 
+/**
+ * Create a new dynamic playlist in the database, based on an existing playlist.
+ *
+ * If autoLoad is true, this playlist will *not* show up in the sidebar under the playlist tree, and
+ *  it will *not* be replicated to peers. It is useful to show a "specially crafted" playlist in other places
+ */
+
 class DatabaseCommand_CreateDynamicPlaylist : public DatabaseCommand_CreatePlaylist
 {
     Q_OBJECT
     Q_PROPERTY( QVariant playlist READ playlistV WRITE setPlaylistV )
-    
+
 public:
     explicit DatabaseCommand_CreateDynamicPlaylist( QObject* parent = 0 );
-    explicit DatabaseCommand_CreateDynamicPlaylist( const Tomahawk::source_ptr& author, const Tomahawk::dynplaylist_ptr& playlist );
-    
+    explicit DatabaseCommand_CreateDynamicPlaylist( const Tomahawk::source_ptr& author, const Tomahawk::dynplaylist_ptr& playlist, bool autoLoad = true );
+
     QString commandname() const { return "createdynamicplaylist"; }
-    
+
     virtual void exec( DatabaseImpl* lib );
     virtual void postCommitHook();
     virtual bool doesMutates() const { return true; }
-    
+
+    virtual bool loggable() const { return m_autoLoad; }
+
+
     QVariant playlistV() const
     {
         if( m_v.isNull() )
@@ -46,14 +56,18 @@ public:
         else
             return m_v;
     }
-    
+
     void setPlaylistV( const QVariant& v )
     {
         m_v = v;
     }
-    
+
+protected:
+    virtual bool report() { return m_autoLoad; }
+
 private:
     Tomahawk::dynplaylist_ptr m_playlist;
+    bool m_autoLoad;
 };
 
 #endif // DATABASECOMMAND_CREATEDYNAMICPLAYLIST_H

src/libtomahawk/database/databasecommand_createplaylist.cpp

@@ -22,6 +22,7 @@
 
 #include "network/servent.h"
 #include "viewmanager.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
@@ -30,7 +31,6 @@ DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( QObject* parent
     : DatabaseCommandLoggable( parent )
     , m_report( true )
 {
-    qDebug() << Q_FUNC_INFO << "def";
 }
 
 
@@ -40,7 +40,6 @@ DatabaseCommand_CreatePlaylist::DatabaseCommand_CreatePlaylist( const source_ptr
     , m_playlist( playlist )
     , m_report( false ) //this ctor used when creating locally, reporting done elsewhere
 {
-    qDebug() << Q_FUNC_INFO;
 }
 
 
@@ -55,10 +54,14 @@ void
 DatabaseCommand_CreatePlaylist::postCommitHook()
 {
     qDebug() << Q_FUNC_INFO;
+
+    if ( source()->isLocal() )
+        Servent::instance()->triggerDBSync();
+
     if ( m_report == false )
         return;
 
-    qDebug() << Q_FUNC_INFO << "reporting...";
+    tDebug() << Q_FUNC_INFO << "reporting...";
     if ( m_playlist.isNull() )
     {
         source_ptr src = source();
@@ -72,16 +75,12 @@ DatabaseCommand_CreatePlaylist::postCommitHook()
     {
         m_playlist->reportCreated( m_playlist );
     }
-
-    if ( source()->isLocal() )
-        Servent::instance()->triggerDBSync();
 }
 
 
 void
 DatabaseCommand_CreatePlaylist::createPlaylist( DatabaseImpl* lib, bool dynamic)
 {
-    qDebug() << Q_FUNC_INFO;
     Q_ASSERT( !( m_playlist.isNull() && m_v.isNull() ) );
     Q_ASSERT( !source().isNull() );
 
@@ -122,7 +121,6 @@ DatabaseCommand_CreatePlaylist::createPlaylist( DatabaseImpl* lib, bool dynamic)
         cre.bindValue( ":creator", m.value( "creator" ) );
         cre.bindValue( ":lastmodified", m.value( "lastmodified", 0 ) );
     }
-    qDebug() << "CREATE PLAYLIST:" << cre.boundValues();
 
     cre.exec();
 }

src/libtomahawk/database/databasecommand_createplaylist.h

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -53,13 +53,14 @@ public:
     {
         m_v = v;
     }
-    
+
 protected:
     void createPlaylist( DatabaseImpl* lib, bool dynamic = false );
-    
-    bool report() { return m_report; }
+
+    virtual bool report() { return m_report; }
+
     void setPlaylist( const Tomahawk::playlist_ptr& playlist ) { m_playlist = playlist; }
-    
+
     QVariant m_v;
 private:
     Tomahawk::playlist_ptr m_playlist;

src/libtomahawk/database/databasecommand_deletedynamicplaylist.cpp

@@ -18,10 +18,11 @@
 
 #include "databasecommand_deletedynamicplaylist.h"
 
+#include <QSqlQuery>
+
 #include "dynamic/DynamicPlaylist.h"
 #include "network/servent.h"
-
-#include <QSqlQuery>
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/databasecommand_deletefiles.cpp

@@ -27,6 +27,7 @@
 #include "databasecommand_collectionstats.h"
 #include "databaseimpl.h"
 #include "network/controlconnection.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 

src/libtomahawk/database/databasecommand_deleteplaylist.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #include <QSqlQuery>
 
 #include "network/servent.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
@@ -57,7 +58,7 @@ DatabaseCommand_DeletePlaylist::postCommitHook()
         qDebug() << "Source has gone offline, not emitting to GUI.";
         return;
     }
-    
+
     playlist_ptr playlist = source()->collection()->playlist( m_playlistguid );
     Q_ASSERT( !playlist.isNull() );
 

src/libtomahawk/database/databasecommand_dirmtimes.cpp

@@ -21,6 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 
 void

src/libtomahawk/database/databasecommand_filemtimes.cpp

@@ -21,6 +21,7 @@
 #include <QSqlQuery>
 
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 
 void

src/libtomahawk/database/databasecommand_genericselect.cpp

@@ -0,0 +1,115 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "databasecommand_genericselect.h"
+
+#include "databaseimpl.h"
+#include "utils/logger.h"
+#include <sourcelist.h>
+#include <artist.h>
+#include <album.h>
+
+using namespace Tomahawk;
+
+
+DatabaseCommand_GenericSelect::DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, int limit, QObject* parent )
+    : DatabaseCommand( parent )
+    , m_sqlSelect( sqlSelect )
+    , m_queryType( type )
+    , m_limit( limit )
+{
+}
+
+
+void
+DatabaseCommand_GenericSelect::exec( DatabaseImpl* dbi )
+{
+    TomahawkSqlQuery query = dbi->newquery();
+
+    query.prepare( QString( "%1 %2;" ).arg( m_sqlSelect ).arg( m_limit > -1 ? QString( " LIMIT %1" ).arg( m_limit ) : QString() ) );
+    query.exec();
+
+    QList< query_ptr > queries;
+    QList< artist_ptr > arts;
+    QList< album_ptr > albs;
+
+    // Expecting
+    while ( query.next() )
+    {
+        query_ptr qry;
+        artist_ptr artist;
+        album_ptr album;
+
+        if ( m_queryType == Track )
+        {
+            QString artist, track;
+            track = query.value( 0 ).toString();
+            artist = query.value( 1 ).toString();
+
+
+            qry = Tomahawk::Query::get( artist, track, QString(), uuid(), true ); // Only auto-resolve non-local results
+        } else if ( m_queryType == Artist )
+        {
+            int artistId = query.value( 0 ).toInt();
+            QString artistName = query.value( 1 ).toString();
+
+            artist = Tomahawk::Artist::get( artistId, artistName );
+        } else if ( m_queryType == Album )
+        {
+            int albumId = query.value( 0 ).toInt();
+            QString albumName = query.value( 1 ).toString();
+            int artistId = query.value( 2 ).toInt();
+            QString artistName = query.value( 3 ).toString();
+
+            artist = Tomahawk::Artist::get( artistId, artistName );
+            album = Tomahawk::Album::get( albumId, albumName, artist );
+        }
+
+        QVariantList extraData;
+        int count = 2;
+        while ( query.value( count ).isValid() )
+        {
+            extraData << query.value( count );
+            count++;
+        }
+
+        if ( m_queryType == Track )
+        {
+            if ( !extraData.isEmpty() )
+                qry->setProperty( "data", extraData );
+            queries << qry;
+        } else if ( m_queryType == Artist )
+        {
+            if ( !extraData.isEmpty() )
+                artist->setProperty( "data", extraData );
+            arts << artist;
+        } else if ( m_queryType == Album )
+        {
+            if ( !extraData.isEmpty() )
+                album->setProperty( "data", extraData );
+            albs << album;
+        }
+    }
+
+    if ( m_queryType == Track )
+        emit tracks( queries );
+    else if ( m_queryType == Artist )
+        emit artists( arts );
+    else if ( m_queryType == Album )
+        emit albums( albs );
+}

src/libtomahawk/database/databasecommand_genericselect.h

@@ -0,0 +1,80 @@
+/* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
+ *
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
+ *
+ *   Tomahawk is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   Tomahawk is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef DATABASECOMMAND_GENERICSELECT_H
+#define DATABASECOMMAND_GENERICSELECT_H
+
+#include <QVariantMap>
+
+#include "databasecommand.h"
+#include "source.h"
+#include "typedefs.h"
+
+#include "dllmacro.h"
+
+/**
+ * This dbcmd takes a generic SELECT command that operates on the database and returns a list of query_ptrs
+ *  that match.
+ *
+ * In order for the conversion to query_ptr to work, the SELECT command should select the following items:
+ *
+ * track query:
+ *      track.name, artist.name [, optional extra values ]
+ *
+ *  artist query:
+ *      artist.id, artist.name [, optional extra values ]
+ *
+ *  album query:
+ *      album.id, album.name, artist.id, artist.name [, optional extra values ]
+ *
+ * Any extra values in the resultset will be returned as a QVariantList attached to the "data" property of each query_ptr
+ *
+ * Notes:
+ *      * Do not trail your SQL command with ;
+ *      * Do not use the LIMIT command if you pass limitResults > -1
+ *
+ */
+class DLLEXPORT DatabaseCommand_GenericSelect : public DatabaseCommand
+{
+    Q_OBJECT
+
+public:
+    enum QueryType {
+        Track,
+        Artist,
+        Album
+    };
+
+    explicit DatabaseCommand_GenericSelect( const QString& sqlSelect, QueryType type, int limitResults = -1, QObject* parent = 0 );
+    virtual void exec( DatabaseImpl* lib );
+    virtual bool doesMutates() const { return false; }
+
+    virtual QString commandname() const { return "genericselect"; }
+
+signals:
+    void tracks( const QList< Tomahawk::query_ptr >& tracks );
+    void artists( const QList< Tomahawk::artist_ptr >& artists );
+    void albums( const QList< Tomahawk::album_ptr >& albums );
+
+private:
+    QString m_sqlSelect;
+    QueryType m_queryType;
+    int m_limit;
+};
+
+#endif // DATABASECOMMAND_GENERICSELECT_H

src/libtomahawk/database/databasecommand_importplaylist.cpp

@@ -1,5 +1,5 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
- * 
+ *
  *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
@@ -23,8 +23,11 @@
 #include "tomahawk/query.h"
 #include "tomahawk/playlist.h"
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
-void DatabaseCommand_ImportPlaylist::exec(DatabaseImpl * dbi)
+
+void
+DatabaseCommand_ImportPlaylist::exec( DatabaseImpl * dbi )
 {
     /*
     qDebug() << "Importing playlist of" << m_playlist->length() << "tracks";

src/libtomahawk/database/databasecommand_loadallautoplaylists.cpp

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,16 +22,18 @@
 
 #include "dynamic/DynamicPlaylist.h"
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
 
-void DatabaseCommand_LoadAllAutoPlaylists::exec( DatabaseImpl* dbi )
+void
+DatabaseCommand_LoadAllAutoPlaylists::exec( DatabaseImpl* dbi )
 {
     TomahawkSqlQuery query = dbi->newquery();
 
     query.exec( QString( "SELECT playlist.guid as guid, title, info, creator, createdOn, lastmodified, shared, currentrevision, dynamic_playlist.pltype, dynamic_playlist.plmode "
-                         "FROM playlist, dynamic_playlist WHERE source %1 AND dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %2" )
+                         "FROM playlist, dynamic_playlist WHERE source %1 AND dynplaylist = 'true' AND playlist.guid = dynamic_playlist.guid AND dynamic_playlist.plmode = %2 AND dynamic_playlist.autoload = 'true'" )
     .arg( source()->isLocal() ? "IS NULL" : QString( "=%1" ).arg( source()->id() ) )
     .arg( Static ) );
 

src/libtomahawk/database/databasecommand_loadallautoplaylists.h

@@ -1,6 +1,6 @@
 /* === This file is part of Tomahawk Player - <http://tomahawk-player.org> ===
  *
- *   Copyright 2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+ *   Copyright 2010-2011, Leo Franchi <lfranchi@kde.org>
  *
  *   Tomahawk is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by

src/libtomahawk/database/databasecommand_loadallplaylists.cpp

@@ -22,11 +22,13 @@
 
 #include "playlist.h"
 #include "databaseimpl.h"
+#include "utils/logger.h"
 
 using namespace Tomahawk;
 
 
-void DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
+void
+DatabaseCommand_LoadAllPlaylists::exec( DatabaseImpl* dbi )
 {
     TomahawkSqlQuery query = dbi->newquery();